2015-06-15 02:01:54

by Joe Perches

Subject: [PATCH] m68k: Use vsprintf %pM extension

Format mac addresses with the normal kernel extension.

Signed-off-by: Joe Perches <[email protected]>
---
arch/m68k/68000/m68EZ328.c | 3 +--
arch/m68k/68000/m68VZ328.c | 3 +--
arch/m68k/68360/config.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/m68k/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c
index 2195290..e6ab321 100644
--- a/arch/m68k/68000/m68EZ328.c
+++ b/arch/m68k/68000/m68EZ328.c
@@ -62,8 +62,7 @@ void __init config_BSP(char *command, int len)
#ifdef CONFIG_UCSIMM
printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());
p = cs8900a_hwaddr = gethwaddr(0);
- printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
- p[0], p[1], p[2], p[3], p[4], p[5]);
+ printk(KERN_INFO "uCsimm hwaddr %pM\n", p);

p = getbenv("APPEND");
if (p) strcpy(p,command);
diff --git a/arch/m68k/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c
index 0e5e5a1..1154bdb 100644
--- a/arch/m68k/68000/m68VZ328.c
+++ b/arch/m68k/68000/m68VZ328.c
@@ -152,8 +152,7 @@ static void __init init_hardware(char *command, int size)

printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());
p = cs8900a_hwaddr = gethwaddr(0);
- printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
- p[0], p[1], p[2], p[3], p[4], p[5]);
+ printk(KERN_INFO "uCdimm hwaddr %pM\n", p);
p = getbenv("APPEND");
if (p)
strcpy(p, command);
diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c
index fd1f948c..b65fe4e 100644
--- a/arch/m68k/68360/config.c
+++ b/arch/m68k/68360/config.c
@@ -154,8 +154,7 @@ void __init config_BSP(char *command, int len)
#if defined(CONFIG_UCQUICC) && 0
printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum());
p = scc1_hwaddr = gethwaddr(0);
- printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
- p[0], p[1], p[2], p[3], p[4], p[5]);
+ printk(KERN_INFO "uCquicc hwaddr %pM\n", p);

p = getbenv("APPEND");
if (p)

2015-06-15 07:17:10

by Geert Uytterhoeven

Subject: Re: [PATCH] m68k: Use vsprintf %pM extension

CC greg

On Mon, Jun 15, 2015 at 4:01 AM, Joe Perches <[email protected]> wrote:
> Format mac addresses with the normal kernel extension.
>
> Signed-off-by: Joe Perches <[email protected]>
> ---
> arch/m68k/68000/m68EZ328.c | 3 +--
> arch/m68k/68000/m68VZ328.c | 3 +--
> arch/m68k/68360/config.c | 3 +--
> 3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/arch/m68k/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c
> index 2195290..e6ab321 100644
> --- a/arch/m68k/68000/m68EZ328.c
> +++ b/arch/m68k/68000/m68EZ328.c
> @@ -62,8 +62,7 @@ void __init config_BSP(char *command, int len)
> #ifdef CONFIG_UCSIMM
> printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());
> p = cs8900a_hwaddr = gethwaddr(0);
> - printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
> - p[0], p[1], p[2], p[3], p[4], p[5]);
> + printk(KERN_INFO "uCsimm hwaddr %pM\n", p);
>
> p = getbenv("APPEND");
> if (p) strcpy(p,command);
> diff --git a/arch/m68k/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c
> index 0e5e5a1..1154bdb 100644
> --- a/arch/m68k/68000/m68VZ328.c
> +++ b/arch/m68k/68000/m68VZ328.c
> @@ -152,8 +152,7 @@ static void __init init_hardware(char *command, int size)
>
> printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());
> p = cs8900a_hwaddr = gethwaddr(0);
> - printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
> - p[0], p[1], p[2], p[3], p[4], p[5]);
> + printk(KERN_INFO "uCdimm hwaddr %pM\n", p);
> p = getbenv("APPEND");
> if (p)
> strcpy(p, command);
> diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c
> index fd1f948c..b65fe4e 100644
> --- a/arch/m68k/68360/config.c
> +++ b/arch/m68k/68360/config.c
> @@ -154,8 +154,7 @@ void __init config_BSP(char *command, int len)
> #if defined(CONFIG_UCQUICC) && 0
> printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum());
> p = scc1_hwaddr = gethwaddr(0);
> - printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
> - p[0], p[1], p[2], p[3], p[4], p[5]);
> + printk(KERN_INFO "uCquicc hwaddr %pM\n", p);
>
> p = getbenv("APPEND");
> if (p)

2015-06-16 07:45:22

by Greg Ungerer

Subject: Re: [PATCH] m68k: Use vsprintf %pM extension

Hi Joe,

On 15/06/15 12:01, Joe Perches wrote:
> Format mac addresses with the normal kernel extension.
>
> Signed-off-by: Joe Perches <[email protected]>

Thanks. I have pushed this into the m68knommu git tree
(for-next branch) on kernel.org.

Regards
Greg


> ---
> arch/m68k/68000/m68EZ328.c | 3 +--
> arch/m68k/68000/m68VZ328.c | 3 +--
> arch/m68k/68360/config.c | 3 +--
> 3 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/arch/m68k/68000/m68EZ328.c b/arch/m68k/68000/m68EZ328.c
> index 2195290..e6ab321 100644
> --- a/arch/m68k/68000/m68EZ328.c
> +++ b/arch/m68k/68000/m68EZ328.c
> @@ -62,8 +62,7 @@ void __init config_BSP(char *command, int len)
> #ifdef CONFIG_UCSIMM
> printk(KERN_INFO "uCsimm serial string [%s]\n",getserialnum());
> p = cs8900a_hwaddr = gethwaddr(0);
> - printk(KERN_INFO "uCsimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
> - p[0], p[1], p[2], p[3], p[4], p[5]);
> + printk(KERN_INFO "uCsimm hwaddr %pM\n", p);
>
> p = getbenv("APPEND");
> if (p) strcpy(p,command);
> diff --git a/arch/m68k/68000/m68VZ328.c b/arch/m68k/68000/m68VZ328.c
> index 0e5e5a1..1154bdb 100644
> --- a/arch/m68k/68000/m68VZ328.c
> +++ b/arch/m68k/68000/m68VZ328.c
> @@ -152,8 +152,7 @@ static void __init init_hardware(char *command, int size)
>
> printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());
> p = cs8900a_hwaddr = gethwaddr(0);
> - printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
> - p[0], p[1], p[2], p[3], p[4], p[5]);
> + printk(KERN_INFO "uCdimm hwaddr %pM\n", p);
> p = getbenv("APPEND");
> if (p)
> strcpy(p, command);
> diff --git a/arch/m68k/68360/config.c b/arch/m68k/68360/config.c
> index fd1f948c..b65fe4e 100644
> --- a/arch/m68k/68360/config.c
> +++ b/arch/m68k/68360/config.c
> @@ -154,8 +154,7 @@ void __init config_BSP(char *command, int len)
> #if defined(CONFIG_UCQUICC) && 0
> printk(KERN_INFO "uCquicc serial string [%s]\n",getserialnum());
> p = scc1_hwaddr = gethwaddr(0);
> - printk(KERN_INFO "uCquicc hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
> - p[0], p[1], p[2], p[3], p[4], p[5]);
> + printk(KERN_INFO "uCquicc hwaddr %pM\n", p);
>
> p = getbenv("APPEND");
> if (p)
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>