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/s2io.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/s2io.c')
-rw-r--r-- | drivers/net/s2io.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 6a1375f9cbb8..66c1a80c2680 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -7748,7 +7748,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
7748 | int mode; | 7748 | int mode; |
7749 | u8 dev_intr_type = intr_type; | 7749 | u8 dev_intr_type = intr_type; |
7750 | u8 dev_multiq = 0; | 7750 | u8 dev_multiq = 0; |
7751 | DECLARE_MAC_BUF(mac); | ||
7752 | 7751 | ||
7753 | ret = s2io_verify_parm(pdev, &dev_intr_type, &dev_multiq); | 7752 | ret = s2io_verify_parm(pdev, &dev_intr_type, &dev_multiq); |
7754 | if (ret) | 7753 | if (ret) |
@@ -8125,8 +8124,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) | |||
8125 | sp->product_name, pdev->revision); | 8124 | sp->product_name, pdev->revision); |
8126 | DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name, | 8125 | DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name, |
8127 | s2io_driver_version); | 8126 | s2io_driver_version); |
8128 | DBG_PRINT(ERR_DBG, "%s: MAC ADDR: %s\n", | 8127 | DBG_PRINT(ERR_DBG, "%s: MAC ADDR: %pM\n", dev->name, dev->dev_addr); |
8129 | dev->name, print_mac(mac, dev->dev_addr)); | ||
8130 | DBG_PRINT(ERR_DBG, "SERIAL NUMBER: %s\n", sp->serial_num); | 8128 | DBG_PRINT(ERR_DBG, "SERIAL NUMBER: %s\n", sp->serial_num); |
8131 | if (sp->device_type & XFRAME_II_DEVICE) { | 8129 | if (sp->device_type & XFRAME_II_DEVICE) { |
8132 | mode = s2io_print_pci_mode(sp); | 8130 | mode = s2io_print_pci_mode(sp); |