7 files changed, 13 insertions, 27 deletions

diff --git a/arch/arm/mach-ixp4xx/fsg-setup.c b/arch/arm/mach-ixp4xx/fsg-setup.c
index e7c6386782ed..5add22fc9899 100644
--- a/arch/arm/mach-ixp4xx/fsg-setup.c
+++ b/arch/arm/mach-ixp4xx/fsg-setup.c
@@ -177,7 +177,6 @@ static irqreturn_t fsg_reset_handler(int irq, void *dev_id)
 
 static void __init fsg_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
 
         ixp4xx_sys_init();
@@ -256,10 +255,10 @@ static void __init fsg_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "FSG: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, fsg_plat_eth[0].hwaddr));
-        printk(KERN_INFO "FSG: Using MAC address %s for port 1\n",
-               print_mac(mac_buf, fsg_plat_eth[1].hwaddr));
+        printk(KERN_INFO "FSG: Using MAC address %pM for port 0\n",
+               fsg_plat_eth[0].hwaddr);
+        printk(KERN_INFO "FSG: Using MAC address %pM for port 1\n",
+               fsg_plat_eth[1].hwaddr);
 
 }
 
diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
index 0acd95ecf27e..921c947b5b6b 100644
--- a/arch/arm/mach-ixp4xx/nas100d-setup.c
+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
@@ -231,7 +231,6 @@ static irqreturn_t nas100d_reset_handler(int irq, void *dev_id)
 
 static void __init nas100d_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
         int i;
 
@@ -294,8 +293,8 @@ static void __init nas100d_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "NAS100D: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, nas100d_plat_eth[0].hwaddr));
+        printk(KERN_INFO "NAS100D: Using MAC address %pM for port 0\n",
+               nas100d_plat_eth[0].hwaddr);
 
 }
 
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index bc9d920ae54f..ff6a08d02cc4 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -220,7 +220,6 @@ static struct sys_timer nslu2_timer = {
 
 static void __init nslu2_init(void)
 {
-        DECLARE_MAC_BUF(mac_buf);
         uint8_t __iomem *f;
         int i;
 
@@ -275,8 +274,8 @@ static void __init nslu2_init(void)
 #endif
                 iounmap(f);
         }
-        printk(KERN_INFO "NSLU2: Using MAC address %s for port 0\n",
-               print_mac(mac_buf, nslu2_plat_eth[0].hwaddr));
+        printk(KERN_INFO "NSLU2: Using MAC address %pM for port 0\n",
+               nslu2_plat_eth[0].hwaddr);
 
 }
 
diff --git a/arch/s390/appldata/appldata_net_sum.c b/arch/s390/appldata/appldata_net_sum.c
index 3b746556e1a3..fa741f84c5b9 100644
--- a/arch/s390/appldata/appldata_net_sum.c
+++ b/arch/s390/appldata/appldata_net_sum.c
@@ -67,7 +67,6 @@ static void appldata_get_net_sum_data(void *data)
         int i;
         struct appldata_net_sum_data *net_data;
         struct net_device *dev;
-        struct net_device_stats *stats;
         unsigned long rx_packets, tx_packets, rx_bytes, tx_bytes, rx_errors,
                         tx_errors, rx_dropped, tx_dropped, collisions;
 
@@ -86,7 +85,8 @@ static void appldata_get_net_sum_data(void *data)
         collisions = 0;
         read_lock(&dev_base_lock);
         for_each_netdev(&init_net, dev) {
-                stats = dev->get_stats(dev);
+                const struct net_device_stats *stats = dev_get_stats(dev);
+
                 rx_packets += stats->rx_packets;
                 tx_packets += stats->tx_packets;
                 rx_bytes   += stats->rx_bytes;
diff --git a/arch/sparc64/kernel/idprom.c b/arch/sparc64/kernel/idprom.c
index 5b45a808c621..a62ff83337cd 100644
--- a/arch/sparc64/kernel/idprom.c
+++ b/arch/sparc64/kernel/idprom.c
@@ -42,8 +42,5 @@ void __init idprom_init(void)
                             idprom->id_cksum, calc_idprom_cksum(idprom));
         }
 
-        printk("Ethernet address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               idprom->id_ethaddr[0], idprom->id_ethaddr[1],
-               idprom->id_ethaddr[2], idprom->id_ethaddr[3],
-               idprom->id_ethaddr[4], idprom->id_ethaddr[5]);
+        printk("Ethernet address: %pM\n", idprom->id_ethaddr);
 }
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 5b4ca8d93682..74f1a1787026 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -418,12 +418,7 @@ static void eth_configure(int n, void *init, char *mac,
 
         setup_etheraddr(mac, device->mac, dev->name);
 
-        printk(KERN_INFO "Netdevice %d ", n);
-        printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
-               device->mac[0], device->mac[1],
-               device->mac[2], device->mac[3],
-               device->mac[4], device->mac[5]);
-        printk(": ");
+        printk(KERN_INFO "Netdevice %d (%pM) : ", n, device->mac);
 
         lp = dev->priv;
         /* This points to the transport private data. It's still clear, but we
diff --git a/arch/xtensa/platforms/iss/network.c b/arch/xtensa/platforms/iss/network.c
index 11a20adc1409..87f47cade013 100644
--- a/arch/xtensa/platforms/iss/network.c
+++ b/arch/xtensa/platforms/iss/network.c
@@ -660,10 +660,7 @@ static int iss_net_configure(int index, char *init)
 
         printk(KERN_INFO "Netdevice %d ", index);
         if (lp->have_mac)
-                printk("(%02x:%02x:%02x:%02x:%02x:%02x) ",
-                                lp->mac[0], lp->mac[1],
-                                lp->mac[2], lp->mac[3],
-                                lp->mac[4], lp->mac[5]);
+                printk("(%pM) ", lp->mac);
         printk(": ");
 
         /* sysfs register */