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/3c515.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/3c515.c')
-rw-r--r-- | drivers/net/3c515.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index a0f8b6e2d0af..a2c24684a44a 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
@@ -570,7 +570,6 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, | |||
570 | unsigned int eeprom[0x40], checksum = 0; /* EEPROM contents */ | 570 | unsigned int eeprom[0x40], checksum = 0; /* EEPROM contents */ |
571 | int i; | 571 | int i; |
572 | int irq; | 572 | int irq; |
573 | DECLARE_MAC_BUF(mac); | ||
574 | 573 | ||
575 | #ifdef __ISAPNP__ | 574 | #ifdef __ISAPNP__ |
576 | if (idev) { | 575 | if (idev) { |
@@ -636,7 +635,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr, | |||
636 | checksum = (checksum ^ (checksum >> 8)) & 0xff; | 635 | checksum = (checksum ^ (checksum >> 8)) & 0xff; |
637 | if (checksum != 0x00) | 636 | if (checksum != 0x00) |
638 | printk(" ***INVALID CHECKSUM %4.4x*** ", checksum); | 637 | printk(" ***INVALID CHECKSUM %4.4x*** ", checksum); |
639 | printk(" %s", print_mac(mac, dev->dev_addr)); | 638 | printk(" %pM", dev->dev_addr); |
640 | if (eeprom[16] == 0x11c7) { /* Corkscrew */ | 639 | if (eeprom[16] == 0x11c7) { /* Corkscrew */ |
641 | if (request_dma(dev->dma, "3c515")) { | 640 | if (request_dma(dev->dma, "3c515")) { |
642 | printk(", DMA %d allocation failed", dev->dma); | 641 | printk(", DMA %d allocation failed", dev->dma); |