Re: [PATCH] Fixed coding style issues at ieee80211_crypt_wep.c

Re: [PATCH] Fixed coding style issues at ieee80211_crypt_wep.c

[Joe Perches]

On Sat, 2015-05-16 at 10:40 +0200, Pedro Marzo Perez wrote:
> This patch just fixes some warnings and style errors reported by checkpatch.pl script
>     - Braces should not start in a new line
>     - C99 comments are not allowed (never use //)
>     - Literal strings should never be parted in several lines
>     - There was a useless return on a void function

Some will say this is doing too many things in a single patch.

> diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
[]

> +		pr_debug("ieee80211_crypt_wep: could not allocate crypto API arc4\n");
[]
> +		pr_debug("ieee80211_crypt_wep: could not allocate crypto API arc4\n");

These could use a pr_fmt prefix and the "ieee80211_crypt_wep: "
could be removed.

In fact, these could be consolidated into a single line if
moved into the fail block if the first allocation does
a direct return NULL instead of goto fail.

> @@ -293,6 +288,5 @@ void __exit ieee80211_crypto_wep_exit(void)
>  
>  void ieee80211_wep_null(void)
>  {
> -//	printk("============>%s()\n", __func__);
> -	return;
> +    /*printk("============>%s()\n", __func__);*/

Just delete this instead.

>  }

[PATCH] Fixed coding style issues at ieee80211_crypt_wep.c

[Pedro Marzo Perez]

This patch just fixes some warnings and style errors reported by checkpatch.pl script
    - Braces should not start in a new line
    - C99 comments are not allowed (never use //)
    - Literal strings should never be parted in several lines
    - There was a useless return on a void function

Signed-off-by: Pedro Marzo Perez <marzo.pedro@gmail.com>
---
 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
index 0a17f84..33b7b4d 100644
--- a/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
+++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c
@@ -48,15 +48,13 @@ static void *prism2_wep_init(int 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");
+		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");
+		pr_debug("ieee80211_crypt_wep: could not allocate crypto API arc4\n");
 		priv->rx_tfm = NULL;
 		goto fail;
 	}
@@ -142,9 +140,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 +197,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 +288,5 @@ void __exit ieee80211_crypto_wep_exit(void)
 
 void ieee80211_wep_null(void)
 {
-//	printk("============>%s()\n", __func__);
-	return;
+    /*printk("============>%s()\n", __func__);*/
 }
-- 
1.9.1

Re: [PATCH] Fixed coding style issues at ieee80211_crypt_wep.c

[Dan Carpenter]

Also the use a subsystem prefix in the subject:

[PATCH] Staging: rtl8192u: whatever...


regards,
dan carpenter

Re: [PATCH] Fixed coding style issues at ieee80211_crypt_wep.c

[pmarzo]

On Mon, 2015-05-18 at 11:33 +0300, Dan Carpenter wrote:
> Also the use a subsystem prefix in the subject:
> 
> [PATCH] Staging: rtl8192u: whatever...
> 
> 
> regards,
> dan carpenter
> 
Thanku for your comments, I will send an v2 patch version

regards, Pedro