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/pcmcia/xirc2ps_cs.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/pcmcia/xirc2ps_cs.c')
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index e1fd585e713..c45c3064fee 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -772,7 +772,6 @@ xirc2ps_config(struct pcmcia_device * link) | |||
772 | int err, i; | 772 | int err, i; |
773 | u_char buf[64]; | 773 | u_char buf[64]; |
774 | cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data; | 774 | cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data; |
775 | DECLARE_MAC_BUF(mac); | ||
776 | 775 | ||
777 | local->dingo_ccr = NULL; | 776 | local->dingo_ccr = NULL; |
778 | 777 | ||
@@ -1051,9 +1050,9 @@ xirc2ps_config(struct pcmcia_device * link) | |||
1051 | strcpy(local->node.dev_name, dev->name); | 1050 | strcpy(local->node.dev_name, dev->name); |
1052 | 1051 | ||
1053 | /* give some infos about the hardware */ | 1052 | /* give some infos about the hardware */ |
1054 | printk(KERN_INFO "%s: %s: port %#3lx, irq %d, hwaddr %s\n", | 1053 | printk(KERN_INFO "%s: %s: port %#3lx, irq %d, hwaddr %pM\n", |
1055 | dev->name, local->manf_str,(u_long)dev->base_addr, (int)dev->irq, | 1054 | dev->name, local->manf_str,(u_long)dev->base_addr, (int)dev->irq, |
1056 | print_mac(mac, dev->dev_addr)); | 1055 | dev->dev_addr); |
1057 | 1056 | ||
1058 | return 0; | 1057 | return 0; |
1059 | 1058 | ||