linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
To: dan.j.williams@intel.com
Cc: ross.zwisler@linux.intel.com, linux-nvdimm@lists.01.org,
	linux-acpi@vger.kernel.org, linda.knippers@hpe.com,
	Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
Subject: [PATCH] nfit: use devm_add_action_or_reset()
Date: Mon,  4 Jul 2016 10:02:51 +0530	[thread overview]
Message-ID: <1467606771-21704-1-git-send-email-vikas.cha.sajjan@hpe.com> (raw)

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


             reply	other threads:[~2016-07-04  4:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-04  4:32 Vikas C Sajjan [this message]
     [not found] ` <1467606771-21704-1-git-send-email-vikas.cha.sajjan-ZPxbGqLxI0U@public.gmane.org>
2016-07-04  7:31   ` [PATCH] nfit: use devm_add_action_or_reset() 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467606771-21704-1-git-send-email-vikas.cha.sajjan@hpe.com \
    --to=vikas.cha.sajjan@hpe.com \
    --cc=dan.j.williams@intel.com \
    --cc=linda.knippers@hpe.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=ross.zwisler@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).