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/sb1250-mac.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/sb1250-mac.c')
-rw-r--r-- | drivers/net/sb1250-mac.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 2615d46e6e50..480caec1e024 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2292,7 +2292,6 @@ static int sbmac_init(struct platform_device *pldev, long long base) | |||
2292 | uint64_t ea_reg; | 2292 | uint64_t ea_reg; |
2293 | int i; | 2293 | int i; |
2294 | int err; | 2294 | int err; |
2295 | DECLARE_MAC_BUF(mac); | ||
2296 | 2295 | ||
2297 | sc->sbm_dev = dev; | 2296 | sc->sbm_dev = dev; |
2298 | sc->sbe_idx = idx; | 2297 | sc->sbe_idx = idx; |
@@ -2373,8 +2372,8 @@ static int sbmac_init(struct platform_device *pldev, long long base) | |||
2373 | * process so we need to finish off the config message that | 2372 | * process so we need to finish off the config message that |
2374 | * was being displayed) | 2373 | * was being displayed) |
2375 | */ | 2374 | */ |
2376 | pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %s\n", | 2375 | pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %pM\n", |
2377 | dev->name, base, print_mac(mac, eaddr)); | 2376 | dev->name, base, eaddr); |
2378 | 2377 | ||
2379 | sc->mii_bus->name = sbmac_mdio_string; | 2378 | sc->mii_bus->name = sbmac_mdio_string; |
2380 | snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx); | 2379 | snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx); |