[PATCH 1/3 v3] Staging: rtl8192u: Simplify error check code at prism2_wep_init

[Pedro Marzo Perez <marzo.pedro@xxxxxxxxx>]

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@xxxxxxxxx>
---
 .../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

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel