diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/dgrs.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dgrs.c')
-rw-r--r-- | drivers/net/dgrs.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/drivers/net/dgrs.c b/drivers/net/dgrs.c index a9ef79da3dc7..054f2ba5f698 100644 --- a/drivers/net/dgrs.c +++ b/drivers/net/dgrs.c | |||
@@ -1139,6 +1139,7 @@ dgrs_probe1(struct net_device *dev) | |||
1139 | DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; | 1139 | DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; |
1140 | unsigned long i; | 1140 | unsigned long i; |
1141 | int rc; | 1141 | int rc; |
1142 | DECLARE_MAC_BUF(mac); | ||
1142 | 1143 | ||
1143 | printk("%s: Digi RightSwitch io=%lx mem=%lx irq=%d plx=%lx dma=%lx\n", | 1144 | printk("%s: Digi RightSwitch io=%lx mem=%lx irq=%d plx=%lx dma=%lx\n", |
1144 | dev->name, dev->base_addr, dev->mem_start, dev->irq, | 1145 | dev->name, dev->base_addr, dev->mem_start, dev->irq, |
@@ -1154,11 +1155,9 @@ dgrs_probe1(struct net_device *dev) | |||
1154 | /* | 1155 | /* |
1155 | * Get ether address of board | 1156 | * Get ether address of board |
1156 | */ | 1157 | */ |
1157 | printk("%s: Ethernet address", dev->name); | ||
1158 | memcpy(dev->dev_addr, priv->port->ethaddr, 6); | 1158 | memcpy(dev->dev_addr, priv->port->ethaddr, 6); |
1159 | for (i = 0; i < 6; ++i) | 1159 | printk("%s: Ethernet address %s\n", |
1160 | printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]); | 1160 | dev->name, print_mac(mac, dev->dev_addr)); |
1161 | printk("\n"); | ||
1162 | 1161 | ||
1163 | if (dev->dev_addr[0] & 1) | 1162 | if (dev->dev_addr[0] & 1) |
1164 | { | 1163 | { |
@@ -1214,15 +1213,12 @@ static int __init | |||
1214 | dgrs_initclone(struct net_device *dev) | 1213 | dgrs_initclone(struct net_device *dev) |
1215 | { | 1214 | { |
1216 | DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; | 1215 | DGRS_PRIV *priv = (DGRS_PRIV *) dev->priv; |
1217 | int i; | 1216 | DECLARE_MAC_BUF(mac); |
1218 | 1217 | ||
1219 | printk("%s: Digi RightSwitch port %d ", | 1218 | printk("%s: Digi RightSwitch port %d %s\n", |
1220 | dev->name, priv->chan); | 1219 | dev->name, priv->chan, print_mac(mac, dev->dev_addr)); |
1221 | for (i = 0; i < 6; ++i) | ||
1222 | printk("%c%2.2x", i ? ':' : ' ', dev->dev_addr[i]); | ||
1223 | printk("\n"); | ||
1224 | 1220 | ||
1225 | return (0); | 1221 | return 0; |
1226 | } | 1222 | } |
1227 | 1223 | ||
1228 | static struct net_device * __init | 1224 | static struct net_device * __init |