1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index a31696a3928e..8cf3cc6f20e2 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -801,14 +801,14 @@ static int lance_open(struct net_device *dev)
         netif_start_queue(dev);
 
         /* Associate IRQ with lance_interrupt */
-        if (request_irq(dev->irq, &lance_interrupt, 0, "lance", dev)) {
+        if (request_irq(dev->irq, lance_interrupt, 0, "lance", dev)) {
                 printk("%s: Can't get IRQ %d\n", dev->name, dev->irq);
                 return -EAGAIN;
         }
         if (lp->dma_irq >= 0) {
                 unsigned long flags;
 
-                if (request_irq(lp->dma_irq, &lance_dma_merr_int, 0,
+                if (request_irq(lp->dma_irq, lance_dma_merr_int, 0,
                                 "lance error", dev)) {
                         free_irq(dev->irq, dev);
                         printk("%s: Can't get DMA IRQ %d\n", dev->name,
@@ -940,9 +940,8 @@ static void lance_load_multicast(struct net_device *dev)
 {
         struct lance_private *lp = netdev_priv(dev);
         volatile u16 *ib = (volatile u16 *)dev->mem_start;
-        struct dev_mc_list *dmi = dev->mc_list;
+        struct dev_mc_list *dmi;
         char *addrs;
-        int i;
         u32 crc;
 
         /* set all multicast bits */
@@ -960,9 +959,8 @@ static void lance_load_multicast(struct net_device *dev)
         *lib_ptr(ib, filter[3], lp->type) = 0;
 
         /* Add addresses */
-        for (i = 0; i < dev->mc_count; i++) {
+        netdev_for_each_mc_addr(dmi, dev) {
                 addrs = dmi->dmi_addr;
-                dmi = dmi->next;
 
                 /* multicast address? */
                 if (!(*addrs & 1))