* [PATCH 1/3] Input: colibri-vf50-ts - Make use of the helper function devm_add_action_or_reset()
@ 2021-09-22 12:52 Cai Huoqing
2021-09-22 12:52 ` [PATCH 2/3] Input: elants_i2c " Cai Huoqing
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Cai Huoqing @ 2021-09-22 12:52 UTC (permalink / raw)
To: caihuoqing; +Cc: Dmitry Torokhov, linux-input, linux-kernel
The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and if devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
drivers/input/touchscreen/colibri-vf50-ts.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/colibri-vf50-ts.c b/drivers/input/touchscreen/colibri-vf50-ts.c
index aa829725ded7..1a1d8e70ec40 100644
--- a/drivers/input/touchscreen/colibri-vf50-ts.c
+++ b/drivers/input/touchscreen/colibri-vf50-ts.c
@@ -271,9 +271,8 @@ static int vf50_ts_probe(struct platform_device *pdev)
if (IS_ERR(channels))
return PTR_ERR(channels);
- error = devm_add_action(dev, vf50_ts_channel_release, channels);
+ error = devm_add_action_or_reset(dev, vf50_ts_channel_release, channels);
if (error) {
- iio_channel_release_all(channels);
dev_err(dev, "Failed to register iio channel release action");
return error;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] Input: elants_i2c - Make use of the helper function devm_add_action_or_reset()
2021-09-22 12:52 [PATCH 1/3] Input: colibri-vf50-ts - Make use of the helper function devm_add_action_or_reset() Cai Huoqing
@ 2021-09-22 12:52 ` Cai Huoqing
2021-09-23 4:49 ` Dmitry Torokhov
2021-09-22 12:52 ` [PATCH 3/3] Input: raydium_i2c_ts " Cai Huoqing
2021-09-23 4:39 ` [PATCH 1/3] Input: colibri-vf50-ts " Dmitry Torokhov
2 siblings, 1 reply; 6+ messages in thread
From: Cai Huoqing @ 2021-09-22 12:52 UTC (permalink / raw)
To: caihuoqing; +Cc: Dmitry Torokhov, linux-input, linux-kernel
The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and if devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
drivers/input/touchscreen/elants_i2c.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c
index 68f542bb809f..dd6adddb2463 100644
--- a/drivers/input/touchscreen/elants_i2c.c
+++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1439,11 +1439,10 @@ static int elants_i2c_probe(struct i2c_client *client)
if (error)
return error;
- error = devm_add_action(&client->dev, elants_i2c_power_off, ts);
+ error = devm_add_action_or_reset(&client->dev, elants_i2c_power_off, ts);
if (error) {
dev_err(&client->dev,
"failed to install power off action: %d\n", error);
- elants_i2c_power_off(ts);
return error;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 2/3] Input: elants_i2c - Make use of the helper function devm_add_action_or_reset()
2021-09-22 12:52 ` [PATCH 2/3] Input: elants_i2c " Cai Huoqing
@ 2021-09-23 4:49 ` Dmitry Torokhov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2021-09-23 4:49 UTC (permalink / raw)
To: Cai Huoqing; +Cc: linux-input, linux-kernel
On Wed, Sep 22, 2021 at 08:52:10PM +0800, Cai Huoqing wrote:
> The helper function devm_add_action_or_reset() will internally
> call devm_add_action(), and if devm_add_action() fails then it will
> execute the action mentioned and return the error code. So
> use devm_add_action_or_reset() instead of devm_add_action()
> to simplify the error handling, reduce the code.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] Input: raydium_i2c_ts - Make use of the helper function devm_add_action_or_reset()
2021-09-22 12:52 [PATCH 1/3] Input: colibri-vf50-ts - Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-22 12:52 ` [PATCH 2/3] Input: elants_i2c " Cai Huoqing
@ 2021-09-22 12:52 ` Cai Huoqing
2021-09-23 4:49 ` Dmitry Torokhov
2021-09-23 4:39 ` [PATCH 1/3] Input: colibri-vf50-ts " Dmitry Torokhov
2 siblings, 1 reply; 6+ messages in thread
From: Cai Huoqing @ 2021-09-22 12:52 UTC (permalink / raw)
To: caihuoqing; +Cc: Dmitry Torokhov, linux-input, linux-kernel
The helper function devm_add_action_or_reset() will internally
call devm_add_action(), and if devm_add_action() fails then it will
execute the action mentioned and return the error code. So
use devm_add_action_or_reset() instead of devm_add_action()
to simplify the error handling, reduce the code.
Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
---
drivers/input/touchscreen/raydium_i2c_ts.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/input/touchscreen/raydium_i2c_ts.c b/drivers/input/touchscreen/raydium_i2c_ts.c
index 92c48d8e35a4..ded77904ce87 100644
--- a/drivers/input/touchscreen/raydium_i2c_ts.c
+++ b/drivers/input/touchscreen/raydium_i2c_ts.c
@@ -1118,11 +1118,10 @@ static int raydium_i2c_probe(struct i2c_client *client,
if (error)
return error;
- error = devm_add_action(&client->dev, raydium_i2c_power_off, ts);
+ error = devm_add_action_or_reset(&client->dev, raydium_i2c_power_off, ts);
if (error) {
dev_err(&client->dev,
"failed to install power off action: %d\n", error);
- raydium_i2c_power_off(ts);
return error;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 3/3] Input: raydium_i2c_ts - Make use of the helper function devm_add_action_or_reset()
2021-09-22 12:52 ` [PATCH 3/3] Input: raydium_i2c_ts " Cai Huoqing
@ 2021-09-23 4:49 ` Dmitry Torokhov
0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2021-09-23 4:49 UTC (permalink / raw)
To: Cai Huoqing; +Cc: linux-input, linux-kernel
On Wed, Sep 22, 2021 at 08:52:11PM +0800, Cai Huoqing wrote:
> The helper function devm_add_action_or_reset() will internally
> call devm_add_action(), and if devm_add_action() fails then it will
> execute the action mentioned and return the error code. So
> use devm_add_action_or_reset() instead of devm_add_action()
> to simplify the error handling, reduce the code.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
Applied, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] Input: colibri-vf50-ts - Make use of the helper function devm_add_action_or_reset()
2021-09-22 12:52 [PATCH 1/3] Input: colibri-vf50-ts - Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-22 12:52 ` [PATCH 2/3] Input: elants_i2c " Cai Huoqing
2021-09-22 12:52 ` [PATCH 3/3] Input: raydium_i2c_ts " Cai Huoqing
@ 2021-09-23 4:39 ` Dmitry Torokhov
2 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2021-09-23 4:39 UTC (permalink / raw)
To: Cai Huoqing; +Cc: linux-input, linux-kernel
Hi Cai,
On Wed, Sep 22, 2021 at 08:52:09PM +0800, Cai Huoqing wrote:
> The helper function devm_add_action_or_reset() will internally
> call devm_add_action(), and if devm_add_action() fails then it will
> execute the action mentioned and return the error code. So
> use devm_add_action_or_reset() instead of devm_add_action()
> to simplify the error handling, reduce the code.
>
> Signed-off-by: Cai Huoqing <caihuoqing@baidu.com>
> ---
> drivers/input/touchscreen/colibri-vf50-ts.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/input/touchscreen/colibri-vf50-ts.c b/drivers/input/touchscreen/colibri-vf50-ts.c
> index aa829725ded7..1a1d8e70ec40 100644
> --- a/drivers/input/touchscreen/colibri-vf50-ts.c
> +++ b/drivers/input/touchscreen/colibri-vf50-ts.c
> @@ -271,9 +271,8 @@ static int vf50_ts_probe(struct platform_device *pdev)
> if (IS_ERR(channels))
> return PTR_ERR(channels);
>
> - error = devm_add_action(dev, vf50_ts_channel_release, channels);
> + error = devm_add_action_or_reset(dev, vf50_ts_channel_release, channels);
It looks like there is devm_iio_channel_get_all(), we should be using it
instead of installing a custom release action.
> if (error) {
> - iio_channel_release_all(channels);
> dev_err(dev, "Failed to register iio channel release action");
> return error;
> }
> --
> 2.25.1
>
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-09-23 4:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-22 12:52 [PATCH 1/3] Input: colibri-vf50-ts - Make use of the helper function devm_add_action_or_reset() Cai Huoqing
2021-09-22 12:52 ` [PATCH 2/3] Input: elants_i2c " Cai Huoqing
2021-09-23 4:49 ` Dmitry Torokhov
2021-09-22 12:52 ` [PATCH 3/3] Input: raydium_i2c_ts " Cai Huoqing
2021-09-23 4:49 ` Dmitry Torokhov
2021-09-23 4:39 ` [PATCH 1/3] Input: colibri-vf50-ts " 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).