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/hydra.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/hydra.c')
-rw-r--r-- | drivers/net/hydra.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c index b96cf2dcb109..b0ae0766ea4e 100644 --- a/drivers/net/hydra.c +++ b/drivers/net/hydra.c | |||
@@ -103,7 +103,6 @@ static int __devinit hydra_init(struct zorro_dev *z) | |||
103 | int start_page, stop_page; | 103 | int start_page, stop_page; |
104 | int j; | 104 | int j; |
105 | int err; | 105 | int err; |
106 | DECLARE_MAC_BUF(mac); | ||
107 | 106 | ||
108 | static u32 hydra_offsets[16] = { | 107 | static u32 hydra_offsets[16] = { |
109 | 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, | 108 | 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, |
@@ -163,8 +162,8 @@ static int __devinit hydra_init(struct zorro_dev *z) | |||
163 | zorro_set_drvdata(z, dev); | 162 | zorro_set_drvdata(z, dev); |
164 | 163 | ||
165 | printk(KERN_INFO "%s: Hydra at 0x%08lx, address " | 164 | printk(KERN_INFO "%s: Hydra at 0x%08lx, address " |
166 | "%s (hydra.c " HYDRA_VERSION ")\n", | 165 | "%pM (hydra.c " HYDRA_VERSION ")\n", |
167 | dev->name, z->resource.start, print_mac(mac, dev->dev_addr)); | 166 | dev->name, z->resource.start, dev->dev_addr); |
168 | 167 | ||
169 | return 0; | 168 | return 0; |
170 | } | 169 | } |