public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: adi-buildroot-devel@lists.sourceforge.net,
	alsa-devel@alsa-project.org, Jaroslav Kysela <perex@perex.cz>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Mark Brown <broonie@kernel.org>,
	Scott Jiang <scott.jiang.linux@gmail.com>,
	Takashi Iwai <tiwai@suse.com>
Cc: kernel-janitors@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/3] ASoC: blackfin: Use common error handling code in sport_create()
Date: Fri, 11 Aug 2017 20:42:20 +0000	[thread overview]
Message-ID: <ef3f99a2-7e51-ff07-8e68-3d74495854a9@users.sourceforge.net> (raw)
In-Reply-To: <e1ef440e-ed53-92f8-c30c-37c0b42cb351@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 11 Aug 2017 22:02:47 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 sound/soc/blackfin/bf6xx-sport.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/sound/soc/blackfin/bf6xx-sport.c b/sound/soc/blackfin/bf6xx-sport.c
index 1bc3e0a47a57..fcddebf2558c 100644
--- a/sound/soc/blackfin/bf6xx-sport.c
+++ b/sound/soc/blackfin/bf6xx-sport.c
@@ -394,19 +394,18 @@ struct sport_device *sport_create(struct platform_device *pdev)
 	sport->pdev = pdev;
 
 	ret = sport_get_resource(sport);
-	if (ret) {
-		kfree(sport);
-		return NULL;
-	}
+	if (ret)
+		goto free_data;
 
 	ret = sport_request_resource(sport);
-	if (ret) {
-		kfree(sport);
-		return NULL;
-	}
+	if (ret)
+		goto free_data;
 
 	dev_dbg(dev, "SPORT create success\n");
 	return sport;
+free_data:
+	kfree(sport);
+	return NULL;
 }
 EXPORT_SYMBOL(sport_create);
 
-- 
2.14.0


  parent reply	other threads:[~2017-08-11 20:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-11 20:40 [PATCH 0/3] ASoC-Blackfin: Adjustments for some function implementations SF Markus Elfring
2017-08-11 20:41 ` [PATCH 1/3] ASoC: blackfin: Delete an error message for a failed memory allocation in sport_create() SF Markus Elfring
2017-08-14 16:43   ` Applied "ASoC: blackfin: Delete an error message for a failed memory allocation in sport_create()" t Mark Brown
2017-08-11 20:42 ` SF Markus Elfring [this message]
2017-08-14 16:42   ` Applied "ASoC: blackfin: Use common error handling code in sport_create()" to the asoc tree Mark Brown
2017-08-11 20:43 ` [PATCH 3/3] ASoC: blackfin: Add some spaces for better code readability SF Markus Elfring
2017-08-14 16:42   ` Applied "ASoC: blackfin: Add some spaces for better code readability" to the asoc tree Mark Brown

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=ef3f99a2-7e51-ff07-8e68-3d74495854a9@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=adi-buildroot-devel@lists.sourceforge.net \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=scott.jiang.linux@gmail.com \
    --cc=tiwai@suse.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