From: Markus Elfring <Markus.Elfring@web.de>
To: chrome-platform@lists.linux.dev, kernel-janitors@vger.kernel.org,
"Benson Leung" <bleung@chromium.org>,
"Günter Röck" <groeck@chromium.org>,
"Prashant Malani" <pmalani@chromium.org>,
"Tzung-Bi Shih" <tzungbi@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Heikki Krogerus <heikki.krogerus@linux.intel.com>
Subject: [PATCH] platform/chrome: cros_ec_typec: Use common error handling code in cros_typec_init_ports()
Date: Sat, 29 Jun 2024 15:33:21 +0200 [thread overview]
Message-ID: <a9623e7e-ce3a-434c-a904-39c6934c2ff5@web.de> (raw)
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 29 Jun 2024 15:17:44 +0200
Add a jump target so that a bit of exception handling can be better reused
at the end of this function implementation.
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/platform/chrome/cros_ec_typec.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c
index 4d305876ec08..aff744a0b38f 100644
--- a/drivers/platform/chrome/cros_ec_typec.c
+++ b/drivers/platform/chrome/cros_ec_typec.c
@@ -348,15 +348,13 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
port_prop = dev->of_node ? "reg" : "port-number";
device_for_each_child_node(dev, fwnode) {
if (fwnode_property_read_u32(fwnode, port_prop, &port_num)) {
- ret = -EINVAL;
dev_err(dev, "No port-number for port, aborting.\n");
- goto unregister_ports;
+ goto e_inval;
}
if (port_num >= typec->num_ports) {
dev_err(dev, "Invalid port number.\n");
- ret = -EINVAL;
- goto unregister_ports;
+ goto e_inval;
}
dev_dbg(dev, "Registering port %d\n", port_num);
@@ -408,6 +406,8 @@ static int cros_typec_init_ports(struct cros_typec_data *typec)
return 0;
+e_inval:
+ ret = -EINVAL;
unregister_ports:
cros_unregister_ports(typec);
return ret;
--
2.45.2
next reply other threads:[~2024-06-29 13:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-29 13:33 Markus Elfring [this message]
2024-06-29 14:30 ` Guenter Roeck
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=a9623e7e-ce3a-434c-a904-39c6934c2ff5@web.de \
--to=markus.elfring@web.de \
--cc=bleung@chromium.org \
--cc=chrome-platform@lists.linux.dev \
--cc=groeck@chromium.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pmalani@chromium.org \
--cc=tzungbi@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
all inboxes | Powered by JetHome®