diff options
| author | Andy Shevchenko <andy.shevchenko@gmail.com> | 2010-09-11 16:33:29 +0300 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2011-07-25 17:26:56 +0100 |
| commit | c8e58856f2f288bfe076ad9205d9a10623498c96 (patch) | |
| tree | 23b083b4e924bff956253e6aee8e59c92dbd64eb /arch/mips/rb532 | |
| parent | 5fba0960809534f008260a621046f38a5f46f417 (diff) | |
| download | linux-c8e58856f2f288bfe076ad9205d9a10623498c96.tar.bz2 | |
MIPS: RB532: Use hex_to_bin()
Remove custom implementation of hex_to_bin().
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
To: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1580/
Acked-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/rb532')
| -rw-r--r-- | arch/mips/rb532/devices.c | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c index 041fc1afc3f4..a969eb826634 100644 --- a/arch/mips/rb532/devices.c +++ b/arch/mips/rb532/devices.c @@ -251,28 +251,22 @@ static struct platform_device *rb532_devs[] = { static void __init parse_mac_addr(char *macstr) { - int i, j; - unsigned char result, value; + int i, h, l; for (i = 0; i < 6; i++) { - result = 0; - if (i != 5 && *(macstr + 2) != ':') return; - for (j = 0; j < 2; j++) { - if (isxdigit(*macstr) - && (value = - isdigit(*macstr) ? *macstr - - '0' : toupper(*macstr) - 'A' + 10) < 16) { - result = result * 16 + value; - macstr++; - } else - 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] = result; + korina_dev0_data.mac[i] = (h << 4) + l; } } |