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/enc28j60.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/enc28j60.c')
-rw-r--r-- | drivers/net/enc28j60.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index e1b441effbbe..a5c7bd4532d0 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c | |||
@@ -477,12 +477,10 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev) | |||
477 | 477 | ||
478 | mutex_lock(&priv->lock); | 478 | mutex_lock(&priv->lock); |
479 | if (!priv->hw_enable) { | 479 | if (!priv->hw_enable) { |
480 | if (netif_msg_drv(priv)) { | 480 | if (netif_msg_drv(priv)) |
481 | DECLARE_MAC_BUF(mac); | ||
482 | printk(KERN_INFO DRV_NAME | 481 | printk(KERN_INFO DRV_NAME |
483 | ": %s: Setting MAC address to %s\n", | 482 | ": %s: Setting MAC address to %pM\n", |
484 | ndev->name, print_mac(mac, ndev->dev_addr)); | 483 | ndev->name, ndev->dev_addr); |
485 | } | ||
486 | /* NOTE: MAC address in ENC28J60 is byte-backward */ | 484 | /* NOTE: MAC address in ENC28J60 is byte-backward */ |
487 | nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]); | 485 | nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]); |
488 | nolock_regb_write(priv, MAADR4, ndev->dev_addr[1]); | 486 | nolock_regb_write(priv, MAADR4, ndev->dev_addr[1]); |
@@ -1328,11 +1326,9 @@ static int enc28j60_net_open(struct net_device *dev) | |||
1328 | printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__); | 1326 | printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__); |
1329 | 1327 | ||
1330 | if (!is_valid_ether_addr(dev->dev_addr)) { | 1328 | if (!is_valid_ether_addr(dev->dev_addr)) { |
1331 | if (netif_msg_ifup(priv)) { | 1329 | if (netif_msg_ifup(priv)) |
1332 | DECLARE_MAC_BUF(mac); | 1330 | dev_err(&dev->dev, "invalid MAC address %pM\n", |
1333 | dev_err(&dev->dev, "invalid MAC address %s\n", | 1331 | dev->dev_addr); |
1334 | print_mac(mac, dev->dev_addr)); | ||
1335 | } | ||
1336 | return -EADDRNOTAVAIL; | 1332 | return -EADDRNOTAVAIL; |
1337 | } | 1333 | } |
1338 | /* Reset the hardware here (and take it out of low power mode) */ | 1334 | /* Reset the hardware here (and take it out of low power mode) */ |