MSI: Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT

0x08 is the HT capability, while PCI_CAP_ID_HT_IRQCONF would be
the subtype 0x80 that mpic_scan_ht_pic() uses.
Rename PCI_CAP_ID_HT_IRQCONF into PCI_CAP_ID_HT.

And by the way, use it in the ipath driver instead of defining its
own HT_CAPABILITY_ID.

Signed-off-by: Brice Goglin <brice@myri.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index bf2455a6d562..5c9b509e40e4 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -742,7 +742,6 @@ static int ipath_setup_ht_reset(struct ipath_devdata *dd)
         return 0;
 }
 
-#define HT_CAPABILITY_ID   0x08 /* HT capabilities not defined in kernel */
 #define HT_INTR_DISC_CONFIG  0x80       /* HT interrupt and discovery cap */
 #define HT_INTR_REG_INDEX    2  /* intconfig requires indirect accesses */
 
@@ -973,7 +972,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
          * do this early, before we ever enable errors or hardware errors,
          * mostly to avoid causing the chip to enter freeze mode.
          */
-        pos = pci_find_capability(pdev, HT_CAPABILITY_ID);
+        pos = pci_find_capability(pdev, PCI_CAP_ID_HT);
         if (!pos) {
                 ipath_dev_err(dd, "Couldn't find HyperTransport "
                               "capability; no interrupts\n");
@@ -996,7 +995,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd,
                 else if (cap_type == HT_INTR_DISC_CONFIG)
                         ihandler = set_int_handler(dd, pdev, pos);
         } while ((pos = pci_find_next_capability(pdev, pos,
-                                                 HT_CAPABILITY_ID)));
+                                                 PCI_CAP_ID_HT)));
 
         if (!ihandler) {
                 ipath_dev_err(dd, "Couldn't find interrupt handler in "