redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

staging: brcm80211: replace simple_strtoul usage in brcmsmac

Browse source 
The usage of simple_strtoul is not preferred. Instead kstrtoul
should be used. This patch fixes this for the brcmsmac driver.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Arend van Spriel 2011-08-08 15:58:26 +02:00 committed by Greg Kroah-Hartman
parent 1fda276eb1
commit 3f7e0c5df5
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/brcm80211/brcmsmac/main.c
View file

@ -4287,16 +4287,17 @@ int brcms_b_attach(struct brcms_c_info *wlc, u16 vendor, u16 device, uint unit,
#endif
if (bustype != SI_BUS) {
char *var;
unsigned long res;
var = getvar(vars, "vendid");
if (var) {
vendor = (u16) simple_strtoul(var, NULL, 0);
if (var && !kstrtoul(var, 0, &res)) {
vendor = (u16)res;
wiphy_err(wiphy, "Overriding vendor id = 0x%x\n",
vendor);
}
var = getvar(vars, "devid");
if (var) {
u16 devid = (u16) simple_strtoul(var, NULL, 0);
if (var && !kstrtoul(var, 0, &res)) {
u16 devid = (u16)res;
if (devid != 0xffff) {
device = devid;
wiphy_err(wiphy, "Overriding device id = 0x%x"
@ -9596,10 +9597,11 @@ char *getvar(char *vars, const char *name)
int getintvar(char *vars, const char *name)
{
char *val;
unsigned long res;
val = getvar(vars, name);
if (val == NULL)
return 0;
if (val && !kstrtoul(val, 0, &res))
return res;
return simple_strtoul(val, NULL, 0);
return 0;
}

7
drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
View file

@ -174,12 +174,13 @@ char *phy_getvar(struct brcms_phy *pi, const char *name)
int phy_getintvar(struct brcms_phy *pi, const char *name)
{
char *val;
unsigned long res;
val = PHY_GETVAR(pi, name);
if (val == NULL)
return 0;
if (val && !kstrtoul(val, 0, &res))
return res;
return simple_strtoul(val, NULL, 0);
return 0;
}
void wlc_phyreg_enter(struct brcms_phy_pub *pih)