On Tue, 2017-12-12 at 11:28 +0200, Andy Shevchenko wrote: > Replace sscanf() with mac_pton().
Oops, wrong patch to you guys, though, if you wish to apply... I just send the intended one. Sorry for noise. > > Signed-off-by: Andy Shevchenko <[email protected]> > --- > drivers/firmware/broadcom/bcm47xx_sprom.c | 20 +++++--------------- > 1 file changed, 5 insertions(+), 15 deletions(-) > > diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c > b/drivers/firmware/broadcom/bcm47xx_sprom.c > index 62aa3cf09b4d..2b18a1608c1c 100644 > --- a/drivers/firmware/broadcom/bcm47xx_sprom.c > +++ b/drivers/firmware/broadcom/bcm47xx_sprom.c > @@ -137,20 +137,6 @@ static void nvram_read_leddc(const char *prefix, > const char *name, > *leddc_off_time = (val >> 16) & 0xff; > } > > -static void bcm47xx_nvram_parse_macaddr(char *buf, u8 macaddr[6]) > -{ > - if (strchr(buf, ':')) > - sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", > &macaddr[0], > - &macaddr[1], &macaddr[2], &macaddr[3], > &macaddr[4], > - &macaddr[5]); > - else if (strchr(buf, '-')) > - sscanf(buf, "%hhx-%hhx-%hhx-%hhx-%hhx-%hhx", > &macaddr[0], > - &macaddr[1], &macaddr[2], &macaddr[3], > &macaddr[4], > - &macaddr[5]); > - else > - pr_warn("Can not parse mac address: %s\n", buf); > -} > - > static void nvram_read_macaddr(const char *prefix, const char *name, > u8 val[6], bool fallback) > { > @@ -161,7 +147,11 @@ static void nvram_read_macaddr(const char > *prefix, const char *name, > if (err < 0) > return; > > - bcm47xx_nvram_parse_macaddr(buf, val); > + strreplace(buf, '-', ':'); > + if (mac_pton(buf, val)) > + return; > + > + pr_warn("Can not parse mac address: %s\n", buf); > } > > static void nvram_read_alpha2(const char *prefix, const char *name, -- Andy Shevchenko <[email protected]> Intel Finland Oy
