PCI: Drop msi_lower_address_reg() and msi_upper_address_reg() macros

msi_lower_address_reg() and msi_upper_address_reg() don't provide any
useful abstraction, so drop them.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index b1a60e0a1ee3..7011c5d95e5e 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -244,11 +244,11 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
                 int pos = dev->msi_cap;
                 u16 data;
 
-                pci_read_config_dword(dev, msi_lower_address_reg(pos),
-                                        &msg->address_lo);
+                pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
+                                      &msg->address_lo);
                 if (entry->msi_attrib.is_64) {
-                        pci_read_config_dword(dev, msi_upper_address_reg(pos),
-                                                &msg->address_hi);
+                        pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI,
+                                              &msg->address_hi);
                         pci_read_config_word(dev, msi_data_reg(pos, 1), &data);
                 } else {
                         msg->address_hi = 0;
@@ -304,11 +304,11 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
                 msgctl |= entry->msi_attrib.multiple << 4;
                 pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl);
 
-                pci_write_config_dword(dev, msi_lower_address_reg(pos),
-                                        msg->address_lo);
+                pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO,
+                                       msg->address_lo);
                 if (entry->msi_attrib.is_64) {
-                        pci_write_config_dword(dev, msi_upper_address_reg(pos),
-                                                msg->address_hi);
+                        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);
                 } else {