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/yellowfin.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/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 57e1f495b9fc..511066688810 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -374,7 +374,6 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev, | |||
374 | #else | 374 | #else |
375 | int bar = 1; | 375 | int bar = 1; |
376 | #endif | 376 | #endif |
377 | DECLARE_MAC_BUF(mac); | ||
378 | 377 | ||
379 | /* when built into the kernel, we only print version if device is found */ | 378 | /* when built into the kernel, we only print version if device is found */ |
380 | #ifndef MODULE | 379 | #ifndef MODULE |
@@ -481,10 +480,10 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev, | |||
481 | if (i) | 480 | if (i) |
482 | goto err_out_unmap_status; | 481 | goto err_out_unmap_status; |
483 | 482 | ||
484 | printk(KERN_INFO "%s: %s type %8x at %p, %s, IRQ %d.\n", | 483 | printk(KERN_INFO "%s: %s type %8x at %p, %pM, IRQ %d.\n", |
485 | dev->name, pci_id_tbl[chip_idx].name, | 484 | dev->name, pci_id_tbl[chip_idx].name, |
486 | ioread32(ioaddr + ChipRev), ioaddr, | 485 | ioread32(ioaddr + ChipRev), ioaddr, |
487 | print_mac(mac, dev->dev_addr), irq); | 486 | dev->dev_addr, irq); |
488 | 487 | ||
489 | if (np->drv_flags & HasMII) { | 488 | if (np->drv_flags & HasMII) { |
490 | int phy, phy_idx = 0; | 489 | int phy, phy_idx = 0; |
@@ -1100,11 +1099,9 @@ static int yellowfin_rx(struct net_device *dev) | |||
1100 | memcmp(le32_to_cpu(yp->rx_ring_dma + | 1099 | memcmp(le32_to_cpu(yp->rx_ring_dma + |
1101 | entry*sizeof(struct yellowfin_desc)), | 1100 | entry*sizeof(struct yellowfin_desc)), |
1102 | "\377\377\377\377\377\377", 6) != 0) { | 1101 | "\377\377\377\377\377\377", 6) != 0) { |
1103 | if (bogus_rx++ == 0) { | 1102 | if (bogus_rx++ == 0) |
1104 | DECLARE_MAC_BUF(mac); | 1103 | printk(KERN_WARNING "%s: Bad frame to %pM\n", |
1105 | printk(KERN_WARNING "%s: Bad frame to %s\n", | 1104 | dev->name, buf_addr); |
1106 | dev->name, print_mac(mac, buf_addr)); | ||
1107 | } | ||
1108 | #endif | 1105 | #endif |
1109 | } else { | 1106 | } else { |
1110 | struct sk_buff *skb; | 1107 | struct sk_buff *skb; |