diff options
| author | Andy Shevchenko | 2010-09-07 17:20:21 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-09-08 10:59:53 +0200 |
| commit | 91facdbe5075fdbc97a91b03855441eb5347cbc5 (patch) | |
| tree | 25d2f98c3d74e6fbbe9fd1d0a72f157732834128 /drivers | |
| parent | Staging: xgifb: revert a warning fix and resolve it properly (diff) | |
| download | kernel-qcow2-linux-91facdbe5075fdbc97a91b03855441eb5347cbc5.tar.gz kernel-qcow2-linux-91facdbe5075fdbc97a91b03855441eb5347cbc5.tar.xz kernel-qcow2-linux-91facdbe5075fdbc97a91b03855441eb5347cbc5.zip | |
staging: rtl8712: throw away custom hex_to_bin()
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 1529239bac68..eac049b12d53 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -62,17 +62,6 @@ static const char * const iw_operation_mode[] = { "Monitor" }; -static int hex2num_i(char c) -{ - if (c >= '0' && c <= '9') - return c - '0'; - if (c >= 'a' && c <= 'f') - return c - 'a' + 10; - if (c >= 'A' && c <= 'F') - return c - 'A' + 10; - return -1; -} - /** * hwaddr_aton - Convert ASCII string to MAC address * @txt: MAC address as a string (e.g., "00:11:22:33:44:55") @@ -86,10 +75,10 @@ static int hwaddr_aton_i(const char *txt, u8 *addr) for (i = 0; i < 6; i++) { int a, b; - a = hex2num_i(*txt++); + a = hex_to_bin(*txt++); if (a < 0) return -1; - b = hex2num_i(*txt++); + b = hex_to_bin(*txt++); if (b < 0) return -1; *addr++ = (a << 4) | b; |