drivers/net/cxgb3/t3_hw.c: use new hex_to_bin() method

Get rid of own implementation of hex_to_bin().

Signed-off-by: Andy Shevchenko <ext-andriy.shevchenko@nokia.com>
Acked-by: Divy Le Ray <divy@chelsio.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 95a8ba0..427c451 100644 (file)
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -679,14 +679,6 @@ int t3_seeprom_wp(struct adapter *adapter, int enable)
        return t3_seeprom_write(adapter, EEPROM_STAT_ADDR, enable ? 0xc : 0);
 }
 
-/*
- * Convert a character holding a hex digit to a number.
- */
-static unsigned int hex2int(unsigned char c)
-{
-       return isdigit(c) ? c - '0' : toupper(c) - 'A' + 10;
-}
-
 /**
  *     get_vpd_params - read VPD parameters from VPD EEPROM
  *     @adapter: adapter to read
@@ -727,15 +719,15 @@ static int get_vpd_params(struct adapter *adapter, struct vpd_params *p)
                p->port_type[0] = uses_xaui(adapter) ? 1 : 2;
                p->port_type[1] = uses_xaui(adapter) ? 6 : 2;
        } else {
-               p->port_type[0] = hex2int(vpd.port0_data[0]);
-               p->port_type[1] = hex2int(vpd.port1_data[0]);
+               p->port_type[0] = hex_to_bin(vpd.port0_data[0]);
+               p->port_type[1] = hex_to_bin(vpd.port1_data[0]);
                p->xauicfg[0] = simple_strtoul(vpd.xaui0cfg_data, NULL, 16);
                p->xauicfg[1] = simple_strtoul(vpd.xaui1cfg_data, NULL, 16);
        }
 
        for (i = 0; i < 6; i++)
-               p->eth_base[i] = hex2int(vpd.na_data[2 * i]) * 16 +
-                                hex2int(vpd.na_data[2 * i + 1]);
+               p->eth_base[i] = hex_to_bin(vpd.na_data[2 * i]) * 16 +
+                                hex_to_bin(vpd.na_data[2 * i + 1]);
        return 0;
 }