diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-25 20:00:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:00:05 -0500 |
commit | a098397d562e2ce5aca7b9b007a4954d88ef8f5e (patch) | |
tree | 3aa91ccc9bd3019cf5bfd22fad4bb4a819e9863c /drivers/net/atlx | |
parent | 45555c0ed436b8b06eeaa5c524a3377e6d24fb45 (diff) |
atlx: fix warning in drivers/net/atlx/atl2.c
fix this warning:
drivers/net/atlx/atl2.c: In function ‘atl2_request_irq’:
drivers/net/atlx/atl2.c:644: warning: unused variable ‘err’
'err' is unused in the !CONFIG_PCI_MSI case.
Instead of further increasing the #ifdeffery in this function,
restructure the code a bit and get rid of the #ifdef. This
relies on the fact that pci_enable_msi() will always fail in
the !CONFIG_PCI_MSI case.
There should be no change in driver behavior.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/atlx')
-rw-r--r-- | drivers/net/atlx/atl2.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 0326a84503e3..bc394491b63b 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
@@ -644,7 +644,6 @@ static int atl2_request_irq(struct atl2_adapter *adapter) | |||
644 | int flags, err = 0; | 644 | int flags, err = 0; |
645 | 645 | ||
646 | flags = IRQF_SHARED; | 646 | flags = IRQF_SHARED; |
647 | #ifdef CONFIG_PCI_MSI | ||
648 | adapter->have_msi = true; | 647 | adapter->have_msi = true; |
649 | err = pci_enable_msi(adapter->pdev); | 648 | err = pci_enable_msi(adapter->pdev); |
650 | if (err) | 649 | if (err) |
@@ -652,7 +651,6 @@ static int atl2_request_irq(struct atl2_adapter *adapter) | |||
652 | 651 | ||
653 | if (adapter->have_msi) | 652 | if (adapter->have_msi) |
654 | flags &= ~IRQF_SHARED; | 653 | flags &= ~IRQF_SHARED; |
655 | #endif | ||
656 | 654 | ||
657 | return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name, | 655 | return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name, |
658 | netdev); | 656 | netdev); |