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/pci-skeleton.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/pci-skeleton.c')
-rw-r--r-- | drivers/net/pci-skeleton.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c index 0a575fef29e6..bf952acee1f7 100644 --- a/drivers/net/pci-skeleton.c +++ b/drivers/net/pci-skeleton.c | |||
@@ -737,7 +737,6 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev, | |||
737 | int i, addr_len, option; | 737 | int i, addr_len, option; |
738 | void *ioaddr = NULL; | 738 | void *ioaddr = NULL; |
739 | static int board_idx = -1; | 739 | static int board_idx = -1; |
740 | DECLARE_MAC_BUF(mac); | ||
741 | 740 | ||
742 | /* when built into the kernel, we only print version if device is found */ | 741 | /* when built into the kernel, we only print version if device is found */ |
743 | #ifndef MODULE | 742 | #ifndef MODULE |
@@ -797,11 +796,11 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev, | |||
797 | 796 | ||
798 | tp->phys[0] = 32; | 797 | tp->phys[0] = 32; |
799 | 798 | ||
800 | printk (KERN_INFO "%s: %s at 0x%lx, %sIRQ %d\n", | 799 | printk (KERN_INFO "%s: %s at 0x%lx, %pM IRQ %d\n", |
801 | dev->name, | 800 | dev->name, |
802 | board_info[ent->driver_data].name, | 801 | board_info[ent->driver_data].name, |
803 | dev->base_addr, | 802 | dev->base_addr, |
804 | print_mac(mac, dev->dev_addr), | 803 | dev->dev_addr, |
805 | dev->irq); | 804 | dev->irq); |
806 | 805 | ||
807 | printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n", | 806 | printk (KERN_DEBUG "%s: Identified 8139 chip type '%s'\n", |