From: Markus Elfring <Markus.Elfring@web.de>
To: Julia Lawall <Julia.Lawall@inria.fr>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Florian Fainelli <florian.fainelli@broadcom.com>,
Jakub Kicinski <kuba@kernel.org>,
Justin Chen <justin.chen@broadcom.com>,
Paolo Abeni <pabeni@redhat.com>,
bcm-kernel-feedback-list@broadcom.com, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org
Cc: cocci@inria.fr, LKML <linux-kernel@vger.kernel.org>
Subject: [cocci] [PATCH] net: bcmasp: Use common error handling code in bcmasp_probe()
Date: Sun, 5 Nov 2023 17:33:46 +0100 [thread overview]
Message-ID: <0b2972cb-03b2-40c7-a728-6ebe2512637f@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sun, 5 Nov 2023 17:24:01 +0100
Add a jump target so that a bit of exception handling can be better
reused at the end of this function.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/net/ethernet/broadcom/asp2/bcmasp.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index 29b04a274d07..675437e44b94 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -1304,9 +1304,8 @@ static int bcmasp_probe(struct platform_device *pdev)
intf = bcmasp_interface_create(priv, intf_node, i);
if (!intf) {
dev_err(dev, "Cannot create eth interface %d\n", i);
- bcmasp_remove_intfs(priv);
of_node_put(intf_node);
- goto of_put_exit;
+ goto remove_intfs;
}
list_add_tail(&intf->list, &priv->intfs);
i++;
@@ -1331,8 +1330,7 @@ static int bcmasp_probe(struct platform_device *pdev)
netdev_err(intf->ndev,
"failed to register net_device: %d\n", ret);
priv->destroy_wol(priv);
- bcmasp_remove_intfs(priv);
- goto of_put_exit;
+ goto remove_intfs;
}
count++;
}
@@ -1342,6 +1340,10 @@ static int bcmasp_probe(struct platform_device *pdev)
of_put_exit:
of_node_put(ports_node);
return ret;
+
+remove_intfs:
+ bcmasp_remove_intfs(priv);
+ goto of_put_exit;
}
static void bcmasp_remove(struct platform_device *pdev)
--
2.42.0
next reply other threads:[~2023-11-05 16:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-05 16:33 Markus Elfring [this message]
[not found] ` <83b0921a-5718-4dbf-b9bd-5662e47e3807@intel.com>
2023-11-06 13:55 ` [cocci] [PATCH] net: bcmasp: Use common error handling code in bcmasp_probe() Markus Elfring
[not found] ` <20231106145806.669875f4@kernel.org>
2023-11-07 6:38 ` [cocci] " Markus Elfring
[not found] ` <CALSSxFYRgPwEq+QhCOYPqrtae8RvL=jTOcz4mk3vbe+Fc0QwbQ@mail.gmail.com>
[not found] ` <4053e838-e5cf-4450-8067-21bdec989d1b@broadcom.com>
2023-11-15 9:10 ` [cocci] [PATCH v2] " Markus Elfring
[not found] ` <CALSSxFYBhv==pJTme0FThxP9JBJszsj1v4G2s-HGzkaevbyvBA@mail.gmail.com>
2023-11-16 20:24 ` Markus Elfring
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=0b2972cb-03b2-40c7-a728-6ebe2512637f@web.de \
--to=markus.elfring@web.de \
--cc=Julia.Lawall@inria.fr \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=cocci@inria.fr \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=justin.chen@broadcom.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).