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/e100.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/e100.c')
-rw-r--r-- | drivers/net/e100.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 3d69fae781cf..bb4b6e285245 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c | |||
@@ -2616,7 +2616,6 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
2616 | struct net_device *netdev; | 2616 | struct net_device *netdev; |
2617 | struct nic *nic; | 2617 | struct nic *nic; |
2618 | int err; | 2618 | int err; |
2619 | DECLARE_MAC_BUF(mac); | ||
2620 | 2619 | ||
2621 | if(!(netdev = alloc_etherdev(sizeof(struct nic)))) { | 2620 | if(!(netdev = alloc_etherdev(sizeof(struct nic)))) { |
2622 | if(((1 << debug) - 1) & NETIF_MSG_PROBE) | 2621 | if(((1 << debug) - 1) & NETIF_MSG_PROBE) |
@@ -2746,9 +2745,9 @@ static int __devinit e100_probe(struct pci_dev *pdev, | |||
2746 | goto err_out_free; | 2745 | goto err_out_free; |
2747 | } | 2746 | } |
2748 | 2747 | ||
2749 | DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %s\n", | 2748 | DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n", |
2750 | (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), | 2749 | (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0), |
2751 | pdev->irq, print_mac(mac, netdev->dev_addr)); | 2750 | pdev->irq, netdev->dev_addr); |
2752 | 2751 | ||
2753 | return 0; | 2752 | return 0; |
2754 | 2753 | ||