aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/smc-ultra32.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2007-10-03 20:59:30 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:51:42 -0400
commit0795af5729b18218767fab27c44b1384f72dc9ad (patch)
tree67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/smc-ultra32.c
parent95ea36275f3c9a1d3d04c217b4b576c657c4e70e (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/smc-ultra32.c')
-rw-r--r--drivers/net/smc-ultra32.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index 043a5002029c..a5a91ace28cc 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -163,6 +163,7 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
163 unsigned char idreg; 163 unsigned char idreg;
164 unsigned char reg4; 164 unsigned char reg4;
165 const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"}; 165 const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"};
166 DECLARE_MAC_BUF(mac);
166 167
167 if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME)) 168 if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME))
168 return -EBUSY; 169 return -EBUSY;
@@ -203,10 +204,11 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
203 204
204 model_name = "SMC Ultra32"; 205 model_name = "SMC Ultra32";
205 206
206 printk("%s: %s at 0x%X,", dev->name, model_name, ioaddr);
207
208 for (i = 0; i < 6; i++) 207 for (i = 0; i < 6; i++)
209 printk(" %2.2X", dev->dev_addr[i] = inb(ioaddr + 8 + i)); 208 dev->dev_addr[i] = inb(ioaddr + 8 + i);
209
210 printk("%s: %s at 0x%X, %s",
211 dev->name, model_name, ioaddr, print_mac(mac, dev->dev_addr));
210 212
211 /* Switch from the station address to the alternate register set and 213 /* Switch from the station address to the alternate register set and
212 read the useful registers there. */ 214 read the useful registers there. */