aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/amd8111e.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/amd8111e.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/amd8111e.c')
-rw-r--r--drivers/net/amd8111e.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index afb60a5927ae..73f40a45441a 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1934,6 +1934,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
1934 unsigned long reg_addr,reg_len; 1934 unsigned long reg_addr,reg_len;
1935 struct amd8111e_priv* lp; 1935 struct amd8111e_priv* lp;
1936 struct net_device* dev; 1936 struct net_device* dev;
1937 DECLARE_MAC_BUF(mac);
1937 1938
1938 err = pci_enable_device(pdev); 1939 err = pci_enable_device(pdev);
1939 if(err){ 1940 if(err){
@@ -2006,7 +2007,7 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
2006 2007
2007 /* Initializing MAC address */ 2008 /* Initializing MAC address */
2008 for(i = 0; i < ETH_ADDR_LEN; i++) 2009 for(i = 0; i < ETH_ADDR_LEN; i++)
2009 dev->dev_addr[i] =readb(lp->mmio + PADR + i); 2010 dev->dev_addr[i] = readb(lp->mmio + PADR + i);
2010 2011
2011 /* Setting user defined parametrs */ 2012 /* Setting user defined parametrs */
2012 lp->ext_phy_option = speed_duplex[card_idx]; 2013 lp->ext_phy_option = speed_duplex[card_idx];
@@ -2075,11 +2076,10 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
2075 /* display driver and device information */ 2076 /* display driver and device information */
2076 2077
2077 chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28; 2078 chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28;
2078 printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n", dev->name,MODULE_VERS); 2079 printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n",
2079 printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet ", dev->name, chip_version); 2080 dev->name,MODULE_VERS);
2080 for (i = 0; i < 6; i++) 2081 printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %s\n",
2081 printk("%2.2x%c",dev->dev_addr[i],i == 5 ? ' ' : ':'); 2082 dev->name, chip_version, print_mac(mac, dev->dev_addr));
2082 printk( "\n");
2083 if (lp->ext_phy_id) 2083 if (lp->ext_phy_id)
2084 printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n", 2084 printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n",
2085 dev->name, lp->ext_phy_id, lp->ext_phy_addr); 2085 dev->name, lp->ext_phy_id, lp->ext_phy_addr);