* [PATCH v1] FIRMWARE: bcm47xx_nvram: Replace mac address parsing
@ 2017-12-12 9:28 Andy Shevchenko
2017-12-12 9:51 ` Andy Shevchenko
0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2017-12-12 9:28 UTC (permalink / raw)
To: Will Deacon, Dave Martin, Philippe Ombredanne, linux-kernel,
Andrew Morton
Cc: Andy Shevchenko
Replace sscanf() with mac_pton().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
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,
--
2.15.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1] FIRMWARE: bcm47xx_nvram: Replace mac address parsing
2017-12-12 9:28 [PATCH v1] FIRMWARE: bcm47xx_nvram: Replace mac address parsing Andy Shevchenko
@ 2017-12-12 9:51 ` Andy Shevchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2017-12-12 9:51 UTC (permalink / raw)
To: Will Deacon, Dave Martin, Philippe Ombredanne, linux-kernel,
Andrew Morton
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 <andriy.shevchenko@linux.intel.com>
> ---
> 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 <andriy.shevchenko@linux.intel.com>
Intel Finland Oy
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v1] FIRMWARE: bcm47xx_nvram: Replace mac address parsing
@ 2017-12-19 18:44 Andy Shevchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2017-12-19 18:44 UTC (permalink / raw)
To: Rafał Miłecki, linux-mips; +Cc: Andy Shevchenko
Replace sscanf() with mac_pton().
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/firmware/broadcom/Kconfig | 1 +
drivers/firmware/broadcom/bcm47xx_sprom.c | 20 +++++---------------
2 files changed, 6 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..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,
--
2.15.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-19 18:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-12 9:28 [PATCH v1] FIRMWARE: bcm47xx_nvram: Replace mac address parsing Andy Shevchenko
2017-12-12 9:51 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
2017-12-19 18:44 Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.