Merge branch 'linus' into release

1 files changed, 7 insertions, 15 deletions

diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 7107620f615d..ff6497658a45 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -170,11 +170,7 @@ static char version[] __initdata =
 /* The cs8900 has 4 IRQ pins, software selectable. cs8900_irq_map maps
    them to system IRQ numbers. This mapping is card specific and is set to
    the configuration of the Cirrus Eval board for this chip. */
-#ifdef CONFIG_ARCH_CLPS7500
-static unsigned int netcard_portlist[] __used __initdata =
-   { 0x80090303, 0x300, 0x320, 0x340, 0x360, 0x200, 0x220, 0x240, 0x260, 0x280, 0x2a0, 0x2c0, 0x2e0, 0};
-static unsigned int cs8900_irq_map[] = {12,0,0,0};
-#elif defined(CONFIG_SH_HICOSH4)
+#if defined(CONFIG_SH_HICOSH4)
 static unsigned int netcard_portlist[] __used __initdata =
    { 0x0300, 0};
 static unsigned int cs8900_irq_map[] = {1,0,0,0};
@@ -521,7 +517,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
         unsigned rev_type = 0;
         int eeprom_buff[CHKSUM_LEN];
         int retval;
-        DECLARE_MAC_BUF(mac);
 
         /* Initialize the device structure. */
         if (!modular) {
@@ -846,7 +841,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
         }
 
         /* print the ethernet address. */
-        printk(", MAC %s", print_mac(mac, dev->dev_addr));
+        printk(", MAC %pM", dev->dev_addr);
 
         dev->open               = net_open;
         dev->stop               = net_close;
@@ -1025,14 +1020,13 @@ skip_this_frame:
         }
         skb->protocol=eth_type_trans(skb,dev);
         netif_rx(skb);
-        dev->last_rx = jiffies;
         lp->stats.rx_packets++;
         lp->stats.rx_bytes += length;
 }
 
 #endif  /* ALLOW_DMA */
 
-void  __init reset_chip(struct net_device *dev)
+static void __init reset_chip(struct net_device *dev)
 {
 #if !defined(CONFIG_MACH_MX31ADS)
 #if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)
@@ -1719,7 +1713,6 @@ net_rx(struct net_device *dev)
 
         skb->protocol=eth_type_trans(skb,dev);
         netif_rx(skb);
-        dev->last_rx = jiffies;
         lp->stats.rx_packets++;
         lp->stats.rx_bytes += length;
 }
@@ -1817,11 +1810,10 @@ static int set_mac_address(struct net_device *dev, void *p)
 
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
-        if (net_debug) {
-                DECLARE_MAC_BUF(mac);
-                printk("%s: Setting MAC address to %s.\n",
-                       dev->name, print_mac(mac, dev->dev_addr));
-        }
+        if (net_debug)
+                printk("%s: Setting MAC address to %pM.\n",
+                       dev->name, dev->dev_addr);
+
         /* set the Ethernet address */
         for (i=0; i < ETH_ALEN/2; i++)
                 writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8));