From: Markus Elfring <Markus.Elfring@web.de>
To: devel@driverdev.osuosl.org,
Forest Bond <forest@alittletooquiet.net>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Quentin Deslandes <quentin.deslandes@itdev.co.uk>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH] staging: vt6656: Use common error handling code in vnt_alloc_bufs()
Date: Fri, 23 Aug 2019 15:30:11 +0200 [thread overview]
Message-ID: <91e8a9b7-e79d-dafc-10b8-dd79eb59eff9@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 23 Aug 2019 15:15:41 +0200
Adjust jump targets so that a bit of exception handling can be better
reused at the end of this function.
This issue was detected by using the Coccinelle software.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/staging/vt6656/main_usb.c | 46 +++++++++++++------------------
1 file changed, 19 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 856ba97aec4f..d9f14da37bbc 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -443,10 +443,8 @@ static int vnt_alloc_bufs(struct vnt_private *priv)
for (ii = 0; ii < priv->num_tx_context; ii++) {
tx_context = kmalloc(sizeof(*tx_context), GFP_KERNEL);
- if (!tx_context) {
- ret = -ENOMEM;
- goto free_tx;
- }
+ if (!tx_context)
+ goto e_nomem_tx;
priv->tx_context[ii] = tx_context;
tx_context->priv = priv;
@@ -454,20 +452,16 @@ static int vnt_alloc_bufs(struct vnt_private *priv)
/* allocate URBs */
tx_context->urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!tx_context->urb) {
- ret = -ENOMEM;
- goto free_tx;
- }
+ if (!tx_context->urb)
+ goto e_nomem_tx;
tx_context->in_use = false;
}
for (ii = 0; ii < priv->num_rcb; ii++) {
priv->rcb[ii] = kzalloc(sizeof(*priv->rcb[ii]), GFP_KERNEL);
- if (!priv->rcb[ii]) {
- ret = -ENOMEM;
- goto free_rx_tx;
- }
+ if (!priv->rcb[ii])
+ goto e_nomem_rx;
rcb = priv->rcb[ii];
@@ -475,16 +469,12 @@ static int vnt_alloc_bufs(struct vnt_private *priv)
/* allocate URBs */
rcb->urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!rcb->urb) {
- ret = -ENOMEM;
- goto free_rx_tx;
- }
+ if (!rcb->urb)
+ goto e_nomem_rx;
rcb->skb = dev_alloc_skb(priv->rx_buf_sz);
- if (!rcb->skb) {
- ret = -ENOMEM;
- goto free_rx_tx;
- }
+ if (!rcb->skb)
+ goto e_nomem_rx;
rcb->in_use = false;
@@ -495,21 +485,23 @@ static int vnt_alloc_bufs(struct vnt_private *priv)
}
priv->interrupt_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!priv->interrupt_urb) {
- ret = -ENOMEM;
- goto free_rx_tx;
- }
+ if (!priv->interrupt_urb)
+ goto e_nomem_rx;
priv->int_buf.data_buf = kmalloc(MAX_INTERRUPT_SIZE, GFP_KERNEL);
- if (!priv->int_buf.data_buf) {
- ret = -ENOMEM;
+ if (!priv->int_buf.data_buf)
goto free_rx_tx_urb;
- }
return 0;
+e_nomem_tx:
+ ret = -ENOMEM;
+ goto free_tx;
+
free_rx_tx_urb:
usb_free_urb(priv->interrupt_urb);
+e_nomem_rx:
+ ret = -ENOMEM;
free_rx_tx:
vnt_free_rx_bufs(priv);
free_tx:
--
2.23.0
next reply other threads:[~2019-08-23 13:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-23 13:30 Markus Elfring [this message]
2019-08-23 14:55 ` [PATCH] staging: vt6656: Use common error handling code in vnt_alloc_bufs() Quentin Deslandes
2019-08-23 17:24 ` Markus Elfring
2019-08-24 10:46 ` [PATCH] " Dan Carpenter
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=91e8a9b7-e79d-dafc-10b8-dd79eb59eff9@web.de \
--to=markus.elfring@web.de \
--cc=devel@driverdev.osuosl.org \
--cc=forest@alittletooquiet.net \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quentin.deslandes@itdev.co.uk \
/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).