[PATCH v2] Staging: rtl8192u: Fix coding style issues at ieee80211_crypt_wep.c

[Pedro Marzo Perez]

Merge two pr_debug lines with literal strings splitted across several lines
into one single line, simplifying prism2_wep_init error check code.
Openning braces should never be in a new line, move them to the end of
the previous line.
Removed two useless lines at ieee80211_wep_null.

Signed-off-by: Pedro Marzo Perez <marzo.pe...@gmail.com>
---
 .../rtl8192u/ieee80211/ieee80211_crypt_wep.c       | 33 ++++++++--------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c 
b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
index 0a17f84..1074916 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>
@@ -19,7 +21,7 @@
 #include "ieee80211.h"
 
 #include <linux/crypto.h>
-    #include <linux/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <linux/crc32.h>
 
 MODULE_AUTHOR("Jouni Malinen");
@@ -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(pr_fmt("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;
 }
 
@@ -142,9 +138,7 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int 
hdr_len, void *priv)
        /* Copy rest of the WEP key (the secret part) */
        memcpy(key + 3, wep->key, wep->key_len);
 
-       if (!tcb_desc->bHwSec)
-       {
-
+       if (!tcb_desc->bHwSec) {
                /* Append little-endian CRC32 and encrypt it to produce ICV */
                crc = ~crc32_le(~0, pos, len);
                icv = skb_put(skb, 4);
@@ -201,8 +195,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int 
hdr_len, void *priv)
        /* Apply RC4 to data and compute CRC32 over decrypted data */
        plen = skb->len - hdr_len - 8;
 
-       if (!tcb_desc->bHwSec)
-       {
+       if (!tcb_desc->bHwSec) {
                crypto_blkcipher_setkey(wep->rx_tfm, key, klen);
                sg_init_one(&sg, pos, plen+4);
 
@@ -293,6 +286,4 @@ void __exit ieee80211_crypto_wep_exit(void)
 
 void ieee80211_wep_null(void)
 {
-//     printk("============>%s()\n", __func__);
-       return;
 }
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/