Skip to contentSkip to conversation

Staging: rtl8192u: Fix coding style issues at ieee80211_crypt_wep.c

PATCH New Pedro Marzo Perez 1 participant 3 messages Jun 2, 2015 Staging

lore
Share & tools
lore
#0 lore raw

v5 cover Staging: rtl8192u: Fix coding style issues at ieee80211_crypt_wep.c

The checkpatch.pl script reports several errors at file ieee80211_crypt_wep.c, this patch fixes them.

Pedro Marzo Perez (2):
Simplify error check code at prism2_wep_init
Remove two useless lines at ieee80211_wep_null

.../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 34 ++++++----------------

 1 file changed, 9 insertions(+), 25 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH v5 1/2 Staging: rtl8192u: Remove two useless lines at ieee80211_wep_null

Remove two lines at ieee80211_wep_null which checkpatch.pl reported as errors. The first one because it has a C99 comment style and the second one because it is a void return which is useless.
The function ieee80211_wep_null cannot be completely removed because it is exported and used to autoload the module.

---
 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 --
 1 file changed, 2 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +0 -2
index 651bd65..681611d 100644
@@ -276,6 +276,4 @@ void __exit ieee80211_crypto_wep_exit(void)
 
 void ieee80211_wep_null(void)
 {
-//	printk("============>%s()\n", __func__);
-	return;
 }
Signature · 1 line
1.9.1
#2 lore raw

PATCH v5 1/2 Staging: rtl8192u: Simplify error check code at prism2_wep_init

In reply to Pedro Marzo Perez

Simplify prism2_wep_init error check code employing goto when a failure is detected. Removed pr_debug which was given a checkpatch.pl error because of literal string
splitted across two lines of code, it was seldom going to be printed anyway.

---
 .../rtl8192u/ieee80211/ieee80211_crypt_wep.c       | 32 ++++++----------------
 1 file changed, 9 insertions(+), 23 deletions(-)
drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c +9 -23
index 26f2fb1..651bd65 100644
@@ -43,38 +43,24 @@ 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;
-	}
+	if (IS_ERR(priv->tx_tfm))
+		goto free_priv;
 	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;
-	}
+	if (IS_ERR(priv->rx_tfm))
+		goto free_tx;
 
 	/* start WEP IV from a random value */
 	get_random_bytes(&priv->iv, 4);
 
 	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);
-	}
-
+free_tx:
+	crypto_free_blkcipher(priv->tx_tfm);
+free_priv:
+	kfree(priv);
 	return NULL;
 }
 
Signature · 1 line
1.9.1