* [PATCH] Input: zforce_ts - use devm_add_action_or_reset()
@ 2016-07-03 20:48 Sudip Mukherjee
2016-07-06 18:00 ` Dmitry Torokhov
0 siblings, 1 reply; 2+ messages in thread
From: Sudip Mukherjee @ 2016-07-03 20:48 UTC (permalink / raw)
To: Dmitry Torokhov; +Cc: linux-kernel, linux-input, Sudip Mukherjee
If devm_add_action() fails we are explicitly calling the cleanup to free
the resources allocated. Lets use the helper devm_add_action_or_reset()
and return directly in case of error, as we know that the cleanup function
has been already called by the helper if there was any error.
Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
---
drivers/input/touchscreen/zforce_ts.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
index 7b3845a..6053e31 100644
--- a/drivers/input/touchscreen/zforce_ts.c
+++ b/drivers/input/touchscreen/zforce_ts.c
@@ -820,15 +820,12 @@ static int zforce_probe(struct i2c_client *client,
udelay(100);
}
- ret = devm_add_action(&client->dev, zforce_reset, ts);
+ ret = devm_add_action_or_reset(&client->dev, zforce_reset, ts);
if (ret) {
dev_err(&client->dev, "failed to register reset action, %d\n",
ret);
/* hereafter the regulator will be disabled by the action */
- if (!IS_ERR(ts->reg_vdd))
- regulator_disable(ts->reg_vdd);
-
return ret;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Input: zforce_ts - use devm_add_action_or_reset()
2016-07-03 20:48 [PATCH] Input: zforce_ts - use devm_add_action_or_reset() Sudip Mukherjee
@ 2016-07-06 18:00 ` Dmitry Torokhov
0 siblings, 0 replies; 2+ messages in thread
From: Dmitry Torokhov @ 2016-07-06 18:00 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: linux-kernel, linux-input
On Sun, Jul 03, 2016 at 09:48:46PM +0100, Sudip Mukherjee wrote:
> If devm_add_action() fails we are explicitly calling the cleanup to free
> the resources allocated. Lets use the helper devm_add_action_or_reset()
> and return directly in case of error, as we know that the cleanup function
> has been already called by the helper if there was any error.
>
> Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
This seems reasonable, I'll apply, thank you.
> ---
> drivers/input/touchscreen/zforce_ts.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c
> index 7b3845a..6053e31 100644
> --- a/drivers/input/touchscreen/zforce_ts.c
> +++ b/drivers/input/touchscreen/zforce_ts.c
> @@ -820,15 +820,12 @@ static int zforce_probe(struct i2c_client *client,
> udelay(100);
> }
>
> - ret = devm_add_action(&client->dev, zforce_reset, ts);
> + ret = devm_add_action_or_reset(&client->dev, zforce_reset, ts);
> if (ret) {
> dev_err(&client->dev, "failed to register reset action, %d\n",
> ret);
>
> /* hereafter the regulator will be disabled by the action */
> - if (!IS_ERR(ts->reg_vdd))
> - regulator_disable(ts->reg_vdd);
> -
> return ret;
> }
>
> --
> 1.9.1
>
--
Dmitry
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-06 18:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-03 20:48 [PATCH] Input: zforce_ts - use devm_add_action_or_reset() Sudip Mukherjee
2016-07-06 18:00 ` Dmitry Torokhov
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).