Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 20:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

MIPS: RB532: Replace parse_mac_addr() with mac_pton().

Browse Source 
Signed-off-by: Daniel Walter <dwalter@google.com>
Reviewed-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/7150/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Daniel Walter 2014-06-24 12:14:26 +01:00 committed by Ralf Baechle
parent 1795cd9b3a
commit 9e21c7e40b
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/mips/rb532/devices.c
View File

@ -250,28 +250,6 @@ static struct platform_device *rb532_devs[] = {
&rb532_wdt
};
static void __init parse_mac_addr(char *macstr)
{
int i, h, l;
for (i = 0; i < 6; i++) {
if (i != 5 && *(macstr + 2) != ':')
return;
h = hex_to_bin(*macstr++);
if (h == -1)
return;
l = hex_to_bin(*macstr++);
if (l == -1)
return;
macstr++;
korina_dev0_data.mac[i] = (h << 4) + l;
}
}
/* NAND definitions */
#define NAND_CHIP_DELAY 25
@ -333,7 +311,10 @@ static int __init plat_setup_devices(void)
static int __init setup_kmac(char *s)
{
printk(KERN_INFO "korina mac = %s\n", s);
parse_mac_addr(s);
if (!mac_pton(s, korina_dev0_data.mac)) {
printk(KERN_ERR "Invalid mac\n");
return -EINVAL;
}
return 0;
}