On Thu, 2017-12-21 at 17:42 +0100, Hauke Mehrtens wrote:
>
> On 12/21/2017 03:40 PM, Andy Shevchenko wrote:
> > Replace sscanf() with mac_pton().
> >
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
>
> Acked-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
>
> The patch looks good, but I haven't tested them on my devices.
Any news on this, anyone?
> > ---
> > - use negative condition to be consistent with the rest code
> > drivers/firmware/broadcom/Kconfig | 1 +
> > drivers/firmware/broadcom/bcm47xx_sprom.c | 18 +++---------------
> > 2 files changed, 4 insertions(+), 15 deletions(-)
> >
> > diff --git a/drivers/firmware/broadcom/Kconfig
> > b/drivers/firmware/broadcom/Kconfig
> > index 5e29f83e7b39..c041dcb7ea52 100644
> > --- a/drivers/firmware/broadcom/Kconfig
> > +++ b/drivers/firmware/broadcom/Kconfig
> > @@ -13,6 +13,7 @@ config BCM47XX_NVRAM
> > config BCM47XX_SPROM
> > bool "Broadcom SPROM driver"
> > depends on BCM47XX_NVRAM
> > + select GENERIC_NET_UTILS
> > help
> > Broadcom devices store configuration data in SPROM.
> > Accessing it is
> > specific to the bus host type, e.g. PCI(e) devices have
> > it mapped in
> > diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c
> > b/drivers/firmware/broadcom/bcm47xx_sprom.c
> > index 62aa3cf09b4d..4787f86c8ac1 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,9 @@ 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))
> > + pr_warn("Can not parse mac address: %s\n", buf);
> > }
> >
> > static void nvram_read_alpha2(const char *prefix, const char *name,
> >
--
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Intel Finland Oy
