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/natsemi.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/natsemi.c')
-rw-r--r-- | drivers/net/natsemi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index f7fa3944659b..5f1de803feeb 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -792,7 +792,6 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
792 | const int pcibar = 1; /* PCI base address register */ | 792 | const int pcibar = 1; /* PCI base address register */ |
793 | int prev_eedata; | 793 | int prev_eedata; |
794 | u32 tmp; | 794 | u32 tmp; |
795 | DECLARE_MAC_BUF(mac); | ||
796 | 795 | ||
797 | /* when built into the kernel, we only print version if device is found */ | 796 | /* when built into the kernel, we only print version if device is found */ |
798 | #ifndef MODULE | 797 | #ifndef MODULE |
@@ -948,10 +947,10 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
948 | 947 | ||
949 | if (netif_msg_drv(np)) { | 948 | if (netif_msg_drv(np)) { |
950 | printk(KERN_INFO "natsemi %s: %s at %#08llx " | 949 | printk(KERN_INFO "natsemi %s: %s at %#08llx " |
951 | "(%s), %s, IRQ %d", | 950 | "(%s), %pM, IRQ %d", |
952 | dev->name, natsemi_pci_info[chip_idx].name, | 951 | dev->name, natsemi_pci_info[chip_idx].name, |
953 | (unsigned long long)iostart, pci_name(np->pci_dev), | 952 | (unsigned long long)iostart, pci_name(np->pci_dev), |
954 | print_mac(mac, dev->dev_addr), irq); | 953 | dev->dev_addr, irq); |
955 | if (dev->if_port == PORT_TP) | 954 | if (dev->if_port == PORT_TP) |
956 | printk(", port TP.\n"); | 955 | printk(", port TP.\n"); |
957 | else if (np->ignore_phy) | 956 | else if (np->ignore_phy) |