diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 18:59:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:06:18 -0400 |
commit | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch) | |
tree | e8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/smc9194.c | |
parent | 0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/smc9194.c')
-rw-r--r-- | drivers/net/smc9194.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index de67744c4a2a..3bc733634a53 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
@@ -876,8 +876,6 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
876 | word memory_info_register; | 876 | word memory_info_register; |
877 | word memory_cfg_register; | 877 | word memory_cfg_register; |
878 | 878 | ||
879 | DECLARE_MAC_BUF(mac); | ||
880 | |||
881 | /* Grab the region so that no one else tries to probe our ioports. */ | 879 | /* Grab the region so that no one else tries to probe our ioports. */ |
882 | if (!request_region(ioaddr, SMC_IO_EXTENT, DRV_NAME)) | 880 | if (!request_region(ioaddr, SMC_IO_EXTENT, DRV_NAME)) |
883 | return -EBUSY; | 881 | return -EBUSY; |
@@ -1033,7 +1031,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr) | |||
1033 | /* | 1031 | /* |
1034 | . Print the Ethernet address | 1032 | . Print the Ethernet address |
1035 | */ | 1033 | */ |
1036 | printk("ADDR: %s\n", print_mac(mac, dev->dev_addr)); | 1034 | printk("ADDR: %pM\n", dev->dev_addr); |
1037 | 1035 | ||
1038 | /* set the private data to zero by default */ | 1036 | /* set the private data to zero by default */ |
1039 | memset(dev->priv, 0, sizeof(struct smc_local)); | 1037 | memset(dev->priv, 0, sizeof(struct smc_local)); |