diff mbox

ARM: orion5x: Use vsprintf %pM extension

Message ID 1434333690.2507.30.camel@perches.com (mailing list archive)
State New, archived
Headers show

Commit Message

Joe Perches June 15, 2015, 2:01 a.m. UTC
Format mac addresses with the normal kernel extension.

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/arm/mach-orion5x/dns323-setup.c | 4 +---
 arch/arm/mach-orion5x/tsx09-common.c | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

Comments

Andrew Lunn June 15, 2015, 3:28 a.m. UTC | #1
On Sun, Jun 14, 2015 at 07:01:30PM -0700, Joe Perches wrote:
> Format mac addresses with the normal kernel extension.
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Andrew Lunn <andrew@lunn.ch>

	  Andrew

> ---
>  arch/arm/mach-orion5x/dns323-setup.c | 4 +---
>  arch/arm/mach-orion5x/tsx09-common.c | 4 +---
>  2 files changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
> index 09d2a26..f267e58 100644
> --- a/arch/arm/mach-orion5x/dns323-setup.c
> +++ b/arch/arm/mach-orion5x/dns323-setup.c
> @@ -236,9 +236,7 @@ static int __init dns323_read_mac_addr(void)
>  	}
>  
>  	iounmap(mac_page);
> -	printk("DNS-323: Found ethernet MAC address: ");
> -	for (i = 0; i < 6; i++)
> -		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
> +	printk("DNS-323: Found ethernet MAC address: %pM\n", addr);
>  
>  	memcpy(dns323_eth_data.mac_addr, addr, 6);
>  
> diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c
> index 7189827..24b2959 100644
> --- a/arch/arm/mach-orion5x/tsx09-common.c
> +++ b/arch/arm/mach-orion5x/tsx09-common.c
> @@ -101,9 +101,7 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
>  		addr[i] = byte;
>  	}
>  
> -	printk(KERN_INFO "tsx09: found ethernet mac address ");
> -	for (i = 0; i < 6; i++)
> -		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
> +	printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);
>  
>  	memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
>  
> 
>
Gregory CLEMENT June 17, 2015, 2:53 p.m. UTC | #2
Hi Andrew, Joe,

On 15/06/2015 05:28, Andrew Lunn wrote:
> On Sun, Jun 14, 2015 at 07:01:30PM -0700, Joe Perches wrote:
>> Format mac addresses with the normal kernel extension.
>>
>> Signed-off-by: Joe Perches <joe@perches.com>
> 
> Acked-by: Andrew Lunn <andrew@lunn.ch>

applied on mvebu/cleanup-4.3

Thanks,

Gregory
> 
> 	  Andrew
> 
>> ---
>>  arch/arm/mach-orion5x/dns323-setup.c | 4 +---
>>  arch/arm/mach-orion5x/tsx09-common.c | 4 +---
>>  2 files changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
>> index 09d2a26..f267e58 100644
>> --- a/arch/arm/mach-orion5x/dns323-setup.c
>> +++ b/arch/arm/mach-orion5x/dns323-setup.c
>> @@ -236,9 +236,7 @@ static int __init dns323_read_mac_addr(void)
>>  	}
>>  
>>  	iounmap(mac_page);
>> -	printk("DNS-323: Found ethernet MAC address: ");
>> -	for (i = 0; i < 6; i++)
>> -		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
>> +	printk("DNS-323: Found ethernet MAC address: %pM\n", addr);
>>  
>>  	memcpy(dns323_eth_data.mac_addr, addr, 6);
>>  
>> diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c
>> index 7189827..24b2959 100644
>> --- a/arch/arm/mach-orion5x/tsx09-common.c
>> +++ b/arch/arm/mach-orion5x/tsx09-common.c
>> @@ -101,9 +101,7 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
>>  		addr[i] = byte;
>>  	}
>>  
>> -	printk(KERN_INFO "tsx09: found ethernet mac address ");
>> -	for (i = 0; i < 6; i++)
>> -		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
>> +	printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);
>>  
>>  	memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
>>  
>>
>>
diff mbox

Patch

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 09d2a26..f267e58 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -236,9 +236,7 @@  static int __init dns323_read_mac_addr(void)
 	}
 
 	iounmap(mac_page);
-	printk("DNS-323: Found ethernet MAC address: ");
-	for (i = 0; i < 6; i++)
-		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
+	printk("DNS-323: Found ethernet MAC address: %pM\n", addr);
 
 	memcpy(dns323_eth_data.mac_addr, addr, 6);
 
diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c
index 7189827..24b2959 100644
--- a/arch/arm/mach-orion5x/tsx09-common.c
+++ b/arch/arm/mach-orion5x/tsx09-common.c
@@ -101,9 +101,7 @@  static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
 		addr[i] = byte;
 	}
 
-	printk(KERN_INFO "tsx09: found ethernet mac address ");
-	for (i = 0; i < 6; i++)
-		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
+	printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);
 
 	memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);