aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-04-21 21:19:15 -0400
committerRoland Dreier <rolandd@cisco.com>2008-04-21 21:19:15 -0400
commitbc751fe6fff3ff894784acfed1bed8639b632c09 (patch)
tree1df7d070d9d0f30e08e58f0446a0b0567e6797cc
parent44957572cc198f6fcee9569813722b9ae1bd1679 (diff)
IB/ipath: Correct capitalization "IntX" -> "INTx"
Match what the PCI specification uses. Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r--drivers/infiniband/hw/ipath/ipath_driver.c2
-rw-r--r--drivers/infiniband/hw/ipath/ipath_iba7220.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index e0a64f070b97..acf30c06a0c0 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -538,7 +538,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
538 case PCI_DEVICE_ID_INFINIPATH_7220: 538 case PCI_DEVICE_ID_INFINIPATH_7220:
539#ifndef CONFIG_PCI_MSI 539#ifndef CONFIG_PCI_MSI
540 ipath_dbg("CONFIG_PCI_MSI is not enabled, " 540 ipath_dbg("CONFIG_PCI_MSI is not enabled, "
541 "using IntX for unit %u\n", dd->ipath_unit); 541 "using INTx for unit %u\n", dd->ipath_unit);
542#endif 542#endif
543 ipath_init_iba7220_funcs(dd); 543 ipath_init_iba7220_funcs(dd);
544 break; 544 break;
diff --git a/drivers/infiniband/hw/ipath/ipath_iba7220.c b/drivers/infiniband/hw/ipath/ipath_iba7220.c
index 633a605e69db..e3ec0d1bdf50 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba7220.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba7220.c
@@ -1215,7 +1215,7 @@ static int ipath_msi_enabled(struct pci_dev *pdev)
1215 1215
1216/* 1216/*
1217 * disable msi interrupt if enabled, and clear the flag. 1217 * disable msi interrupt if enabled, and clear the flag.
1218 * flag is used primarily for the fallback to IntX, but 1218 * flag is used primarily for the fallback to INTx, but
1219 * is also used in reinit after reset as a flag. 1219 * is also used in reinit after reset as a flag.
1220 */ 1220 */
1221static void ipath_7220_nomsi(struct ipath_devdata *dd) 1221static void ipath_7220_nomsi(struct ipath_devdata *dd)
@@ -1615,7 +1615,7 @@ static int ipath_reinit_msi(struct ipath_devdata *dd)
1615 1615
1616bail: 1616bail:
1617 if (!ret) { 1617 if (!ret) {
1618 ipath_dbg("Using IntX, MSI disabled or not configured\n"); 1618 ipath_dbg("Using INTx, MSI disabled or not configured\n");
1619 ipath_enable_intx(dd->pcidev); 1619 ipath_enable_intx(dd->pcidev);
1620 ret = 1; 1620 ret = 1;
1621 } 1621 }
@@ -2144,12 +2144,12 @@ static void ipath_7220_read_counters(struct ipath_devdata *dd,
2144 counters[i] = ipath_snap_cntr(dd, i); 2144 counters[i] = ipath_snap_cntr(dd, i);
2145} 2145}
2146 2146
2147/* if we are using MSI, try to fallback to IntX */ 2147/* if we are using MSI, try to fallback to INTx */
2148static int ipath_7220_intr_fallback(struct ipath_devdata *dd) 2148static int ipath_7220_intr_fallback(struct ipath_devdata *dd)
2149{ 2149{
2150 if (dd->ipath_msi_lo) { 2150 if (dd->ipath_msi_lo) {
2151 dev_info(&dd->pcidev->dev, "MSI interrupt not detected," 2151 dev_info(&dd->pcidev->dev, "MSI interrupt not detected,"
2152 " trying IntX interrupts\n"); 2152 " trying INTx interrupts\n");
2153 ipath_7220_nomsi(dd); 2153 ipath_7220_nomsi(dd);
2154 ipath_enable_intx(dd->pcidev); 2154 ipath_enable_intx(dd->pcidev);
2155 /* 2155 /*
@@ -2162,7 +2162,7 @@ static int ipath_7220_intr_fallback(struct ipath_devdata *dd)
2162 if (request_irq(dd->ipath_irq, ipath_intr, IRQF_SHARED, 2162 if (request_irq(dd->ipath_irq, ipath_intr, IRQF_SHARED,
2163 IPATH_DRV_NAME, dd)) 2163 IPATH_DRV_NAME, dd))
2164 ipath_dev_err(dd, 2164 ipath_dev_err(dd,
2165 "Could not re-request_irq for IntX\n"); 2165 "Could not re-request_irq for INTx\n");
2166 return 1; 2166 return 1;
2167 } 2167 }
2168 return 0; 2168 return 0;