diff options
| author |   Roland Dreier <rolandd@cisco.com> | 2008-04-21 18:19:15 -0700 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2008-04-21 18:19:15 -0700 |
| commit | bc751fe6fff3ff894784acfed1bed8639b632c09 (patch) | |
| tree | 1df7d070d9d0f30e08e58f0446a0b0567e6797cc /drivers/infiniband/hw/ipath | |
| parent | IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c (diff) | |
| download | linux-dev-bc751fe6fff3ff894784acfed1bed8639b632c09.tar.xz linux-dev-bc751fe6fff3ff894784acfed1bed8639b632c09.zip | |
IB/ipath: Correct capitalization "IntX" -> "INTx"
Match what the PCI specification uses.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/ipath')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_driver.c | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_iba7220.c | 10 |
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, case PCI_DEVICE_ID_INFINIPATH_7220: #ifndef CONFIG_PCI_MSI ipath_dbg("CONFIG_PCI_MSI is not enabled, " - "using IntX for unit %u\n", dd->ipath_unit); + "using INTx for unit %u\n", dd->ipath_unit); #endif ipath_init_iba7220_funcs(dd); 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) /* * disable msi interrupt if enabled, and clear the flag. - * flag is used primarily for the fallback to IntX, but + * flag is used primarily for the fallback to INTx, but * is also used in reinit after reset as a flag. */ static void ipath_7220_nomsi(struct ipath_devdata *dd) @@ -1615,7 +1615,7 @@ static int ipath_reinit_msi(struct ipath_devdata *dd) bail: if (!ret) { - ipath_dbg("Using IntX, MSI disabled or not configured\n"); + ipath_dbg("Using INTx, MSI disabled or not configured\n"); ipath_enable_intx(dd->pcidev); ret = 1; } @@ -2144,12 +2144,12 @@ static void ipath_7220_read_counters(struct ipath_devdata *dd, counters[i] = ipath_snap_cntr(dd, i); } -/* if we are using MSI, try to fallback to IntX */ +/* if we are using MSI, try to fallback to INTx */ static int ipath_7220_intr_fallback(struct ipath_devdata *dd) { if (dd->ipath_msi_lo) { dev_info(&dd->pcidev->dev, "MSI interrupt not detected," - " trying IntX interrupts\n"); + " trying INTx interrupts\n"); ipath_7220_nomsi(dd); ipath_enable_intx(dd->pcidev); /* @@ -2162,7 +2162,7 @@ static int ipath_7220_intr_fallback(struct ipath_devdata *dd) if (request_irq(dd->ipath_irq, ipath_intr, IRQF_SHARED, IPATH_DRV_NAME, dd)) ipath_dev_err(dd, - "Could not re-request_irq for IntX\n"); + "Could not re-request_irq for INTx\n"); return 1; } return 0; |