[PATCH] Fixed else statement following a return statement in if block in hfa384x_usb.c

[Asheesh Ranjan]

This fixes a else after if block containing return statement warning as found 
by checkpatch.pl

Signed-off-by: Asheesh Ranjan 
---
 drivers/staging/wlan-ng/hfa384x_usb.c |9 -
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c 
b/drivers/staging/wlan-ng/hfa384x_usb.c
index 55d2f56..ae89a5b 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -4123,12 +4123,11 @@ static int hfa384x_isgood_pdrcode(u16 pdrcode)
pr_debug("Encountered unknown PDR#=0x%04x, assuming 
it's ok.\n",
 pdrcode);
return 1;
-   } else {
-   /* bad code */
-   pr_debug("Encountered unknown PDR#=0x%04x, (>=0x1000), 
assuming it's bad.\n",
-pdrcode);
-   return 0;
}
+   /* bad code */
+   pr_debug("Encountered unknown PDR#=0x%04x, (>=0x1000), assuming 
it's bad.\n",
+pdrcode);
+   return 0;
}
return 0;   /* avoid compiler warnings */
 }
-- 
1.7.10.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] Replacing simple_strtoul with kstrtoul

[Asheesh Ranjan]

Added code to move pointer till end of parsed string as being done by 
simple_strtoul. Not checking return value of kstrtoul
Signed-off-by: Asheesh Ranjan 
---
 drivers/staging/speakup/varhandlers.c |   17 +++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/speakup/varhandlers.c 
b/drivers/staging/speakup/varhandlers.c
index 1b0d1c0..0e516cf 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -322,9 +322,22 @@ char *spk_strlwr(char *s)
 
 char *spk_s2uchar(char *start, char *dest)
 {
-   int val = 0;
+   long val = 0, val_copy;
+   int err;
+
+   err = kstrtoul(skip_spaces(start), 10, &val);
+
+   while (isspace(*start))
+   start++; /*Skip leading whitespace*/
+   val_copy = val*10;
+   while (val_copy != 0) { /* Keep track of number of digits left */
+   if (isdigit(*start)) {
+   val_copy /= 10;
+   start++; /* Move forward by a digit */
+   } else
+   break;
+   }
 
-   val = simple_strtoul(skip_spaces(start), &start, 10);
if (*start == ',')
start++;
*dest = (u_char)val;
-- 
1.7.10.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH] Fixed else following return statement warning

[Asheesh Ranjan]

Fixed an else block following a if block containing return statement warning 
found using checkpatch.pl

Signed-off-by: Asheesh Ranjan 
---
 drivers/staging/rtl8192e/rtl819x_HTProc.c |   36 ++---
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c 
b/drivers/staging/rtl8192e/rtl819x_HTProc.c
index c7f4508..beddbac 100644
--- a/drivers/staging/rtl8192e/rtl819x_HTProc.c
+++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c
@@ -34,13 +34,13 @@ u16 MCS_DATA_RATE[2][2][77] = {
 468, 520, 0, 78, 104, 130, 117, 156, 195, 104, 130, 130, 156, 182,
 182, 208, 156, 195, 195, 234, 273, 273, 312, 130, 156, 181, 156,
 181, 208, 234, 208, 234, 260, 260, 286, 195, 234, 273, 234, 273,
-312, 351, 312, 351, 390, 390, 429} ,
+312, 351, 312, 351, 390, 390, 429},
{14, 29, 43, 58, 87, 116, 130, 144, 29, 58, 87, 116, 173, 231, 260, 289,
 43, 87, 130, 173, 260, 347, 390, 433, 58, 116, 173, 231, 347, 462, 520,
 578, 0, 87, 116, 144, 130, 173, 217, 116, 144, 144, 173, 202, 202, 231,
 173, 217, 217, 260, 303, 303, 347, 144, 173, 202, 173, 202, 231, 260,
 231, 260, 289, 289, 318, 217, 260, 303, 260, 303, 347, 390, 347, 390,
-433, 433, 477} } ,
+433, 433, 477} },
{{27, 54, 81, 108, 162, 216, 243, 270, 54, 108, 162, 216, 324, 432, 486,
 540, 81, 162, 243, 324, 486, 648, 729, 810, 108, 216, 324, 432, 648,
 864, 972, 1080, 12, 162, 216, 270, 243, 324, 405, 216, 270, 270, 324,
@@ -289,25 +289,23 @@ u16  TxCountToDataRate(struct rtllib_device *ieee, u8 
nDataRate)
u8  is40MHz = 0;
u8  isShortGI = 0;
 
-   if (nDataRate < 12) {
+   if (nDataRate < 12)
return CCKOFDMRate[nDataRate];
-   } else {
-   if (nDataRate >= 0x10 && nDataRate <= 0x1f) {
-   is40MHz = 0;
-   isShortGI = 0;
-   } else if (nDataRate >= 0x20  && nDataRate <= 0x2f) {
-   is40MHz = 1;
-   isShortGI = 0;
-
-   } else if (nDataRate >= 0x30  && nDataRate <= 0x3f) {
-   is40MHz = 0;
-   isShortGI = 1;
-   } else if (nDataRate >= 0x40  && nDataRate <= 0x4f) {
-   is40MHz = 1;
-   isShortGI = 1;
-   }
-   return MCS_DATA_RATE[is40MHz][isShortGI][nDataRate&0xf];
+
+   if (nDataRate >= 0x10 && nDataRate <= 0x1f) {
+   is40MHz = 0;
+   isShortGI = 0;
+   } else if (nDataRate >= 0x20  && nDataRate <= 0x2f) {
+   is40MHz = 1;
+   isShortGI = 0;
+   } else if (nDataRate >= 0x30  && nDataRate <= 0x3f) {
+   is40MHz = 0;
+   isShortGI = 1;
+   } else if (nDataRate >= 0x40  && nDataRate <= 0x4f) {
+   is40MHz = 1;
+   isShortGI = 1;
}
+   return MCS_DATA_RATE[is40MHz][isShortGI][nDataRate&0xf];
 }
 
 bool IsHTHalfNmodeAPs(struct rtllib_device *ieee)
-- 
1.7.10.4

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel