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/sfc/efx.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/sfc/efx.c')
-rw-r--r-- | drivers/net/sfc/efx.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 06ea71c7e34e..5b05789f0b79 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -612,17 +612,15 @@ static int efx_probe_port(struct efx_nic *efx) | |||
612 | if (is_valid_ether_addr(efx->mac_address)) { | 612 | if (is_valid_ether_addr(efx->mac_address)) { |
613 | memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN); | 613 | memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN); |
614 | } else { | 614 | } else { |
615 | DECLARE_MAC_BUF(mac); | 615 | EFX_ERR(efx, "invalid MAC address %pM\n", |
616 | 616 | efx->mac_address); | |
617 | EFX_ERR(efx, "invalid MAC address %s\n", | ||
618 | print_mac(mac, efx->mac_address)); | ||
619 | if (!allow_bad_hwaddr) { | 617 | if (!allow_bad_hwaddr) { |
620 | rc = -EINVAL; | 618 | rc = -EINVAL; |
621 | goto err; | 619 | goto err; |
622 | } | 620 | } |
623 | random_ether_addr(efx->net_dev->dev_addr); | 621 | random_ether_addr(efx->net_dev->dev_addr); |
624 | EFX_INFO(efx, "using locally-generated MAC %s\n", | 622 | EFX_INFO(efx, "using locally-generated MAC %pM\n", |
625 | print_mac(mac, efx->net_dev->dev_addr)); | 623 | efx->net_dev->dev_addr); |
626 | } | 624 | } |
627 | 625 | ||
628 | return 0; | 626 | return 0; |
@@ -1401,9 +1399,8 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data) | |||
1401 | EFX_ASSERT_RESET_SERIALISED(efx); | 1399 | EFX_ASSERT_RESET_SERIALISED(efx); |
1402 | 1400 | ||
1403 | if (!is_valid_ether_addr(new_addr)) { | 1401 | if (!is_valid_ether_addr(new_addr)) { |
1404 | DECLARE_MAC_BUF(mac); | 1402 | EFX_ERR(efx, "invalid ethernet MAC address requested: %pM\n", |
1405 | EFX_ERR(efx, "invalid ethernet MAC address requested: %s\n", | 1403 | new_addr); |
1406 | print_mac(mac, new_addr)); | ||
1407 | return -EINVAL; | 1404 | return -EINVAL; |
1408 | } | 1405 | } |
1409 | 1406 | ||