From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Sajjan, Vikas C" Subject: RE: [PATCH] nfit: use devm_add_action_or_reset() Date: Thu, 7 Jul 2016 04:02:59 +0000 Message-ID: References: <1467606771-21704-1-git-send-email-vikas.cha.sajjan@hpe.com> <20160704075404.GB10278@linux-rxt1.site> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: Content-Language: en-US List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-nvdimm-bounces-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org Sender: "Linux-nvdimm" To: Dan Williams Cc: Linux ACPI , joeyli , "linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org" List-Id: linux-acpi@vger.kernel.org -----Original Message----- From: Dan Williams [mailto:dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org] Sent: Thursday, July 07, 2016 3:48 AM To: joeyli Cc: Sajjan, Vikas C ; Ross Zwisler ; linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org; Linux ACPI ; Knippers, Linda Subject: Re: [PATCH] nfit: use devm_add_action_or_reset() Thanks, applied. Thank you, Dan. On Mon, Jul 4, 2016 at 12:54 AM, joeyli wrote: > On Mon, Jul 04, 2016 at 10:02:51AM +0530, Vikas C Sajjan wrote: >> 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, >> since the cleanup function has been already called by the helper if there was any error. >> >> Signed-off-by: Vikas C Sajjan >> --- >> drivers/acpi/nfit.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/acpi/nfit.c b/drivers/acpi/nfit.c index >> c2ad967..44ebe1e 100644 >> --- a/drivers/acpi/nfit.c >> +++ b/drivers/acpi/nfit.c >> @@ -1920,11 +1920,11 @@ static int acpi_nfit_insert_resource(struct acpi_nfit_desc *acpi_desc, >> if (ret) >> return ret; >> >> - ret = devm_add_action(acpi_desc->dev, acpi_nfit_remove_resource, res); >> - if (ret) { >> - remove_resource(res); >> + ret = devm_add_action_or_reset(acpi_desc->dev, >> + acpi_nfit_remove_resource, >> + res); >> + if (ret) >> return ret; >> - } >> >> return 0; >> } >> -- >> 1.9.1 >> > > Reviewed-by: Lee, Chun-Yi > > Joey Lee