提交 bc751fe6 编写于 作者: R Roland Dreier

IB/ipath: Correct capitalization "IntX" -> "INTx"

Match what the PCI specification uses.
Signed-off-by: NRoland Dreier <rolandd@cisco.com>
上级 44957572
...@@ -538,7 +538,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, ...@@ -538,7 +538,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
case PCI_DEVICE_ID_INFINIPATH_7220: case PCI_DEVICE_ID_INFINIPATH_7220:
#ifndef CONFIG_PCI_MSI #ifndef CONFIG_PCI_MSI
ipath_dbg("CONFIG_PCI_MSI is not enabled, " 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 #endif
ipath_init_iba7220_funcs(dd); ipath_init_iba7220_funcs(dd);
break; break;
......
...@@ -1215,7 +1215,7 @@ static int ipath_msi_enabled(struct pci_dev *pdev) ...@@ -1215,7 +1215,7 @@ static int ipath_msi_enabled(struct pci_dev *pdev)
/* /*
* disable msi interrupt if enabled, and clear the flag. * 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. * is also used in reinit after reset as a flag.
*/ */
static void ipath_7220_nomsi(struct ipath_devdata *dd) static void ipath_7220_nomsi(struct ipath_devdata *dd)
...@@ -1615,7 +1615,7 @@ static int ipath_reinit_msi(struct ipath_devdata *dd) ...@@ -1615,7 +1615,7 @@ static int ipath_reinit_msi(struct ipath_devdata *dd)
bail: bail:
if (!ret) { 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); ipath_enable_intx(dd->pcidev);
ret = 1; ret = 1;
} }
...@@ -2144,12 +2144,12 @@ static void ipath_7220_read_counters(struct ipath_devdata *dd, ...@@ -2144,12 +2144,12 @@ static void ipath_7220_read_counters(struct ipath_devdata *dd,
counters[i] = ipath_snap_cntr(dd, i); 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) static int ipath_7220_intr_fallback(struct ipath_devdata *dd)
{ {
if (dd->ipath_msi_lo) { if (dd->ipath_msi_lo) {
dev_info(&dd->pcidev->dev, "MSI interrupt not detected," dev_info(&dd->pcidev->dev, "MSI interrupt not detected,"
" trying IntX interrupts\n"); " trying INTx interrupts\n");
ipath_7220_nomsi(dd); ipath_7220_nomsi(dd);
ipath_enable_intx(dd->pcidev); ipath_enable_intx(dd->pcidev);
/* /*
...@@ -2162,7 +2162,7 @@ static int ipath_7220_intr_fallback(struct ipath_devdata *dd) ...@@ -2162,7 +2162,7 @@ static int ipath_7220_intr_fallback(struct ipath_devdata *dd)
if (request_irq(dd->ipath_irq, ipath_intr, IRQF_SHARED, if (request_irq(dd->ipath_irq, ipath_intr, IRQF_SHARED,
IPATH_DRV_NAME, dd)) IPATH_DRV_NAME, dd))
ipath_dev_err(dd, ipath_dev_err(dd,
"Could not re-request_irq for IntX\n"); "Could not re-request_irq for INTx\n");
return 1; return 1;
} }
return 0; return 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册