[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / 3c523.c

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index 10852b2..239fc42 100644 (file)
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -383,8 +383,8 @@ void alloc586(struct net_device *dev)
 static int elmc_getinfo(char *buf, int slot, void *d)
 {
        int len = 0;
-       struct net_device *dev = (struct net_device *) d;
-       int i;
+       struct net_device *dev = d;
+       DECLARE_MAC_BUF(mac);
 
        if (dev == NULL)
                return len;
@@ -399,12 +399,8 @@ static int elmc_getinfo(char *buf, int slot, void *d)
        len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ?
                       "External" : "Internal");
        len += sprintf(buf + len, "Device: %s\n", dev->name);
-       len += sprintf(buf + len, "Hardware Address:");
-       for (i = 0; i < 6; i++) {
-               len += sprintf(buf + len, " %02x", dev->dev_addr[i]);
-       }
-       buf[len++] = '\n';
-       buf[len] = 0;
+       len += sprintf(buf + len, "Hardware Address: %s\n",
+                      print_mac(mac, dev->dev_addr));
 
        return len;
 }                              /* elmc_getinfo() */
@@ -422,6 +418,7 @@ static int __init do_elmc_probe(struct net_device *dev)
        unsigned int size = 0;
        int retval;
        struct priv *pr = dev->priv;
+       DECLARE_MAC_BUF(mac);
 
        if (MCA_bus == 0) {
                return -ENODEV;
@@ -544,12 +541,11 @@ static int __init do_elmc_probe(struct net_device *dev)
 
        /* The hardware address for the 3c523 is stored in the first six
           bytes of the IO address. */
-       printk(KERN_INFO "%s: hardware address ", dev->name);
-       for (i = 0; i < 6; i++) {
+       for (i = 0; i < 6; i++)
                dev->dev_addr[i] = inb(dev->base_addr + i);
-               printk(" %02x", dev->dev_addr[i]);
-       }
-       printk("\n");
+
+       printk(KERN_INFO "%s: hardware address %s\n",
+              dev->name, print_mac(mac, dev->dev_addr));
 
        dev->open = &elmc_open;
        dev->stop = &elmc_close;