public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Pedro Marzo Perez <marzo.pedro@gmail.com>
To: gregkh@linuxfoundation.org, navyasri.tech@gmail.com,
	dilekuzulmez@gmail.com, joe@perches.com,
	haticeerturk27@gmail.com
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/3 v3] Staging: rtl8192u: Simplify error check code at prism2_wep_init
Date: Tue, 19 May 2015 01:32:22 +0200	[thread overview]
Message-ID: <1431991944-16924-2-git-send-email-marzo.pedro@gmail.com> (raw)
In-Reply-To: <1431991944-16924-1-git-send-email-marzo.pedro@gmail.com>

Merge two pr_debug lines with literal strings splitted across several lines
into one single line, simplifying prism2_wep_init error check code.

Signed-off-by: Pedro Marzo Perez <marzo.pedro@gmail.com>
---
 .../rtl8192u/ieee80211/ieee80211_crypt_wep.c       | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
index 0a17f84..388ed3c 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
@@ -9,6 +9,8 @@
  * more details.
  */
 
+#define pr_fmt(fmt) "ieee80211_crypt_wep: " fmt
+
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/slab.h>
@@ -43,20 +45,16 @@ static void *prism2_wep_init(int keyidx)
 
 	priv = kzalloc(sizeof(*priv), GFP_ATOMIC);
 	if (priv == NULL)
-		goto fail;
+		return NULL;
 	priv->key_idx = keyidx;
 
 	priv->tx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
 	if (IS_ERR(priv->tx_tfm)) {
-		pr_debug("ieee80211_crypt_wep: could not allocate "
-		       "crypto API arc4\n");
 		priv->tx_tfm = NULL;
 		goto fail;
 	}
 	priv->rx_tfm = crypto_alloc_blkcipher("ecb(arc4)", 0, CRYPTO_ALG_ASYNC);
 	if (IS_ERR(priv->rx_tfm)) {
-		pr_debug("ieee80211_crypt_wep: could not allocate "
-		       "crypto API arc4\n");
 		priv->rx_tfm = NULL;
 		goto fail;
 	}
@@ -67,14 +65,12 @@ static void *prism2_wep_init(int keyidx)
 	return priv;
 
 fail:
-	if (priv) {
-		if (priv->tx_tfm)
-			crypto_free_blkcipher(priv->tx_tfm);
-		if (priv->rx_tfm)
-			crypto_free_blkcipher(priv->rx_tfm);
-		kfree(priv);
-	}
-
+	pr_debug("could not allocate crypto API arc4\n");
+	if (priv->tx_tfm)
+		crypto_free_blkcipher(priv->tx_tfm);
+	if (priv->rx_tfm)
+		crypto_free_blkcipher(priv->rx_tfm);
+	kfree(priv);
 	return NULL;
 }
 
-- 
1.9.1


  reply	other threads:[~2015-05-18 21:22 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-18 23:32 [PATCH 0/3 v3] Staging: rtl8192u: Fix coding style issues at ieee80211_crypt_wep.c Pedro Marzo Perez
2015-05-18 23:32 ` Pedro Marzo Perez [this message]
2015-05-19  5:34   ` [PATCH 1/3 v3] Staging: rtl8192u: Simplify error check code at prism2_wep_init Sudip Mukherjee
2015-05-19 22:49     ` pmarzo
2015-05-19 21:46   ` Dan Carpenter
2015-05-20  8:26     ` pmarzo
2015-05-20  9:03       ` Dan Carpenter
2015-05-31  1:36   ` Greg KH
2015-05-18 23:32 ` [PATCH 2/3 v3] Staging: rtl8192u: Remove two useless lines at ieee80211_wep_null Pedro Marzo Perez
2015-05-31  1:37   ` Greg KH
2015-05-18 23:32 ` [PATCH 3/3 v3] Staging: rtl8192u: Correct include indentation and openning braces at new line Pedro Marzo Perez

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=1431991944-16924-2-git-send-email-marzo.pedro@gmail.com \
    --to=marzo.pedro@gmail.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=dilekuzulmez@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=haticeerturk27@gmail.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=navyasri.tech@gmail.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