diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 20:47:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:47:26 -0400 |
commit | 7c510e4b730a92cecf94ada45c989d8be0200d47 (patch) | |
tree | 61f1926964c580946367588602a8eb039561f077 /drivers/net/enic | |
parent | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (diff) |
net: convert more to %pM
A number of places still use %02x:...:%02x because it's
in debug statements or for no real reason. Make a few
of them use %pM.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic')
-rw-r--r-- | drivers/net/enic/enic_res.c | 7 | ||||
-rw-r--r-- | drivers/net/enic/vnic_dev.c | 10 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c index 95184b9108e..e5fc9384f8f 100644 --- a/drivers/net/enic/enic_res.c +++ b/drivers/net/enic/enic_res.c | |||
@@ -90,11 +90,8 @@ int enic_get_vnic_config(struct enic *enic) | |||
90 | 90 | ||
91 | c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer); | 91 | c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer); |
92 | 92 | ||
93 | printk(KERN_INFO PFX "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x " | 93 | printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n", |
94 | "wq/rq %d/%d\n", | 94 | enic->mac_addr, c->wq_desc_count, c->rq_desc_count); |
95 | enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2], | ||
96 | enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5], | ||
97 | c->wq_desc_count, c->rq_desc_count); | ||
98 | printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d " | 95 | printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d " |
99 | "intr timer %d\n", | 96 | "intr timer %d\n", |
100 | c->mtu, ENIC_SETTING(enic, TXCSUM), | 97 | c->mtu, ENIC_SETTING(enic, TXCSUM), |
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c index 4d104f5c30f..9afd33c7188 100644 --- a/drivers/net/enic/vnic_dev.c +++ b/drivers/net/enic/vnic_dev.c | |||
@@ -489,10 +489,7 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr) | |||
489 | 489 | ||
490 | err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait); | 490 | err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait); |
491 | if (err) | 491 | if (err) |
492 | printk(KERN_ERR | 492 | printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err); |
493 | "Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n", | ||
494 | addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], | ||
495 | err); | ||
496 | } | 493 | } |
497 | 494 | ||
498 | void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr) | 495 | void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr) |
@@ -507,10 +504,7 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr) | |||
507 | 504 | ||
508 | err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait); | 505 | err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait); |
509 | if (err) | 506 | if (err) |
510 | printk(KERN_ERR | 507 | printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err); |
511 | "Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n", | ||
512 | addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], | ||
513 | err); | ||
514 | } | 508 | } |
515 | 509 | ||
516 | int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr) | 510 | int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr) |