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/tokenring/tmspci.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/tokenring/tmspci.c')
-rw-r--r-- | drivers/net/tokenring/tmspci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c index 5f0ee880cfff..5f601773c260 100644 --- a/drivers/net/tokenring/tmspci.c +++ b/drivers/net/tokenring/tmspci.c | |||
@@ -100,7 +100,6 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic | |||
100 | unsigned int pci_irq_line; | 100 | unsigned int pci_irq_line; |
101 | unsigned long pci_ioaddr; | 101 | unsigned long pci_ioaddr; |
102 | struct card_info *cardinfo = &card_info_table[ent->driver_data]; | 102 | struct card_info *cardinfo = &card_info_table[ent->driver_data]; |
103 | DECLARE_MAC_BUF(mac); | ||
104 | 103 | ||
105 | if (versionprinted++ == 0) | 104 | if (versionprinted++ == 0) |
106 | printk("%s", version); | 105 | printk("%s", version); |
@@ -137,8 +136,8 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic | |||
137 | 136 | ||
138 | tms_pci_read_eeprom(dev); | 137 | tms_pci_read_eeprom(dev); |
139 | 138 | ||
140 | printk("%s: Ring Station Address: %s\n", | 139 | printk("%s: Ring Station Address: %pM\n", |
141 | dev->name, print_mac(mac, dev->dev_addr)); | 140 | dev->name, dev->dev_addr); |
142 | 141 | ||
143 | ret = tmsdev_init(dev, &pdev->dev); | 142 | ret = tmsdev_init(dev, &pdev->dev); |
144 | if (ret) { | 143 | if (ret) { |