Staging: rtl8192e: rtllib_wx

The initial reason for looking at this code was an issue raised by checkpatch.pl:

      $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c
      CHECK: Please use a blank line after function/struct/union/enum
      declarations

The additional blank line above the struct/before the headers is just cleaner.

However, as it turns out since there is no str formatting required One can replace the error prone str + size struct with a char array. The rest of this patch fixes the usecases.

Signed-off-by Felix Schlepper <[email protected]>

---
  drivers/staging/rtl8192e/rtllib_wx.c | 21 ++++++---------------
  1 file changed, 6 insertions(+), 15 deletions(-)

drivers/staging/rtl8192e/rtllib_wx.c +3 -11

index cf9a240924f2..b7f19b38b0e1 100644
@@ -17,17 +17,9 @@
  #include <linux/module.h>
  #include <linux/etherdevice.h>
  #include "rtllib.h"
-struct modes_unit {
-	char *mode_string;
-	int mode_size;
-};
-static struct modes_unit rtllib_modes[] = {
-	{"a", 1},
-	{"b", 1},
-	{"g", 1},
-	{"?", 1},
-	{"N-24G", 5},
-	{"N-5G", 4},
+
+static const char * const rtllib_modes[] = {
+	"a", "b", "g", "?", "N-24G", "N-5G"
  };
 
  #define MAX_CUSTOM_LEN 64

@@ -72,10 +64,9 @@ static inline char *rtl819x_translate_scan(struct rtllib_device *ieee,
  	/* Add the protocol name */
  	iwe.cmd = SIOCGIWNAME;
  	for (i = 0; i < ARRAY_SIZE(rtllib_modes); i++) {

This addresses an issue raised by checkpatch.pl:

      $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c
      CHECK: multiple assignments should be avoided

Signed-off-by Felix Schlepper <[email protected]>

---
  drivers/staging/rtl8192e/rtllib_wx.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

drivers/staging/rtl8192e/rtllib_wx.c +0 -0

index b7f19b38b0e1..121bf939c6a4 100644

This addresses an issue raised by checkpatch.pl:

      $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c
      Unnecessary parentheses around wrqu->encoding

Signed-off-by Felix Schlepper <[email protected]>

---
  drivers/staging/rtl8192e/rtllib_wx.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)

drivers/staging/rtl8192e/rtllib_wx.c +1 -1

index 121bf939c6a4..db076e819993 100644
@@ -277,7 +277,7 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
  			 struct iw_request_info *info,
  			 union iwreq_data *wrqu, char *keybuf)
  {
-	struct iw_point *erq = &(wrqu->encoding);
+	struct iw_point *erq = &wrqu->encoding;
  	struct net_device *dev = ieee->dev;
  	struct rtllib_security sec = {
  		.flags = 0

This addresses two issues raised by checkpatch.pl:

      $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c
      CHECK: braces {} should be used on all arms of this statement
      CHECK: Unbalanced braces around else statement

The coding style rule with not using unnecessary braces around if/else does not apply if only one branch is a single statement.

Signed-off-by Felix Schlepper <[email protected]>

---
  drivers/staging/rtl8192e/rtllib_wx.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)

drivers/staging/rtl8192e/rtllib_wx.c +2 -1

index db076e819993..b949e7234150 100644
@@ -304,8 +304,9 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee,
  			netdev_dbg(ieee->dev,
  				   "Disabling encryption on key %d.\n", key);
  			lib80211_crypt_delayed_deinit(&ieee->crypt_info, crypt);
-		} else
+		} else {
  			netdev_dbg(ieee->dev, "Disabling encryption.\n");
+		}
 
  		/* Check all the keys to see if any are still configured,
  		 * and if no key index was provided, de-init them all

This addresses an issue raised by checkpatch.pl:

      $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c
      CHECK: Blank lines aren't necessary before a close brace '}'

Signed-off-by Felix Schlepper <[email protected]>

---
  drivers/staging/rtl8192e/rtllib_wx.c | 1 -
  1 file changed, 1 deletion(-)

drivers/staging/rtl8192e/rtllib_wx.c +0 -0

index b949e7234150..6b11908032d7 100644

This addresses two issues raised by checkpatch.pl:

      $ ./scripts/checkpatch.pl --terse -f drivers/staging/rtl8192e/rtllib_wx.c
      CHECK: spaces preferred around that '+' (ctx:VxV)

Signed-off-by Felix Schlepper <[email protected]>

---
  drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

drivers/staging/rtl8192e/rtllib_wx.c +0 -0

index 6b11908032d7..da2c41c9b92f 100644

This series addresses some issues raised by chechpatch.pl and some very minor refactoring.

v2:
- The first version, only addressed coding style issues. Now, I additionally refactored rtllib_modes and its uses, since there is no need to use string formatting.
- Logically separated one assignement into two. So we dont have 'fixed' = 'disabled', which was silly.

v3:
- Fixed a checkpatch.pl warning, which was introduced with patch 1/6.

Felix Schlepper (6):
Staging: rtl8192e: Refactored rtllib_modes
Staging: rtl8192e: Avoid multiple assignments
Staging: rtl8192e: Remove unnecessary parentheses
Staging: rtl8192e: Added braces around else
Staging: rtl8192e: Remove unnecessary blank line
Staging: rtl8192e: Added spaces around '+'

  drivers/staging/rtl8192e/rtllib_wx.c | 37 +++++++++++-----------------
  1 file changed, 15 insertions(+), 22 deletions(-)