1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 008cdd9cc536..34d3da751eb4 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -19,7 +19,6 @@
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -213,7 +212,7 @@ static void set_multicast_finish(struct net_device *dev)
 
         /* if all multi or too many multicasts; just enable all */
         if ((dev->flags & IFF_ALLMULTI) != 0 ||
-            dev->mc_count > SCC_MAX_MULTICAST_ADDRS) {
+            netdev_mc_count(dev) > SCC_MAX_MULTICAST_ADDRS) {
 
                 W16(ep, sen_gaddr1, 0xffff);
                 W16(ep, sen_gaddr2, 0xffff);
@@ -228,7 +227,7 @@ static void set_multicast_list(struct net_device *dev)
 
         if ((dev->flags & IFF_PROMISC) == 0) {
                 set_multicast_start(dev);
-                for (pmc = dev->mc_list; pmc != NULL; pmc = pmc->next)
+                netdev_for_each_mc_addr(pmc, dev)
                         set_multicast_one(dev, pmc->dmi_addr);
                 set_multicast_finish(dev);
         } else
@@ -367,9 +366,7 @@ static void stop(struct net_device *dev)
                 udelay(1);
 
         if (i == SCC_RESET_DELAY)
-                printk(KERN_WARNING DRV_MODULE_NAME
-                       ": %s SCC timeout on graceful transmit stop\n",
-                       dev->name);
+                dev_warn(fep->dev, "SCC timeout on graceful transmit stop\n");
 
         W16(sccp, scc_sccm, 0);
         C32(sccp, scc_gsmrl, SCC_GSMRL_ENR | SCC_GSMRL_ENT);
@@ -429,8 +426,9 @@ static void clear_int_events(struct net_device *dev, u32 int_events)
 
 static void ev_error(struct net_device *dev, u32 int_events)
 {
-        printk(KERN_WARNING DRV_MODULE_NAME
-               ": %s SCC ERROR(s) 0x%x\n", dev->name, int_events);
+        struct fs_enet_private *fep = netdev_priv(dev);
+
+        dev_warn(fep->dev, "SCC ERROR(s) 0x%x\n", int_events);
 }
 
 static int get_regs(struct net_device *dev, void *p, int *sizep)