From: elfring@users.sourceforge.net (SF Markus Elfring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] net-thunder: One check less in nicvf_register_interrupts() after error detection
Date: Thu, 31 Dec 2015 22:47:31 +0100 [thread overview]
Message-ID: <5685A273.6070607@users.sourceforge.net> (raw)
In-Reply-To: <566ABCD9.1060404@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 31 Dec 2015 22:40:39 +0100
Adjust a jump target to eliminate a check before error logging.
Use the identifier "report_failure" instead of "err".
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/ethernet/cavium/thunder/nicvf_main.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
index c24cb2a..21e1579 100644
--- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -922,7 +922,7 @@ static int nicvf_register_interrupts(struct nicvf *nic)
ret = request_irq(vector, nicvf_intr_handler,
0, nic->irq_name[irq], nic->napi[irq]);
if (ret)
- goto err;
+ goto report_failure;
nic->irq_allocated[irq] = true;
}
@@ -933,7 +933,7 @@ static int nicvf_register_interrupts(struct nicvf *nic)
ret = request_irq(vector, nicvf_rbdr_intr_handler,
0, nic->irq_name[irq], nic);
if (ret)
- goto err;
+ goto report_failure;
nic->irq_allocated[irq] = true;
}
@@ -944,13 +944,12 @@ static int nicvf_register_interrupts(struct nicvf *nic)
ret = request_irq(nic->msix_entries[irq].vector,
nicvf_qs_err_intr_handler,
0, nic->irq_name[irq], nic);
- if (!ret)
+ if (!ret) {
nic->irq_allocated[irq] = true;
-
-err:
- if (ret)
- netdev_err(nic->netdev, "request_irq failed, vector %d\n", irq);
-
+ return 0;
+ }
+report_failure:
+ netdev_err(nic->netdev, "request_irq failed, vector %d\n", irq);
return ret;
}
--
2.6.3
next parent reply other threads:[~2015-12-31 21:47 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <566ABCD9.1060404@users.sourceforge.net>
2015-12-31 21:47 ` SF Markus Elfring [this message]
2016-01-07 11:07 ` [PATCH] net-thunder: One check less in nicvf_register_interrupts() after error detection Robert Richter
2016-01-07 19:30 ` SF Markus Elfring
2016-01-07 19:44 ` Joe Perches
2016-01-07 19:56 ` SF Markus Elfring
2016-01-07 19:59 ` Joe Perches
2016-01-07 20:07 ` SF Markus Elfring
2016-01-07 20:28 ` Joe Perches
2016-01-07 20:38 ` SF Markus Elfring
2016-01-07 20:42 ` Joe Perches
2016-09-17 15:05 ` [PATCH 00/24] ste_dma40: Fine-tuning for several function implementations SF Markus Elfring
2016-09-17 15:07 ` [PATCH 01/24] ste_dma40: Use kmalloc_array() in d40_lcla_allocate() SF Markus Elfring
2016-09-17 15:08 ` [PATCH 02/24] ste_dma40: Return directly after a failed kmalloc_array() SF Markus Elfring
2016-09-17 15:09 ` [PATCH 03/24] ste_dma40: Rename a jump label in d40_lcla_allocate() SF Markus Elfring
2016-09-17 15:10 ` [PATCH 04/24] ste_dma40: Move an assignment " SF Markus Elfring
2016-09-17 15:11 ` [PATCH 05/24] ste_dma40: Improve a size determination in d40_of_probe() SF Markus Elfring
2016-09-17 15:12 ` [PATCH 06/24] ste_dma40: Replace four kzalloc() calls by kcalloc() in d40_hw_detect_init() SF Markus Elfring
2016-09-17 15:15 ` [PATCH 07/24] ste_dma40: Use kmalloc_array() " SF Markus Elfring
2016-09-17 15:16 ` [PATCH 08/24] ste_dma40: Less checks in d40_hw_detect_init() after error detection SF Markus Elfring
2016-09-17 15:17 ` [PATCH 09/24] ste_dma40: Delete unnecessary variable initialisations in d40_hw_detect_init() SF Markus Elfring
2016-09-17 15:18 ` [PATCH 10/24] ste_dma40: Adjust the position of a jump label in d40_probe() SF Markus Elfring
2016-09-17 15:19 ` [PATCH 11/24] ste_dma40: Rename " SF Markus Elfring
2016-09-17 15:20 ` [PATCH 12/24] ste_dma40: Rename jump labels in d40_dmaengine_init() SF Markus Elfring
2016-09-17 15:22 ` [PATCH 13/24] ste_dma40: Rename a jump label in d40_alloc_chan_resources() SF Markus Elfring
2016-09-17 15:23 ` [PATCH 14/24] ste_dma40: One check less in d40_prep_sg() after error detection SF Markus Elfring
2016-09-17 15:25 ` [PATCH 15/24] ste_dma40: Move two assignments in d40_prep_sg() SF Markus Elfring
2016-09-17 15:26 ` [PATCH 16/24] ste_dma40: Rename a jump label in d40_prep_desc() SF Markus Elfring
2016-09-17 15:27 ` [PATCH 17/24] ste_dma40: Move an assignment " SF Markus Elfring
2016-09-17 15:30 ` [PATCH 18/24] ste_dma40: Rename a jump label in d40_is_paused() SF Markus Elfring
2016-09-17 15:31 ` [PATCH 19/24] ste_dma40: Rename a jump label in d40_free_dma() SF Markus Elfring
2016-09-17 15:32 ` [PATCH 20/24] ste_dma40: Rename a jump label in d40_alloc_mask_free() SF Markus Elfring
2016-09-17 15:33 ` [PATCH 21/24] ste_dma40: Rename jump labels in d40_alloc_mask_set() SF Markus Elfring
2016-09-17 15:34 ` [PATCH 22/24] ste_dma40: Rename a jump label in dma_tasklet() SF Markus Elfring
2016-09-17 15:35 ` [PATCH 23/24] ste_dma40: Rename a jump label in __d40_execute_command_phy() SF Markus Elfring
2016-09-17 15:36 ` [PATCH 24/24] ste_dma40: Rename a jump label in d40_log_lli_to_lcxa() SF Markus Elfring
2016-09-23 9:41 ` [PATCH 00/24] ste_dma40: Fine-tuning for several function implementations Linus Walleij
2016-09-26 17:39 ` Vinod Koul
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=5685A273.6070607@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=linux-arm-kernel@lists.infradead.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).