Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c4ac8c6 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

drivers: net: use newly introduced hex_to_bin() 



Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b27822f

drivers/net/ksz884x.c

+5 −6
Original line number Original line Diff line number Diff line
@@ -6894,13 +6894,12 @@ static void get_mac_addr(struct dev_info *hw_priv, u8 *macaddr, int port) 
	i = j = num = got_num = 0;

	i = j = num = got_num = 0;

	while (j < MAC_ADDR_LEN) {

	while (j < MAC_ADDR_LEN) {

		if (macaddr[i]) {

		if (macaddr[i]) {

			int digit;



			got_num = 1;

			got_num = 1;

			if ('0' <= macaddr[i] && macaddr[i] <= '9')

			digit = hex_to_bin(macaddr[i]);

				num = num * 16 + macaddr[i] - '0';

			if (digit >= 0)

			else if ('A' <= macaddr[i] && macaddr[i] <= 'F')

				num = num * 16 + digit;

				num = num * 16 + 10 + macaddr[i] - 'A';

			else if ('a' <= macaddr[i] && macaddr[i] <= 'f')

				num = num * 16 + 10 + macaddr[i] - 'a';

			else if (':' == macaddr[i])

			else if (':' == macaddr[i])

				got_num = 2;

				got_num = 2;

			else

			else