diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-18 01:41:13 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-23 17:50:30 +0200 |
| commit | 2f221349366daf074bad07cc670e483cc52ab203 (patch) | |
| tree | 6dd2c47842b5af11dd54980f1b8234494f2bc772 | |
| parent | PCI: Drop msi_lower_address_reg() and msi_upper_address_reg() macros (diff) | |
| download | linux-2f221349366daf074bad07cc670e483cc52ab203.tar.xz linux-2f221349366daf074bad07cc670e483cc52ab203.zip | |
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>
| -rw-r--r-- | drivers/pci/msi.c | 12 | ||||
| -rw-r--r-- | drivers/pci/msi.h | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 7011c5d95e5e..1688c26db962 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -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; diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h index e5b87d60cb95..d2c6cd982a21 100644 --- a/drivers/pci/msi.h +++ b/drivers/pci/msi.h @@ -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)) |