aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunhme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/sunhme.c
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (diff)
net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sunhme.c')
-rw-r--r--drivers/net/sunhme.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index f1ebeb5f65b2..b55f7a4b52e7 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2617,7 +2617,6 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
2617 struct net_device *dev; 2617 struct net_device *dev;
2618 int i, qfe_slot = -1; 2618 int i, qfe_slot = -1;
2619 int err = -ENODEV; 2619 int err = -ENODEV;
2620 DECLARE_MAC_BUF(mac);
2621 2620
2622 if (is_qfe) { 2621 if (is_qfe) {
2623 qp = quattro_sbus_find(op); 2622 qp = quattro_sbus_find(op);
@@ -2797,7 +2796,7 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
2797 printk(KERN_INFO "%s: HAPPY MEAL (SBUS) 10/100baseT Ethernet ", 2796 printk(KERN_INFO "%s: HAPPY MEAL (SBUS) 10/100baseT Ethernet ",
2798 dev->name); 2797 dev->name);
2799 2798
2800 printk("%s\n", print_mac(mac, dev->dev_addr)); 2799 printk("%pM\n", dev->dev_addr);
2801 2800
2802 return 0; 2801 return 0;
2803 2802
@@ -2932,7 +2931,6 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
2932 int i, qfe_slot = -1; 2931 int i, qfe_slot = -1;
2933 char prom_name[64]; 2932 char prom_name[64];
2934 int err; 2933 int err;
2935 DECLARE_MAC_BUF(mac);
2936 2934
2937 /* Now make sure pci_dev cookie is there. */ 2935 /* Now make sure pci_dev cookie is there. */
2938#ifdef CONFIG_SPARC 2936#ifdef CONFIG_SPARC
@@ -3141,7 +3139,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
3141 printk(KERN_INFO "%s: HAPPY MEAL (PCI/CheerIO) 10/100BaseT Ethernet ", 3139 printk(KERN_INFO "%s: HAPPY MEAL (PCI/CheerIO) 10/100BaseT Ethernet ",
3142 dev->name); 3140 dev->name);
3143 3141
3144 printk("%s\n", print_mac(mac, dev->dev_addr)); 3142 printk("%pM\n", dev->dev_addr);
3145 3143
3146 return 0; 3144 return 0;
3147 3145