PCI: Drop msi_control_reg() macro and use PCI_MSI_FLAGS directly

Note the error in pci_msix_table_size() -- we used PCI_MSI_FLAGS to
locate the PCI_MSIX_FLAGS word.  No actual breakage because PCI_MSI_FLAGS
and PCI_MSIX_FLAGS happen to be the same.

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

2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 631249ea394c..b1a60e0a1ee3 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -299,10 +299,10 @@ void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
                 int pos = dev->msi_cap;
                 u16 msgctl;
 
-                pci_read_config_word(dev, msi_control_reg(pos), &msgctl);
+                pci_read_config_word(dev, pos + PCI_MSI_FLAGS, &msgctl);
                 msgctl &= ~PCI_MSI_FLAGS_QSIZE;
                 msgctl |= entry->msi_attrib.multiple << 4;
-                pci_write_config_word(dev, msi_control_reg(pos), msgctl);
+                pci_write_config_word(dev, pos + PCI_MSI_FLAGS, msgctl);
 
                 pci_write_config_dword(dev, msi_lower_address_reg(pos),
                                         msg->address_lo);
@@ -548,7 +548,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec)
 
         msi_set_enable(dev, 0); /* Disable MSI during set up */
 
-        pci_read_config_word(dev, msi_control_reg(dev->msi_cap), &control);
+        pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control);
         /* MSI Entry Initialization */
         entry = alloc_msi_entry(dev);
         if (!entry)
@@ -903,7 +903,7 @@ int pci_msix_table_size(struct pci_dev *dev)
         if (!dev->msix_cap)
                 return 0;
 
-        pci_read_config_word(dev, msi_control_reg(dev->msix_cap), &control);
+        pci_read_config_word(dev, dev->msix_cap + PCI_MSIX_FLAGS, &control);
         return multi_msix_capable(control);
 }
 
diff --git a/drivers/pci/msi.h b/drivers/pci/msi.h
index 65c42f80f23e..6aa7b1903796 100644
--- a/drivers/pci/msi.h
+++ b/drivers/pci/msi.h
@@ -6,7 +6,6 @@
 #ifndef MSI_H
 #define MSI_H
 
-#define msi_control_reg(base)           (base + PCI_MSI_FLAGS)
 #define msi_lower_address_reg(base)     (base + PCI_MSI_ADDRESS_LO)
 #define msi_upper_address_reg(base)     (base + PCI_MSI_ADDRESS_HI)
 #define msi_data_reg(base, is64bit)     \