* [PATCH] e1000e: tweak irq allocation messages @ 2008-01-31 22:56 Andy Gospodarek 2008-01-31 23:06 ` Andy Gospodarek 0 siblings, 1 reply; 3+ messages in thread From: Andy Gospodarek @ 2008-01-31 22:56 UTC (permalink / raw) To: netdev; +Cc: auke-jan.h.kok There's too much noise on systems that don't support MSI. Let's get rid of the unneeded message and make the real error message more specific. Signed-off-by: Andy Gospodarek <andy@greyhouse.net> --- netdev.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 0a2cb79..0c8cd1c 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -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; ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] e1000e: tweak irq allocation messages 2008-01-31 22:56 [PATCH] e1000e: tweak irq allocation messages Andy Gospodarek @ 2008-01-31 23:06 ` Andy Gospodarek 2008-01-31 23:54 ` Kok, Auke 0 siblings, 1 reply; 3+ messages in thread From: Andy Gospodarek @ 2008-01-31 23:06 UTC (permalink / raw) To: netdev, auke-jan.h.kok On Thu, Jan 31, 2008 at 05:56:39PM -0500, Andy Gospodarek wrote: > > There's too much noise on systems that don't support MSI. Let's get rid > of the unneeded message and make the real error message more specific. > > Signed-off-by: Andy Gospodarek <andy@greyhouse.net> > --- > > netdev.c | 12 +++++------- > 1 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c > index 0a2cb79..0c8cd1c 100644 > --- a/drivers/net/e1000e/netdev.c > +++ b/drivers/net/e1000e/netdev.c > @@ -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; (Reposted with the version I intended -- added ',' so it compiles!) 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> --- netdev.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 0a2cb79..0c8cd1c 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c @@ -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; ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] e1000e: tweak irq allocation messages 2008-01-31 23:06 ` Andy Gospodarek @ 2008-01-31 23:54 ` Kok, Auke 0 siblings, 0 replies; 3+ messages in thread From: Kok, Auke @ 2008-01-31 23:54 UTC (permalink / raw) To: Andy Gospodarek; +Cc: netdev, auke-jan.h.kok Andy Gospodarek wrote: > (Reposted with the version I intended -- added ',' so it compiles!) > > 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> thanks Andy, I'll post this to Jeff, Auke > --- > > netdev.c | 12 +++++------- > 1 files changed, 5 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c > index 0a2cb79..0c8cd1c 100644 > --- a/drivers/net/e1000e/netdev.c > +++ b/drivers/net/e1000e/netdev.c > @@ -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; > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-02-01 0:00 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-01-31 22:56 [PATCH] e1000e: tweak irq allocation messages Andy Gospodarek 2008-01-31 23:06 ` Andy Gospodarek 2008-01-31 23:54 ` Kok, Auke
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).