2024-03-01 16:29:52

by Markus Elfring

Subject: [PATCH] usb: typec: fusb302: Use common error handling code in fusb302_probe()

From: Markus Elfring <[email protected]>
Date: Fri, 1 Mar 2024 17:00:23 +0100

Add a label so that a bit of exception handling can be better reused
at the end of this function implementation.

Signed-off-by: Markus Elfring <[email protected]>
---
drivers/usb/typec/tcpm/fusb302.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
index ef18a448b740..e1e030da1dec 100644
--- a/drivers/usb/typec/tcpm/fusb302.c
+++ b/drivers/usb/typec/tcpm/fusb302.c
@@ -1741,10 +1741,9 @@ static int fusb302_probe(struct i2c_client *client)

chip->tcpm_port = tcpm_register_port(&client->dev, &chip->tcpc_dev);
if (IS_ERR(chip->tcpm_port)) {
- fwnode_handle_put(chip->tcpc_dev.fwnode);
ret = dev_err_probe(dev, PTR_ERR(chip->tcpm_port),
"cannot register tcpm port\n");
- goto destroy_workqueue;
+ goto put_fwnode;
}

ret = request_irq(chip->gpio_int_n_irq, fusb302_irq_intn,
@@ -1761,6 +1760,7 @@ static int fusb302_probe(struct i2c_client *client)

tcpm_unregister_port:
tcpm_unregister_port(chip->tcpm_port);
+put_fwnode:
fwnode_handle_put(chip->tcpc_dev.fwnode);
destroy_workqueue:
fusb302_debugfs_exit(chip);
--
2.44.0

2024-03-12 16:10:35

by Heikki Krogerus

Subject: Re: [PATCH] usb: typec: fusb302: Use common error handling code in fusb302_probe()

On Fri, Mar 01, 2024 at 05:23:25PM +0100, Markus Elfring wrote:
> From: Markus Elfring <[email protected]>
> Date: Fri, 1 Mar 2024 17:00:23 +0100
>
> Add a label so that a bit of exception handling can be better reused
> at the end of this function implementation.
>
> Signed-off-by: Markus Elfring <[email protected]>

Acked-by: Heikki Krogerus <[email protected]>

> ---
> drivers/usb/typec/tcpm/fusb302.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
> index ef18a448b740..e1e030da1dec 100644
> --- a/drivers/usb/typec/tcpm/fusb302.c
> +++ b/drivers/usb/typec/tcpm/fusb302.c
> @@ -1741,10 +1741,9 @@ static int fusb302_probe(struct i2c_client *client)
>
> chip->tcpm_port = tcpm_register_port(&client->dev, &chip->tcpc_dev);
> if (IS_ERR(chip->tcpm_port)) {
> - fwnode_handle_put(chip->tcpc_dev.fwnode);
> ret = dev_err_probe(dev, PTR_ERR(chip->tcpm_port),
> "cannot register tcpm port\n");
> - goto destroy_workqueue;
> + goto put_fwnode;
> }
>
> ret = request_irq(chip->gpio_int_n_irq, fusb302_irq_intn,
> @@ -1761,6 +1760,7 @@ static int fusb302_probe(struct i2c_client *client)
>
> tcpm_unregister_port:
> tcpm_unregister_port(chip->tcpm_port);
> +put_fwnode:
> fwnode_handle_put(chip->tcpc_dev.fwnode);
> destroy_workqueue:
> fusb302_debugfs_exit(chip);
> --
> 2.44.0

--
heikki