mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 19:07:52 +00:00
e1000e: tweak irq allocation messages
There's too much noise on systems that don't support MSI. Let's get rid of a few and make the real error message more specific. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com> Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0a0863af0d
commit
9b71c5e070
1 changed files with 5 additions and 7 deletions
|
@ -945,11 +945,7 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
|
|||
int irq_flags = IRQF_SHARED;
|
||||
int err;
|
||||
|
||||
err = pci_enable_msi(adapter->pdev);
|
||||
if (err) {
|
||||
ndev_warn(netdev,
|
||||
"Unable to allocate MSI interrupt Error: %d\n", err);
|
||||
} else {
|
||||
if (!pci_enable_msi(adapter->pdev)) {
|
||||
adapter->flags |= FLAG_MSI_ENABLED;
|
||||
handler = e1000_intr_msi;
|
||||
irq_flags = 0;
|
||||
|
@ -958,10 +954,12 @@ static int e1000_request_irq(struct e1000_adapter *adapter)
|
|||
err = request_irq(adapter->pdev->irq, handler, irq_flags, netdev->name,
|
||||
netdev);
|
||||
if (err) {
|
||||
ndev_err(netdev,
|
||||
"Unable to allocate %s interrupt (return: %d)\n",
|
||||
adapter->flags & FLAG_MSI_ENABLED ? "MSI":"INTx",
|
||||
err);
|
||||
if (adapter->flags & FLAG_MSI_ENABLED)
|
||||
pci_disable_msi(adapter->pdev);
|
||||
ndev_err(netdev,
|
||||
"Unable to allocate interrupt Error: %d\n", err);
|
||||
}
|
||||
|
||||
return err;
|
||||
|
|
Loading…
Reference in a new issue