diff options
Diffstat (limited to 'drivers/net/cs89x0.c')
-rw-r--r-- | drivers/net/cs89x0.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index 7107620f615d..65174d3b9026 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
@@ -521,7 +521,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) | |||
521 | unsigned rev_type = 0; | 521 | unsigned rev_type = 0; |
522 | int eeprom_buff[CHKSUM_LEN]; | 522 | int eeprom_buff[CHKSUM_LEN]; |
523 | int retval; | 523 | int retval; |
524 | DECLARE_MAC_BUF(mac); | ||
525 | 524 | ||
526 | /* Initialize the device structure. */ | 525 | /* Initialize the device structure. */ |
527 | if (!modular) { | 526 | if (!modular) { |
@@ -846,7 +845,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular) | |||
846 | } | 845 | } |
847 | 846 | ||
848 | /* print the ethernet address. */ | 847 | /* print the ethernet address. */ |
849 | printk(", MAC %s", print_mac(mac, dev->dev_addr)); | 848 | printk(", MAC %pM", dev->dev_addr); |
850 | 849 | ||
851 | dev->open = net_open; | 850 | dev->open = net_open; |
852 | dev->stop = net_close; | 851 | dev->stop = net_close; |
@@ -1817,11 +1816,10 @@ static int set_mac_address(struct net_device *dev, void *p) | |||
1817 | 1816 | ||
1818 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 1817 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
1819 | 1818 | ||
1820 | if (net_debug) { | 1819 | if (net_debug) |
1821 | DECLARE_MAC_BUF(mac); | 1820 | printk("%s: Setting MAC address to %pM.\n", |
1822 | printk("%s: Setting MAC address to %s.\n", | 1821 | dev->name, dev->dev_addr); |
1823 | dev->name, print_mac(mac, dev->dev_addr)); | 1822 | |
1824 | } | ||
1825 | /* set the Ethernet address */ | 1823 | /* set the Ethernet address */ |
1826 | for (i=0; i < ETH_ALEN/2; i++) | 1824 | for (i=0; i < ETH_ALEN/2; i++) |
1827 | writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8)); | 1825 | writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8)); |