summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-09-20 16:41:33 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-09-20 16:41:33 +0000
commitf350e1077f892f5d559672fa9e63a737a14298ab (patch)
tree8b05b2083bdf10036212d1bfc02a3888927a7feb
parent19a685fd0e2b6658a8165a514024a026959b229d (diff)
ar71xx: dir-825-c1: use ath79_parse_ascii_mac helper
Remove the local MAC address parser function and use the generic one instead. Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38088 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
index c1bd8d6878..3ab16e04c3 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-dir-825-c1.c
@@ -167,18 +167,6 @@ static struct mdio_board_info dir825c1_mdio0_info[] = {
},
};
-static void dir825c1_read_ascii_mac(u8 *dest, u8 *src)
-{
- int ret;
-
- ret = sscanf(src, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx",
- &dest[0], &dest[1], &dest[2],
- &dest[3], &dest[4], &dest[5]);
-
- if (ret != ETH_ALEN)
- memset(dest, 0, ETH_ALEN);
-}
-
static void __init dir825c1_generic_setup(void)
{
u8 *mac = (u8 *) KSEG1ADDR(0x1ffe0000);
@@ -186,8 +174,8 @@ static void __init dir825c1_generic_setup(void)
u8 mac0[ETH_ALEN], mac1[ETH_ALEN];
u8 wmac0[ETH_ALEN], wmac1[ETH_ALEN];
- dir825c1_read_ascii_mac(mac0, mac + DIR825C1_MAC0_OFFSET);
- dir825c1_read_ascii_mac(mac1, mac + DIR825C1_MAC1_OFFSET);
+ ath79_parse_ascii_mac(mac + DIR825C1_MAC0_OFFSET, mac0);
+ ath79_parse_ascii_mac(mac + DIR825C1_MAC1_OFFSET, mac1);
ath79_register_m25p80(NULL);