Skip to content

Commit

Permalink
staging: rtl8712: throw away custom hex_to_bin()
Browse files Browse the repository at this point in the history
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Andy Shevchenko authored and Greg Kroah-Hartman committed Sep 8, 2010
1 parent 51973d7 commit 91facdb
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions drivers/staging/rtl8712/rtl871x_ioctl_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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;
Expand Down

0 comments on commit 91facdb

Please sign in to comment.