* [PATCH] nfit: use devm_add_action_or_reset()
@ 2016-07-04 4:32 Vikas C Sajjan
[not found] ` <1467606771-21704-1-git-send-email-vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>
2016-07-04 7:54 ` joeyli
0 siblings, 2 replies; 5+ messages in thread
From: Vikas C Sajjan @ 2016-07-04 4:32 UTC (permalink / raw)
To: dan.j.williams
Cc: ross.zwisler, linux-nvdimm, linux-acpi, linda.knippers,
Vikas C Sajjan
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 <vikas.cha.sajjan@hpe.com>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] nfit: use devm_add_action_or_reset()
[not found] ` <1467606771-21704-1-git-send-email-vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>
@ 2016-07-04 7:31 ` Johannes Thumshirn
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Thumshirn @ 2016-07-04 7:31 UTC (permalink / raw)
To: Vikas C Sajjan
Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA,
linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw
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 <vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>
Reviewed-by: Johannes Thumshirn <jthumshirn-l3A5Bk7waGM@public.gmane.org>
--
Johannes Thumshirn Storage
jthumshirn-l3A5Bk7waGM@public.gmane.org +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nfit: use devm_add_action_or_reset()
2016-07-04 4:32 [PATCH] nfit: use devm_add_action_or_reset() Vikas C Sajjan
[not found] ` <1467606771-21704-1-git-send-email-vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>
@ 2016-07-04 7:54 ` joeyli
2016-07-06 22:18 ` Dan Williams
1 sibling, 1 reply; 5+ messages in thread
From: joeyli @ 2016-07-04 7:54 UTC (permalink / raw)
To: Vikas C Sajjan
Cc: dan.j.williams, ross.zwisler, linux-nvdimm, linux-acpi,
linda.knippers
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 <vikas.cha.sajjan@hpe.com>
> ---
> 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 <jlee@suse.com>
Joey Lee
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] nfit: use devm_add_action_or_reset()
2016-07-04 7:54 ` joeyli
@ 2016-07-06 22:18 ` Dan Williams
[not found] ` <CAPcyv4h3QT9fwkVL6B79S=8UO6K+D8fzybWgr_dVS11vEB5=9A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Dan Williams @ 2016-07-06 22:18 UTC (permalink / raw)
To: joeyli
Cc: Vikas C Sajjan, Ross Zwisler, linux-nvdimm@lists.01.org,
Linux ACPI, Linda Knippers
Thanks, applied.
On Mon, Jul 4, 2016 at 12:54 AM, joeyli <jlee@suse.com> 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 <vikas.cha.sajjan@hpe.com>
>> ---
>> 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 <jlee@suse.com>
>
> Joey Lee
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH] nfit: use devm_add_action_or_reset()
[not found] ` <CAPcyv4h3QT9fwkVL6B79S=8UO6K+D8fzybWgr_dVS11vEB5=9A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
@ 2016-07-07 4:02 ` Sajjan, Vikas C
0 siblings, 0 replies; 5+ messages in thread
From: Sajjan, Vikas C @ 2016-07-07 4:02 UTC (permalink / raw)
To: Dan Williams
Cc: Linux ACPI, joeyli,
linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org
-----Original Message-----
From: Dan Williams [mailto:dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org]
Sent: Thursday, July 07, 2016 3:48 AM
To: joeyli <jlee-IBi9RG/b67k@public.gmane.org>
Cc: Sajjan, Vikas C <vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>; Ross Zwisler <ross.zwisler-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>; linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw@public.gmane.org; Linux ACPI <linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>; Knippers, Linda <linda.knippers-ZPxbGqLxI0U@public.gmane.org>
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 <jlee-IBi9RG/b67k@public.gmane.org> 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 <vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>
>> ---
>> 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 <jlee-IBi9RG/b67k@public.gmane.org>
>
> Joey Lee
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-07-07 4:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-04 4:32 [PATCH] nfit: use devm_add_action_or_reset() Vikas C Sajjan
[not found] ` <1467606771-21704-1-git-send-email-vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>
2016-07-04 7:31 ` Johannes Thumshirn
2016-07-04 7:54 ` joeyli
2016-07-06 22:18 ` Dan Williams
[not found] ` <CAPcyv4h3QT9fwkVL6B79S=8UO6K+D8fzybWgr_dVS11vEB5=9A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2016-07-07 4:02 ` Sajjan, Vikas C
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).