aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-27 18:59:26 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-27 20:06:18 -0400
commite174961ca1a0b28f7abf0be47973ad57cb74e5f0 (patch)
treee8f74ecd420a0e380a71670e5aec5c2a0c15640a /drivers/net/e1000
parent0c68ae2605dbcf67414d8d1f19af93be44b355fb (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/e1000')
-rw-r--r--drivers/net/e1000/e1000_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index fac82152e4c8..1d487624ad94 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -912,7 +912,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
912 u16 eeprom_data = 0; 912 u16 eeprom_data = 0;
913 u16 eeprom_apme_mask = E1000_EEPROM_APME; 913 u16 eeprom_apme_mask = E1000_EEPROM_APME;
914 int bars, need_ioport; 914 int bars, need_ioport;
915 DECLARE_MAC_BUF(mac);
916 915
917 /* do not allocate ioport bars when not needed */ 916 /* do not allocate ioport bars when not needed */
918 need_ioport = e1000_is_need_ioport(pdev); 917 need_ioport = e1000_is_need_ioport(pdev);
@@ -1194,7 +1193,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
1194 (hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" : 1193 (hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" :
1195 "32-bit")); 1194 "32-bit"));
1196 1195
1197 printk("%s\n", print_mac(mac, netdev->dev_addr)); 1196 printk("%pM\n", netdev->dev_addr);
1198 1197
1199 if (hw->bus_type == e1000_bus_type_pci_express) { 1198 if (hw->bus_type == e1000_bus_type_pci_express) {
1200 DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no " 1199 DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "