Messages in this thread | | | Date | Wed, 6 Jul 2016 11:01:36 -0700 | From | Dmitry Torokhov <> | Subject | Re: [PATCH] Input: axp20x-pek: use devm_add_action_or_reset |
| |
On Sun, Jul 03, 2016 at 09:40:42PM +0100, Sudip Mukherjee wrote: > On Sunday 12 June 2016 03:12 PM, Sudip Mukherjee wrote: > >If devm_add_action() fails we are explicitly calling > >axp20x_remove_sysfs_group() 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> > >--- > > A gentle ping.
Hmm, I need to try and get Greg accept my devm_add_sysfs_group(), if that fails I'll take this patch.
Thanks.
> > Regards > Sudip > > > > drivers/input/misc/axp20x-pek.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > >diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c > >index 1ac898d..419ca97 100644 > >--- a/drivers/input/misc/axp20x-pek.c > >+++ b/drivers/input/misc/axp20x-pek.c > >@@ -260,10 +260,10 @@ static int axp20x_pek_probe(struct platform_device *pdev) > > return error; > > } > > > >- error = devm_add_action(&pdev->dev, > >- axp20x_remove_sysfs_group, &pdev->dev); > >+ error = devm_add_action_or_reset(&pdev->dev, > >+ axp20x_remove_sysfs_group, > >+ &pdev->dev); > > if (error) { > >- axp20x_remove_sysfs_group(&pdev->dev); > > dev_err(&pdev->dev, "Failed to add sysfs cleanup action: %d\n", > > error); > > return error; > > >
-- Dmitry
| |