| Message ID | 20190708123332.11989-1-huangfq.daxian@gmail.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
| Series | None | expand |
On Mon, Jul 08, 2019 at 08:33:32PM +0800, Fuqian Huang wrote: > devm_add_action_or_reset() is introduced as a helper function which > internally calls devm_add_action(). If devm_add_action() fails > then it will execute the action mentioned and return the error code. > This reduce source code size (avoid writing the action twice) > and reduce the likelyhood of bugs. > > Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> > --- > drivers/input/mouse/elan_i2c_core.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c > index 420efaab3860..a8d4f3bd09bf 100644 > --- a/drivers/input/mouse/elan_i2c_core.c > +++ b/drivers/input/mouse/elan_i2c_core.c > @@ -1234,9 +1234,8 @@ static int elan_probe(struct i2c_client *client, > return error; > } > > - error = devm_add_action(dev, elan_remove_sysfs_groups, data); > + error = devm_add_action_or_reset(dev, elan_remove_sysfs_groups, data); Actually, the driver should use devm_device_add_groups() and then we do not need custom cleanup action, I posted a patch for that. > if (error) { > - elan_remove_sysfs_groups(data); > dev_err(dev, "Failed to add sysfs cleanup action: %d\n", > error); > return error; > -- > 2.11.0 > Thanks.
diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index 420efaab3860..a8d4f3bd09bf 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1234,9 +1234,8 @@ static int elan_probe(struct i2c_client *client, return error; } - error = devm_add_action(dev, elan_remove_sysfs_groups, data); + error = devm_add_action_or_reset(dev, elan_remove_sysfs_groups, data); if (error) { - elan_remove_sysfs_groups(data); dev_err(dev, "Failed to add sysfs cleanup action: %d\n", error); return error;
devm_add_action_or_reset() is introduced as a helper function which internally calls devm_add_action(). If devm_add_action() fails then it will execute the action mentioned and return the error code. This reduce source code size (avoid writing the action twice) and reduce the likelyhood of bugs. Signed-off-by: Fuqian Huang <huangfq.daxian@gmail.com> --- drivers/input/mouse/elan_i2c_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)