mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
PCI: Drop msi_data_reg() macro
msi_data_reg() doesn't provide any useful abstraction, so drop it. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
parent
9925ad0cf1
commit
2f22134936
2 changed files with 6 additions and 8 deletions
|
@ -249,10 +249,10 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
|
|||
if (entry->msi_attrib.is_64) {
|
||||
pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
|
||||
&msg->address_hi);
|
||||
pci_read_config_word(dev, msi_data_reg(pos, 1), &data);
|
||||
pci_read_config_word(dev, pos + PCI_MSI_DATA_64, &data);
|
||||
} else {
|
||||
msg->address_hi = 0;
|
||||
pci_read_config_word(dev, msi_data_reg(pos, 0), &data);
|
||||
pci_read_config_word(dev, pos + PCI_MSI_DATA_32, &data);
|
||||
}
|
||||
msg->data = data;
|
||||
}
|
||||
|
@ -309,11 +309,11 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
|
|||
if (entry->msi_attrib.is_64) {
|
||||
pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
|
||||
msg->address_hi);
|
||||
pci_write_config_word(dev, msi_data_reg(pos, 1),
|
||||
msg->data);
|
||||
pci_write_config_word(dev, pos + PCI_MSI_DATA_64,
|
||||
msg->data);
|
||||
} else {
|
||||
pci_write_config_word(dev, msi_data_reg(pos, 0),
|
||||
msg->data);
|
||||
pci_write_config_word(dev, pos + PCI_MSI_DATA_32,
|
||||
msg->data);
|
||||
}
|
||||
}
|
||||
entry->msg = *msg;
|
||||
|
|
|
@ -6,8 +6,6 @@
|
|||
#ifndef MSI_H
|
||||
#define MSI_H
|
||||
|
||||
#define msi_data_reg(base, is64bit) \
|
||||
(base + ((is64bit == 1) ? PCI_MSI_DATA_64 : PCI_MSI_DATA_32))
|
||||
#define msi_mask_reg(base, is64bit) \
|
||||
(base + ((is64bit == 1) ? PCI_MSI_MASK_64 : PCI_MSI_MASK_32))
|
||||
#define is_64bit_address(control) (!!(control & PCI_MSI_FLAGS_64BIT))
|
||||
|
|
Loading…
Reference in a new issue