All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] arm: orion5x: use native hex2bin()
@ 2012-02-08 10:13 Andy Shevchenko
  2012-02-08 10:13 ` [PATCH 2/2] arm: orion5x: print mac address with %pM Andy Shevchenko
  0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2012-02-08 10:13 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
---
 arch/arm/mach-orion5x/dns323-setup.c |   40 ++-------------------------------
 arch/arm/mach-orion5x/tsx09-common.c |   35 ++---------------------------
 2 files changed, 6 insertions(+), 69 deletions(-)

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 91b0f47..9eec294 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -172,37 +172,6 @@ static struct mv643xx_eth_platform_data dns323_eth_data = {
 	.phy_addr = MV643XX_ETH_PHY_ADDR(8),
 };
 
-/* dns323_parse_hex_*() taken from tsx09-common.c; should a common copy of these
- * functions be kept somewhere?
- */
-static int __init dns323_parse_hex_nibble(char n)
-{
-	if (n >= '0' && n <= '9')
-		return n - '0';
-
-	if (n >= 'A' && n <= 'F')
-		return n - 'A' + 10;
-
-	if (n >= 'a' && n <= 'f')
-		return n - 'a' + 10;
-
-	return -1;
-}
-
-static int __init dns323_parse_hex_byte(const char *b)
-{
-	int hi;
-	int lo;
-
-	hi = dns323_parse_hex_nibble(b[0]);
-	lo = dns323_parse_hex_nibble(b[1]);
-
-	if (hi < 0 || lo < 0)
-		return -1;
-
-	return (hi << 4) | lo;
-}
-
 static int __init dns323_read_mac_addr(void)
 {
 	u_int8_t addr[6];
@@ -224,14 +193,11 @@ static int __init dns323_read_mac_addr(void)
 	}
 
 	for (i = 0; i < 6; i++)	{
-		int byte;
+		int rc;
 
-		byte = dns323_parse_hex_byte(mac_page + (i * 3));
-		if (byte < 0) {
+		rc = hex2bin(&addr[i], mac_page + (i * 3), 1);
+		if (rc < 0)
 			goto error_fail;
-		}
-
-		addr[i] = byte;
 	}
 
 	iounmap(mac_page);
diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c
index c9abb8f..e65b528f 100644
--- a/arch/arm/mach-orion5x/tsx09-common.c
+++ b/arch/arm/mach-orion5x/tsx09-common.c
@@ -52,41 +52,13 @@ struct mv643xx_eth_platform_data qnap_tsx09_eth_data = {
 	.phy_addr	= MV643XX_ETH_PHY_ADDR(8),
 };
 
-static int __init qnap_tsx09_parse_hex_nibble(char n)
-{
-	if (n >= '0' && n <= '9')
-		return n - '0';
-
-	if (n >= 'A' && n <= 'F')
-		return n - 'A' + 10;
-
-	if (n >= 'a' && n <= 'f')
-		return n - 'a' + 10;
-
-	return -1;
-}
-
-static int __init qnap_tsx09_parse_hex_byte(const char *b)
-{
-	int hi;
-	int lo;
-
-	hi = qnap_tsx09_parse_hex_nibble(b[0]);
-	lo = qnap_tsx09_parse_hex_nibble(b[1]);
-
-	if (hi < 0 || lo < 0)
-		return -1;
-
-	return (hi << 4) | lo;
-}
-
 static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
 {
 	u_int8_t addr[6];
 	int i;
 
 	for (i = 0; i < 6; i++) {
-		int byte;
+		int rc;
 
 		/*
 		 * Enforce "xx:xx:xx:xx:xx:xx\n" format.
@@ -94,10 +66,9 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
 		if (addr_str[(i * 3) + 2] != ((i < 5) ? ':' : '\n'))
 			return -1;
 
-		byte = qnap_tsx09_parse_hex_byte(addr_str + (i * 3));
-		if (byte < 0)
+		rc = hex2bin(&addr[i], addr_str + (i * 3), 1);
+		if (rc < 0)
 			return -1;
-		addr[i] = byte;
 	}
 
 	printk(KERN_INFO "tsx09: found ethernet mac address ");
-- 
1.7.9

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/2] arm: orion5x: print mac address with %pM
  2012-02-08 10:13 [PATCH 1/2] arm: orion5x: use native hex2bin() Andy Shevchenko
@ 2012-02-08 10:13 ` Andy Shevchenko
  0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2012-02-08 10:13 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Nicolas Pitre <nico@fluxnic.net>
---
 arch/arm/mach-orion5x/dns323-setup.c |    7 +++----
 arch/arm/mach-orion5x/tsx09-common.c |    4 +---
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 9eec294..9e12ef8 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -201,9 +201,8 @@ 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");
+
+	pr_info("DNS-323: Found ethernet MAC address: %pM.\n", addr);
 
 	memcpy(dns323_eth_data.mac_addr, addr, 6);
 
@@ -637,7 +636,7 @@ static void __init dns323_init(void)
 	 * Configure peripherals.
 	 */
 	if (dns323_read_mac_addr() < 0)
-		printk("DNS-323: Failed to read MAC address\n");
+		pr_warning("DNS-323: Failed to read MAC address\n");
 	orion5x_ehci0_init();
 	orion5x_eth_init(&dns323_eth_data);
 	orion5x_i2c_init();
diff --git a/arch/arm/mach-orion5x/tsx09-common.c b/arch/arm/mach-orion5x/tsx09-common.c
index e65b528f..c2d813c 100644
--- a/arch/arm/mach-orion5x/tsx09-common.c
+++ b/arch/arm/mach-orion5x/tsx09-common.c
@@ -71,9 +71,7 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
 			return -1;
 	}
 
-	printk(KERN_INFO "tsx09: found ethernet mac address ");
-	for (i = 0; i < 6; i++)
-		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
+	pr_info("tsx09: found ethernet mac address %pM.\n", addr);
 
 	memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
 
-- 
1.7.9

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [PATCH 2/2] arm: orion5x: print mac address with %pM
  2011-09-29 15:13 [PATCH 1/2] arm: orion5x: use native hex2bin() Andy Shevchenko
@ 2011-09-29 15:14 ` Andy Shevchenko
  0 siblings, 0 replies; 3+ messages in thread
From: Andy Shevchenko @ 2011-09-29 15:14 UTC (permalink / raw)
  To: linux-arm-kernel

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 arch/arm/mach-orion5x/dns323-setup.c |    5 ++---
 arch/arm/mach-orion5x/tsx09-common.c |    4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index c95166e..09b8ed2 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -201,9 +201,8 @@ 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 e65b528f..c1aef01 100644
--- a/arch/arm/mach-orion5x/tsx09-common.c
+++ b/arch/arm/mach-orion5x/tsx09-common.c
@@ -71,9 +71,7 @@ static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
 			return -1;
 	}
 
-	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);
 
-- 
1.7.6.3

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-02-08 10:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-08 10:13 [PATCH 1/2] arm: orion5x: use native hex2bin() Andy Shevchenko
2012-02-08 10:13 ` [PATCH 2/2] arm: orion5x: print mac address with %pM Andy Shevchenko
  -- strict thread matches above, loose matches on Subject: below --
2011-09-29 15:13 [PATCH 1/2] arm: orion5x: use native hex2bin() Andy Shevchenko
2011-09-29 15:14 ` [PATCH 2/2] arm: orion5x: print mac address with %pM 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.