Patchwork ARM: mach-orion5x: Use hex2bin that is present in kernel lib

login
register
mail settings
Submitter plaes@plaes.org
Date Nov. 24, 2011, 9:49 a.m.
Message ID <1322128173.31424.12.camel@localhost.localdomain>
Download mbox | patch
Permalink /patch/127460/
State New
Headers show

Comments

plaes@plaes.org - Nov. 24, 2011, 9:49 a.m.
Ühel kenal päeval, N, 2011-11-24 kell 07:40, kirjutas Lennert Buytenhek:
> On Wed, Nov 23, 2011 at 04:26:57PM +0200, plaes@plaes.org wrote:
>
[...]
> >
> > [...]
> >
> >  	for (i = 0; i < 6; i++)	{
> > -		int byte;
> > -
> > -		byte = dns323_parse_hex_byte(mac_page + (i * 3));
> > -		if (byte < 0) {
> > +		if (hex2bin(addr[i], mac_page + (i * 3), 2))
> >  			goto error_fail;
> 
> I don't think that this does what you think it does...

Indeed. I assume that it didn't even compile. I have fixed the two
issues I found in the previous patch and tweaked the printk output for
TS-x09. Run-tested with similar code on x86 so now I'm confident enough
to sign it off ;)

Päikest,
Priit Laes ;)

Patch

From 4bc5154a590062914511edd819a4b715abfec748 Mon Sep 17 00:00:00 2001
From: Priit Laes <plaes@plaes.org>
Date: Wed, 23 Nov 2011 16:11:04 +0200
Subject: [PATCH] ARM: mach-orion5x: Use hex2bin that is present in kernel lib

Signed-off-by: Priit Laes <plaes@plaes.org>
---

 arch/arm/mach-orion5x/dns323-setup.c |   39 +---------------------------------
 arch/arm/mach-orion5x/tsx09-common.c |   36 +-----------------------------
 2 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c

index 343f60e..27ad32a 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,8 @@  static int __init dns323_read_mac_addr(void)

 	}
 
 	for (i = 0; i < 6; i++)	{
-		int byte;

-

-		byte = dns323_parse_hex_byte(mac_page + (i * 3));

-		if (byte < 0) {

+		if (hex2bin(&addr[i], mac_page + (i * 3), 1))

 			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..5f94319 100644

--- a/arch/arm/mach-orion5x/tsx09-common.c

+++ b/arch/arm/mach-orion5x/tsx09-common.c

@@ -52,55 +52,23 @@  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;

-

 		/*
 		 * Enforce "xx:xx:xx:xx:xx:xx\n" format.
 		 */
 		if (addr_str[(i * 3) + 2] != ((i < 5) ? ':' : '\n'))
 			return -1;
 
-		byte = qnap_tsx09_parse_hex_byte(addr_str + (i * 3));

-		if (byte < 0)

+		if (hex2bin(&addr[i], addr_str + (i * 3), 1))

 			return -1;
-		addr[i] = byte;

 	}
 
-	printk(KERN_INFO "tsx09: found ethernet mac address ");

+	printk(KERN_INFO "TS-x09: Found ethernet MAC address: ");

 	for (i = 0; i < 6; i++)
 		printk("%.2x%s", addr[i], (i < 5) ? ":" : ".\n");
 
-- 

1.7.8.rc3