Commit a5a62a1c authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller

qlge: Clean up module parameter name.

Change it to match qlge_xxx convention.
Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 74e12435
...@@ -69,9 +69,9 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)"); ...@@ -69,9 +69,9 @@ MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");
#define MSIX_IRQ 0 #define MSIX_IRQ 0
#define MSI_IRQ 1 #define MSI_IRQ 1
#define LEG_IRQ 2 #define LEG_IRQ 2
static int irq_type = MSIX_IRQ; static int qlge_irq_type = MSIX_IRQ;
module_param(irq_type, int, MSIX_IRQ); module_param(qlge_irq_type, int, MSIX_IRQ);
MODULE_PARM_DESC(irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy."); MODULE_PARM_DESC(qlge_irq_type, "0 = MSI-X, 1 = MSI, 2 = Legacy.");
static struct pci_device_id qlge_pci_tbl[] __devinitdata = { static struct pci_device_id qlge_pci_tbl[] __devinitdata = {
{PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)}, {PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, QLGE_DEVICE_ID_8012)},
...@@ -2870,7 +2870,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) ...@@ -2870,7 +2870,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
int i, err; int i, err;
/* Get the MSIX vectors. */ /* Get the MSIX vectors. */
if (irq_type == MSIX_IRQ) { if (qlge_irq_type == MSIX_IRQ) {
/* Try to alloc space for the msix struct, /* Try to alloc space for the msix struct,
* if it fails then go to MSI/legacy. * if it fails then go to MSI/legacy.
*/ */
...@@ -2878,7 +2878,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) ...@@ -2878,7 +2878,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
sizeof(struct msix_entry), sizeof(struct msix_entry),
GFP_KERNEL); GFP_KERNEL);
if (!qdev->msi_x_entry) { if (!qdev->msi_x_entry) {
irq_type = MSI_IRQ; qlge_irq_type = MSI_IRQ;
goto msi; goto msi;
} }
...@@ -2901,7 +2901,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) ...@@ -2901,7 +2901,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
QPRINTK(qdev, IFUP, WARNING, QPRINTK(qdev, IFUP, WARNING,
"MSI-X Enable failed, trying MSI.\n"); "MSI-X Enable failed, trying MSI.\n");
qdev->intr_count = 1; qdev->intr_count = 1;
irq_type = MSI_IRQ; qlge_irq_type = MSI_IRQ;
} else if (err == 0) { } else if (err == 0) {
set_bit(QL_MSIX_ENABLED, &qdev->flags); set_bit(QL_MSIX_ENABLED, &qdev->flags);
QPRINTK(qdev, IFUP, INFO, QPRINTK(qdev, IFUP, INFO,
...@@ -2912,7 +2912,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) ...@@ -2912,7 +2912,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
} }
msi: msi:
qdev->intr_count = 1; qdev->intr_count = 1;
if (irq_type == MSI_IRQ) { if (qlge_irq_type == MSI_IRQ) {
if (!pci_enable_msi(qdev->pdev)) { if (!pci_enable_msi(qdev->pdev)) {
set_bit(QL_MSI_ENABLED, &qdev->flags); set_bit(QL_MSI_ENABLED, &qdev->flags);
QPRINTK(qdev, IFUP, INFO, QPRINTK(qdev, IFUP, INFO,
...@@ -2920,7 +2920,7 @@ static void ql_enable_msix(struct ql_adapter *qdev) ...@@ -2920,7 +2920,7 @@ static void ql_enable_msix(struct ql_adapter *qdev)
return; return;
} }
} }
irq_type = LEG_IRQ; qlge_irq_type = LEG_IRQ;
QPRINTK(qdev, IFUP, DEBUG, "Running with legacy interrupts.\n"); QPRINTK(qdev, IFUP, DEBUG, "Running with legacy interrupts.\n");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment