diff options
Diffstat (limited to 'drivers/infiniband/hw')
-rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba6110.c | 5 |
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) | |||
742 | return 0; | 742 | return 0; |
743 | } | 743 | } |
744 | 744 | ||
745 | #define HT_CAPABILITY_ID 0x08 /* HT capabilities not defined in kernel */ | ||
746 | #define HT_INTR_DISC_CONFIG 0x80 /* HT interrupt and discovery cap */ | 745 | #define HT_INTR_DISC_CONFIG 0x80 /* HT interrupt and discovery cap */ |
747 | #define HT_INTR_REG_INDEX 2 /* intconfig requires indirect accesses */ | 746 | #define HT_INTR_REG_INDEX 2 /* intconfig requires indirect accesses */ |
748 | 747 | ||
@@ -973,7 +972,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd, | |||
973 | * do this early, before we ever enable errors or hardware errors, | 972 | * do this early, before we ever enable errors or hardware errors, |
974 | * mostly to avoid causing the chip to enter freeze mode. | 973 | * mostly to avoid causing the chip to enter freeze mode. |
975 | */ | 974 | */ |
976 | pos = pci_find_capability(pdev, HT_CAPABILITY_ID); | 975 | pos = pci_find_capability(pdev, PCI_CAP_ID_HT); |
977 | if (!pos) { | 976 | if (!pos) { |
978 | ipath_dev_err(dd, "Couldn't find HyperTransport " | 977 | ipath_dev_err(dd, "Couldn't find HyperTransport " |
979 | "capability; no interrupts\n"); | 978 | "capability; no interrupts\n"); |
@@ -996,7 +995,7 @@ static int ipath_setup_ht_config(struct ipath_devdata *dd, | |||
996 | else if (cap_type == HT_INTR_DISC_CONFIG) | 995 | else if (cap_type == HT_INTR_DISC_CONFIG) |
997 | ihandler = set_int_handler(dd, pdev, pos); | 996 | ihandler = set_int_handler(dd, pdev, pos); |
998 | } while ((pos = pci_find_next_capability(pdev, pos, | 997 | } while ((pos = pci_find_next_capability(pdev, pos, |
999 | HT_CAPABILITY_ID))); | 998 | PCI_CAP_ID_HT))); |
1000 | 999 | ||
1001 | if (!ihandler) { | 1000 | if (!ihandler) { |
1002 | ipath_dev_err(dd, "Couldn't find interrupt handler in " | 1001 | ipath_dev_err(dd, "Couldn't find interrupt handler in " |