| Message ID | 20240824055047.1706392-2-dmitry.torokhov@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 4a0467ed7387d7ed46f5e46ae6fd44987d1044c0 |
| Headers | show |
| Series | zforse_ts: assorted cleanups | expand |
Am Samstag, 24. August 2024, 07:50:25 CEST schrieb Dmitry Torokhov: > From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > > 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> mistmatch between From and first Signed-off-by Other than that: Reviewed-by: Heiko Stuebner <heiko@sntech.de> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > 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 fdf2d1e770c8..ffbd55c6e1d4 100644 > --- a/drivers/input/touchscreen/zforce_ts.c > +++ b/drivers/input/touchscreen/zforce_ts.c > @@ -803,15 +803,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; > } > >
On Sat, Aug 24, 2024 at 01:13:28PM +0200, Heiko Stübner wrote: > Am Samstag, 24. August 2024, 07:50:25 CEST schrieb Dmitry Torokhov: > > From: Sudip Mukherjee <sudipm.mukherjee@gmail.com> > > > > 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> > > mistmatch between From and first Signed-off-by Yeah, I got this patch a while ago... > > Other than that: > Reviewed-by: Heiko Stuebner <heiko@sntech.de> Is this for this patch only or for the whole series? > > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > > --- > > 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 fdf2d1e770c8..ffbd55c6e1d4 100644 > > --- a/drivers/input/touchscreen/zforce_ts.c > > +++ b/drivers/input/touchscreen/zforce_ts.c > > @@ -803,15 +803,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; > > } > > > > > > > > Thanks.
diff --git a/drivers/input/touchscreen/zforce_ts.c b/drivers/input/touchscreen/zforce_ts.c index fdf2d1e770c8..ffbd55c6e1d4 100644 --- a/drivers/input/touchscreen/zforce_ts.c +++ b/drivers/input/touchscreen/zforce_ts.c @@ -803,15 +803,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; }