1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c
index aad3b370c562..f7a8f707361e 100644
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
@@ -109,7 +109,6 @@ static int fifo = 0x8;	/* don't change */
 #include <linux/string.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -284,7 +283,7 @@ static int ni52_open(struct net_device *dev)
         startrecv586(dev);
         ni_enaint();
 
-        ret = request_irq(dev->irq, &ni52_interrupt, 0, dev->name, dev);
+        ret = request_irq(dev->irq, ni52_interrupt, 0, dev->name, dev);
         if (ret) {
                 ni_reset586();
                 return ret;
@@ -477,8 +476,8 @@ static int __init ni52_probe1(struct net_device *dev, int ioaddr)
         for (i = 0; i < ETH_ALEN; i++)
                 dev->dev_addr[i] = inb(dev->base_addr+i);
 
-        if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1
-                 || dev->dev_addr[2] != NI52_ADDR2) {
+        if (dev->dev_addr[0] != NI52_ADDR0 || dev->dev_addr[1] != NI52_ADDR1 ||
+            dev->dev_addr[2] != NI52_ADDR2) {
                 retval = -ENODEV;
                 goto out;
         }
@@ -596,8 +595,8 @@ static int init586(struct net_device *dev)
         struct iasetup_cmd_struct __iomem *ias_cmd;
         struct tdr_cmd_struct __iomem *tdr_cmd;
         struct mcsetup_cmd_struct __iomem *mc_cmd;
-        struct dev_mc_list *dmi = dev->mc_list;
-        int num_addrs = dev->mc_count;
+        struct dev_mc_list *dmi;
+        int num_addrs = netdev_mc_count(dev);
 
         ptr = p->scb + 1;
 
@@ -724,9 +723,9 @@ static int init586(struct net_device *dev)
                 writew(0xffff, &mc_cmd->cmd_link);
                 writew(num_addrs * 6, &mc_cmd->mc_cnt);
 
-                for (i = 0; i < num_addrs; i++, dmi = dmi->next)
-                        memcpy_toio(mc_cmd->mc_list[i],
-                                                        dmi->dmi_addr, 6);
+                i = 0;
+                netdev_for_each_mc_addr(dmi, dev)
+                        memcpy_toio(mc_cmd->mc_list[i++], dmi->dmi_addr, 6);
 
                 writew(make16(mc_cmd), &p->scb->cbl_offset);
                 writeb(CUC_START, &p->scb->cmd_cuc);