Merge branch 'dma' into devel

[linux-2.6-omap-h63xx.git] / drivers / net / declance.c

diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 00e0194bfef005acea333ed70dd6db7aacc36d37..7ce3053530f9c62279f38dd17340e89167b6044b 100644 (file)
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -622,7 +622,6 @@ static int lance_rx(struct net_device *dev)
 
                        skb->protocol = eth_type_trans(skb, dev);
                        netif_rx(skb);
-                       dev->last_rx = jiffies;
                        dev->stats.rx_packets++;
                }
 
@@ -719,15 +718,15 @@ out:
        spin_unlock(&lp->lock);
 }
 
-static irqreturn_t lance_dma_merr_int(const int irq, void *dev_id)
+static irqreturn_t lance_dma_merr_int(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
 
-       printk("%s: DMA error\n", dev->name);
+       printk(KERN_ERR "%s: DMA error\n", dev->name);
        return IRQ_HANDLED;
 }
 
-static irqreturn_t lance_interrupt(const int irq, void *dev_id)
+static irqreturn_t lance_interrupt(int irq, void *dev_id)
 {
        struct net_device *dev = dev_id;
        struct lance_private *lp = netdev_priv(dev);
@@ -773,8 +772,6 @@ static irqreturn_t lance_interrupt(const int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-struct net_device *last_dev = 0;
-
 static int lance_open(struct net_device *dev)
 {
        volatile u16 *ib = (volatile u16 *)dev->mem_start;
@@ -782,8 +779,6 @@ static int lance_open(struct net_device *dev)
        volatile struct lance_regs *ll = lp->ll;
        int status = 0;
 
-       last_dev = dev;
-
        /* Stop the Lance */
        writereg(&ll->rap, LE_CSR0);
        writereg(&ll->rdp, LE_C0_STOP);
@@ -1027,7 +1022,6 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
        int i, ret;
        unsigned long esar_base;
        unsigned char *esar;
-       DECLARE_MAC_BUF(mac);
 
        if (dec_lance_debug && version_printed++ == 0)
                printk(version);
@@ -1039,7 +1033,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
                dev = root_lance_dev;
                while (dev) {
                        i++;
-                       lp = (struct lance_private *)dev->priv;
+                       lp = netdev_priv(dev);
                        dev = lp->next;
                }
                snprintf(name, sizeof(name), fmt, i);
@@ -1227,8 +1221,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
        for (i = 0; i < 6; i++)
                dev->dev_addr[i] = esar[i * 4];
 
-       printk(", addr = %s, irq = %d\n",
-              print_mac(mac, dev->dev_addr), dev->irq);
+       printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq);
 
        dev->open = &lance_open;
        dev->stop = &lance_close;