[PATCH 631/961] staging: brcm80211: replace simple_strtoul with strict_strtoul
Greg Kroah-Hartman
gregkh at suse.de
Wed Mar 16 21:04:34 UTC 2011
From: Arend van Spriel <arend at broadcom.com>
By checkpatch recommendation using strict_strtoul now.
Reviewed-by: Roland Vossen <rvossen at broadcom.com>
Reviewed-by: Brett Rudley <brudley at broadcom.com>
Signed-off-by: Arend van Spriel <arend at broadcom.com>
Reviewed-by: Dan Carpenter <error27 at gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 26 ++++++++++++---------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 6059e4c..6ce5172 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -1293,18 +1293,22 @@ static int __init wl_module_init(void)
wl_msg_level = msglevel;
else {
char *var = getvar(NULL, "wl_msglevel");
- if (var)
- wl_msg_level = simple_strtoul(var, NULL, 0);
- }
- {
- extern u32 phyhal_msg_level;
-
- if (phymsglevel != 0xdeadbeef)
- phyhal_msg_level = phymsglevel;
- else {
- char *var = getvar(NULL, "phy_msglevel");
- if (var)
- phyhal_msg_level = simple_strtoul(var, NULL, 0);
+ if (var) {
+ unsigned long value;
+
+ (void)strict_strtoul(var, 0, &value);
+ wl_msg_level = value;
+ }
+ }
+ if (phymsglevel != 0xdeadbeef)
+ phyhal_msg_level = phymsglevel;
+ else {
+ char *var = getvar(NULL, "phy_msglevel");
+ if (var) {
+ unsigned long value;
+
+ (void)strict_strtoul(var, 0, &value);
+ phyhal_msg_level = value;
}
}
#endif /* BCMDBG */
--
1.7.4.1
More information about the devel
mailing list