diff options
| author | Arend van Spriel <arend@broadcom.com> | 2011-03-02 17:01:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-02 16:04:21 -0500 |
| commit | e343d3ea73e97b339ecb1d39f1cdd306da24a175 (patch) | |
| tree | 4fa866fd9dbb5320a24a4104141cb268e16ba222 /drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | |
| parent | 7ae92624969bdee951b64f638898ac9f96646558 (diff) | |
| download | linux-e343d3ea73e97b339ecb1d39f1cdd306da24a175.tar.gz | |
staging: brcm80211: replace simple_strtoul with strict_strtoul
By checkpatch recommendation using strict_strtoul now.
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/wl_mac80211.c')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 6059e4cc3aa1..6ce5172557f6 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 */ |