From: Alexander Gordeev <agordeev@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Alexander Gordeev <agordeev@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Patrick McHardy <kaber@trash.net>,
netdev@vger.kernel.org, linux-pci@vger.kernel.org
Subject: [PATCH 23/34] forcedeth: Fix invalid errno reporting in nv_request_irq()
Date: Fri, 31 Jan 2014 16:08:42 +0100 [thread overview]
Message-ID: <d47456e3944250e98e01c2686caa3a836986250b.1391172839.git.agordeev@redhat.com> (raw)
In-Reply-To: <cover.1391172839.git.agordeev@redhat.com>
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
---
drivers/net/ethernet/nvidia/forcedeth.c | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c
index 70cf97f..f4270b8 100644
--- a/drivers/net/ethernet/nvidia/forcedeth.c
+++ b/drivers/net/ethernet/nvidia/forcedeth.c
@@ -3952,8 +3952,9 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
if (optimization_mode == NV_OPTIMIZATION_MODE_THROUGHPUT && !intr_test) {
/* Request irq for rx handling */
sprintf(np->name_rx, "%s-rx", dev->name);
- if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector,
- nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev) != 0) {
+ ret = request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector,
+ nv_nic_irq_rx, IRQF_SHARED, np->name_rx, dev);
+ if (ret) {
netdev_info(dev,
"request_irq failed for rx %d\n",
ret);
@@ -3963,8 +3964,9 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
}
/* Request irq for tx handling */
sprintf(np->name_tx, "%s-tx", dev->name);
- if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector,
- nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev) != 0) {
+ ret = request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector,
+ nv_nic_irq_tx, IRQF_SHARED, np->name_tx, dev);
+ if (ret) {
netdev_info(dev,
"request_irq failed for tx %d\n",
ret);
@@ -3974,8 +3976,9 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
}
/* Request irq for link and timer handling */
sprintf(np->name_other, "%s-other", dev->name);
- if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector,
- nv_nic_irq_other, IRQF_SHARED, np->name_other, dev) != 0) {
+ ret = request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector,
+ nv_nic_irq_other, IRQF_SHARED, np->name_other, dev);
+ if (ret) {
netdev_info(dev,
"request_irq failed for link %d\n",
ret);
@@ -3991,7 +3994,9 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
set_msix_vector_map(dev, NV_MSI_X_VECTOR_OTHER, NVREG_IRQ_OTHER);
} else {
/* Request irq for all interrupts */
- if (request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector, handler, IRQF_SHARED, dev->name, dev) != 0) {
+ ret = request_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector,
+ handler, IRQF_SHARED, dev->name, dev);
+ if (ret) {
netdev_info(dev,
"request_irq failed %d\n",
ret);
@@ -4011,7 +4016,8 @@ static int nv_request_irq(struct net_device *dev, int intr_test)
ret = pci_enable_msi(np->pci_dev);
if (ret == 0) {
np->msi_flags |= NV_MSI_ENABLED;
- if (request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev) != 0) {
+ ret = request_irq(np->pci_dev->irq, handler, IRQF_SHARED, dev->name, dev);
+ if (ret) {
netdev_info(dev, "request_irq failed %d\n",
ret);
pci_disable_msi(np->pci_dev);
--
1.7.7.6
next prev parent reply other threads:[~2014-01-31 15:13 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1391172839.git.agordeev@redhat.com>
2014-01-31 15:08 ` [PATCH 01/34] bnx2: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 21:30 ` David Miller
2014-02-11 0:38 ` Bjorn Helgaas
2014-02-11 1:08 ` Bjorn Helgaas
2014-02-12 13:26 ` Alexander Gordeev
2014-02-12 17:00 ` Bjorn Helgaas
2014-02-12 18:08 ` Alexander Gordeev
2014-02-11 8:01 ` Alexander Gordeev
2014-01-31 15:08 ` [PATCH 02/34] bnx2x: " Alexander Gordeev
2014-01-31 19:11 ` Sergei Shtylyov
2014-01-31 15:08 ` [PATCH 03/34] tg3: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 04/34] bna: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 05/34] cxgb3: Remove superfluous call to pci_disable_msix() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 06/34] cxgb3: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 07/34] cxgb4: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 08/34] cxgb4vf: Remove superfluous call to pci_disable_msix() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 09/34] cxgb4vf: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 10/34] enic: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 11/34] benet: " Alexander Gordeev
2014-02-03 6:21 ` Sathya Perla
2014-01-31 15:08 ` [PATCH 12/34] e1000e: " Alexander Gordeev
2014-01-31 19:17 ` Sergei Shtylyov
2014-01-31 15:08 ` [PATCH 13/34] i40e: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 14/34] igb: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 15/34] igbvf: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 16/34] ixgbe: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 17/34] ixgbevf: " Alexander Gordeev
2014-01-31 19:20 ` Sergei Shtylyov
2014-01-31 15:08 ` [PATCH 18/34] mlx4: " Alexander Gordeev
2014-01-31 19:22 ` Sergei Shtylyov
2014-02-02 9:43 ` Amir Vadai
2014-01-31 15:08 ` [PATCH 19/34] mlx5: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 20/34] myri10ge: " Alexander Gordeev
2014-01-31 19:24 ` Sergei Shtylyov
2014-02-01 14:13 ` Hyong-Youb Kim
2014-01-31 15:08 ` [PATCH 21/34] s2io: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 22/34] vxge: " Alexander Gordeev
2014-01-31 15:08 ` Alexander Gordeev [this message]
2014-01-31 15:08 ` [PATCH 24/34] forcedeth: Cleanup MSI-X to MSI to INTx fallback code Alexander Gordeev
2014-01-31 15:08 ` [PATCH 25/34] forcedeth: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 26/34] netxen: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 27/34] qlcnic: Cleanup qlcnic_enable_msix() return values Alexander Gordeev
2014-01-31 15:08 ` [PATCH 28/34] qlcnic: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 29/34] qlge: Get rid of an redundant assignment Alexander Gordeev
2014-01-31 15:08 ` [PATCH 30/34] qlge: Use pci_enable_msix_range() Alexander Gordeev
2014-01-31 15:08 ` [PATCH 31/34] efx: " Alexander Gordeev
2014-01-31 17:21 ` Shradha Shah
2014-01-31 15:08 ` [PATCH 32/34] niu: " Alexander Gordeev
2014-01-31 15:08 ` [PATCH 33/34] vmxnet3: Fix MSI-X/MSI enablement code Alexander Gordeev
2014-01-31 15:08 ` [PATCH 34/34] vmxnet3: Use pci_enable_msix_range() Alexander Gordeev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d47456e3944250e98e01c2686caa3a836986250b.1391172839.git.agordeev@redhat.com \
--to=agordeev@redhat.com \
--cc=davem@davemloft.net \
--cc=kaber@trash.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).