1 files changed, 4 insertions, 7 deletions

diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index de67744c4a2a..e7cc80f32560 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -876,8 +876,6 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
         word memory_info_register;
         word memory_cfg_register;
 
-        DECLARE_MAC_BUF(mac);
-
         /* Grab the region so that no one else tries to probe our ioports. */
         if (!request_region(ioaddr, SMC_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -1033,10 +1031,10 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
         /*
          . Print the Ethernet address
         */
-        printk("ADDR: %s\n", print_mac(mac, dev->dev_addr));
+        printk("ADDR: %pM\n", dev->dev_addr);
 
         /* set the private data to zero by default */
-        memset(dev->priv, 0, sizeof(struct smc_local));
+        memset(netdev_priv(dev), 0, sizeof(struct smc_local));
 
         /* Grab the IRQ */
         retval = request_irq(dev->irq, &smc_interrupt, 0, DRV_NAME, dev);
@@ -1110,7 +1108,7 @@ static int smc_open(struct net_device *dev)
         int     i;      /* used to set hw ethernet address */
 
         /* clear out all the junk that was put here before... */
-        memset(dev->priv, 0, sizeof(struct smc_local));
+        memset(netdev_priv(dev), 0, sizeof(struct smc_local));
 
         /* reset the hardware */
 
@@ -1166,7 +1164,7 @@ static void smc_timeout(struct net_device *dev)
         smc_enable( dev->base_addr );
         dev->trans_start = jiffies;
         /* clear anything saved */
-        ((struct smc_local *)dev->priv)->saved_skb = NULL;
+        ((struct smc_local *)netdev_priv(dev))->saved_skb = NULL;
         netif_wake_queue(dev);
 }
 
@@ -1272,7 +1270,6 @@ static void smc_rcv(struct net_device *dev)
 
                 skb->protocol = eth_type_trans(skb, dev );
                 netif_rx(skb);
-                dev->last_rx = jiffies;
                 dev->stats.rx_packets++;
                 dev->stats.rx_bytes += packet_length;
         } else {