mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
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>
This commit is contained in:
parent
45555c0ed4
commit
a098397d56
1 changed files with 0 additions and 2 deletions
|
@ -644,7 +644,6 @@ static int atl2_request_irq(struct atl2_adapter *adapter)
|
|||
int flags, err = 0;
|
||||
|
||||
flags = IRQF_SHARED;
|
||||
#ifdef CONFIG_PCI_MSI
|
||||
adapter->have_msi = true;
|
||||
err = pci_enable_msi(adapter->pdev);
|
||||
if (err)
|
||||
|
@ -652,7 +651,6 @@ static int atl2_request_irq(struct atl2_adapter *adapter)
|
|||
|
||||
if (adapter->have_msi)
|
||||
flags &= ~IRQF_SHARED;
|
||||
#endif
|
||||
|
||||
return request_irq(adapter->pdev->irq, &atl2_intr, flags, netdev->name,
|
||||
netdev);
|
||||
|
|
Loading…
Reference in a new issue