From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755630AbcGFSBo (ORCPT ); Wed, 6 Jul 2016 14:01:44 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:34884 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932437AbcGFSBk (ORCPT ); Wed, 6 Jul 2016 14:01:40 -0400 Date: Wed, 6 Jul 2016 11:01:36 -0700 From: Dmitry Torokhov To: Sudip Mukherjee Cc: linux-kernel@vger.kernel.org, linux-input@vger.kernel.org Subject: Re: [PATCH] Input: axp20x-pek: use devm_add_action_or_reset Message-ID: <20160706180136.GF5447@dtor-ws> References: <1465740750-4881-1-git-send-email-sudipm.mukherjee@gmail.com> <5779784A.9040206@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <5779784A.9040206@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > >--- > > 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