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/depca.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/depca.c')
-rw-r--r-- | drivers/net/depca.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index ace39ec0a367..bf6401f8d144 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -573,7 +573,6 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) | |||
573 | s16 nicsr; | 573 | s16 nicsr; |
574 | u_long ioaddr; | 574 | u_long ioaddr; |
575 | u_long mem_start; | 575 | u_long mem_start; |
576 | DECLARE_MAC_BUF(mac); | ||
577 | 576 | ||
578 | /* | 577 | /* |
579 | * We are now supposed to enter this function with the | 578 | * We are now supposed to enter this function with the |
@@ -633,7 +632,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device) | |||
633 | 632 | ||
634 | printk(", h/w address "); | 633 | printk(", h/w address "); |
635 | status = get_hw_addr(dev); | 634 | status = get_hw_addr(dev); |
636 | printk("%s", print_mac(mac, dev->dev_addr)); | 635 | printk("%pM", dev->dev_addr); |
637 | if (status != 0) { | 636 | if (status != 0) { |
638 | printk(" which has an Ethernet PROM CRC error.\n"); | 637 | printk(" which has an Ethernet PROM CRC error.\n"); |
639 | return -ENXIO; | 638 | return -ENXIO; |
@@ -1841,7 +1840,6 @@ static void depca_dbg_open(struct net_device *dev) | |||
1841 | u_long ioaddr = dev->base_addr; | 1840 | u_long ioaddr = dev->base_addr; |
1842 | struct depca_init *p = &lp->init_block; | 1841 | struct depca_init *p = &lp->init_block; |
1843 | int i; | 1842 | int i; |
1844 | DECLARE_MAC_BUF(mac); | ||
1845 | 1843 | ||
1846 | if (depca_debug > 1) { | 1844 | if (depca_debug > 1) { |
1847 | /* Do not copy the shadow init block into shared memory */ | 1845 | /* Do not copy the shadow init block into shared memory */ |
@@ -1880,7 +1878,7 @@ static void depca_dbg_open(struct net_device *dev) | |||
1880 | printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base)); | 1878 | printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base)); |
1881 | printk("Initialisation block at 0x%8.8lx(Phys)\n", lp->mem_start); | 1879 | printk("Initialisation block at 0x%8.8lx(Phys)\n", lp->mem_start); |
1882 | printk(" mode: 0x%4.4x\n", p->mode); | 1880 | printk(" mode: 0x%4.4x\n", p->mode); |
1883 | printk(" physical address: %s\n", print_mac(mac, p->phys_addr)); | 1881 | printk(" physical address: %pM\n", p->phys_addr); |
1884 | printk(" multicast hash table: "); | 1882 | printk(" multicast hash table: "); |
1885 | for (i = 0; i < (HASH_TABLE_LEN >> 3) - 1; i++) { | 1883 | for (i = 0; i < (HASH_TABLE_LEN >> 3) - 1; i++) { |
1886 | printk("%2.2x:", p->mcast_table[i]); | 1884 | printk("%2.2x:", p->mcast_table[i]); |