7 files changed, 177 insertions, 68 deletions

diff --git a/drivers/net/fs_enet/Kconfig b/drivers/net/fs_enet/Kconfig
index 562ea68ed99b..fc073b5a38c7 100644
--- a/drivers/net/fs_enet/Kconfig
+++ b/drivers/net/fs_enet/Kconfig
@@ -1,9 +1,13 @@
 config FS_ENET
        tristate "Freescale Ethernet Driver"
-       depends on CPM1 || CPM2
+       depends on CPM1 || CPM2 || PPC_MPC512x
        select MII
        select PHYLIB
 
+config FS_ENET_MPC5121_FEC
+        def_bool y if (FS_ENET && PPC_MPC512x)
+        select FS_ENET_HAS_FEC
+
 config FS_ENET_HAS_SCC
         bool "Chip has an SCC usable for ethernet"
         depends on FS_ENET && (CPM1 || CPM2)
@@ -16,13 +20,13 @@ config FS_ENET_HAS_FCC
 
 config FS_ENET_HAS_FEC
         bool "Chip has an FEC usable for ethernet"
-        depends on FS_ENET && CPM1
+        depends on FS_ENET && (CPM1 || FS_ENET_MPC5121_FEC)
         select FS_ENET_MDIO_FEC
         default y
 
 config FS_ENET_MDIO_FEC
         tristate "MDIO driver for FEC"
-        depends on FS_ENET && CPM1
+        depends on FS_ENET && (CPM1 || FS_ENET_MPC5121_FEC)
 
 config FS_ENET_MDIO_FCC
         tristate "MDIO driver for FCC"
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index ec2f5034457f..0770e2f6da6b 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -108,9 +108,7 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
                  * the last indicator should be set.
                  */
                 if ((sc & BD_ENET_RX_LAST) == 0)
-                        printk(KERN_WARNING DRV_MODULE_NAME
-                               ": %s rcv is not +last\n",
-                               dev->name);
+                        dev_warn(fep->dev, "rcv is not +last\n");
 
                 /*
                  * Check for errors.
@@ -178,9 +176,8 @@ static int fs_enet_rx_napi(struct napi_struct *napi, int budget)
                                 received++;
                                 netif_receive_skb(skb);
                         } else {
-                                printk(KERN_WARNING DRV_MODULE_NAME
-                                       ": %s Memory squeeze, dropping packet.\n",
-                                       dev->name);
+                                dev_warn(fep->dev,
+                                         "Memory squeeze, dropping packet.\n");
                                 fep->stats.rx_dropped++;
                                 skbn = skb;
                         }
@@ -242,9 +239,7 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
                  * the last indicator should be set.
                  */
                 if ((sc & BD_ENET_RX_LAST) == 0)
-                        printk(KERN_WARNING DRV_MODULE_NAME
-                               ": %s rcv is not +last\n",
-                               dev->name);
+                        dev_warn(fep->dev, "rcv is not +last\n");
 
                 /*
                  * Check for errors.
@@ -313,9 +308,8 @@ static int fs_enet_rx_non_napi(struct net_device *dev)
                                 received++;
                                 netif_rx(skb);
                         } else {
-                                printk(KERN_WARNING DRV_MODULE_NAME
-                                       ": %s Memory squeeze, dropping packet.\n",
-                                       dev->name);
+                                dev_warn(fep->dev,
+                                         "Memory squeeze, dropping packet.\n");
                                 fep->stats.rx_dropped++;
                                 skbn = skb;
                         }
@@ -388,10 +382,10 @@ static void fs_enet_tx(struct net_device *dev)
                 } else
                         fep->stats.tx_packets++;
 
-                if (sc & BD_ENET_TX_READY)
-                        printk(KERN_WARNING DRV_MODULE_NAME
-                               ": %s HEY! Enet xmit interrupt and TX_READY.\n",
-                               dev->name);
+                if (sc & BD_ENET_TX_READY) {
+                        dev_warn(fep->dev,
+                                 "HEY! Enet xmit interrupt and TX_READY.\n");
+                }
 
                 /*
                  * Deferred means some collisions occurred during transmit,
@@ -511,9 +505,8 @@ void fs_init_bds(struct net_device *dev)
         for (i = 0, bdp = fep->rx_bd_base; i < fep->rx_ring; i++, bdp++) {
                 skb = dev_alloc_skb(ENET_RX_FRSIZE);
                 if (skb == NULL) {
-                        printk(KERN_WARNING DRV_MODULE_NAME
-                               ": %s Memory squeeze, unable to allocate skb\n",
-                               dev->name);
+                        dev_warn(fep->dev,
+                                 "Memory squeeze, unable to allocate skb\n");
                         break;
                 }
                 skb_align(skb, ENET_RX_ALIGN);
@@ -587,6 +580,40 @@ void fs_cleanup_bds(struct net_device *dev)
 
 /**********************************************************************************/
 
+#ifdef CONFIG_FS_ENET_MPC5121_FEC
+/*
+ * MPC5121 FEC requeries 4-byte alignment for TX data buffer!
+ */
+static struct sk_buff *tx_skb_align_workaround(struct net_device *dev,
+                                               struct sk_buff *skb)
+{
+        struct sk_buff *new_skb;
+        struct fs_enet_private *fep = netdev_priv(dev);
+
+        /* Alloc new skb */
+        new_skb = dev_alloc_skb(skb->len + 4);
+        if (!new_skb) {
+                if (net_ratelimit()) {
+                        dev_warn(fep->dev,
+                                 "Memory squeeze, dropping tx packet.\n");
+                }
+                return NULL;
+        }
+
+        /* Make sure new skb is properly aligned */
+        skb_align(new_skb, 4);
+
+        /* Copy data to new skb ... */
+        skb_copy_from_linear_data(skb, new_skb->data, skb->len);
+        skb_put(new_skb, skb->len);
+
+        /* ... and free an old one */
+        dev_kfree_skb_any(skb);
+
+        return new_skb;
+}
+#endif
+
 static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
@@ -595,6 +622,19 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
         u16 sc;
         unsigned long flags;
 
+#ifdef CONFIG_FS_ENET_MPC5121_FEC
+        if (((unsigned long)skb->data) & 0x3) {
+                skb = tx_skb_align_workaround(dev, skb);
+                if (!skb) {
+                        /*
+                         * We have lost packet due to memory allocation error
+                         * in tx_skb_align_workaround(). Hopefully original
+                         * skb is still valid, so try transmit it later.
+                         */
+                        return NETDEV_TX_BUSY;
+                }
+        }
+#endif
         spin_lock_irqsave(&fep->tx_lock, flags);
 
         /*
@@ -610,8 +650,7 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev)
                  * Ooops.  All transmit buffers are full.  Bail out.
                  * This should not happen, since the tx queue should be stopped.
                  */
-                printk(KERN_WARNING DRV_MODULE_NAME
-                       ": %s tx queue full!.\n", dev->name);
+                dev_warn(fep->dev, "tx queue full!.\n");
                 return NETDEV_TX_BUSY;
         }
 
@@ -788,8 +827,7 @@ static int fs_enet_open(struct net_device *dev)
         r = request_irq(fep->interrupt, fs_enet_interrupt, IRQF_SHARED,
                         "fs_enet-mac", dev);
         if (r != 0) {
-                printk(KERN_ERR DRV_MODULE_NAME
-                       ": %s Could not allocate FS_ENET IRQ!", dev->name);
+                dev_err(fep->dev, "Could not allocate FS_ENET IRQ!");
                 if (fep->fpi->use_napi)
                         napi_disable(&fep->napi);
                 return -EINVAL;
@@ -1053,7 +1091,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
         if (ret)
                 goto out_free_bd;
 
-        printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr);
+        pr_info("%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr);
 
         return 0;
 
@@ -1103,11 +1141,18 @@ static struct of_device_id fs_enet_match[] = {
         },
 #endif
 #ifdef CONFIG_FS_ENET_HAS_FEC
+#ifdef CONFIG_FS_ENET_MPC5121_FEC
+        {
+                .compatible = "fsl,mpc5121-fec",
+                .data = (void *)&fs_fec_ops,
+        },
+#else
         {
                 .compatible = "fsl,pq1-fec-enet",
                 .data = (void *)&fs_fec_ops,
         },
 #endif
+#endif
         {}
 };
 MODULE_DEVICE_TABLE(of, fs_enet_match);
diff --git a/drivers/net/fs_enet/fs_enet.h b/drivers/net/fs_enet/fs_enet.h
index ef01e09781a5..1ece4b1a689e 100644
--- a/drivers/net/fs_enet/fs_enet.h
+++ b/drivers/net/fs_enet/fs_enet.h
@@ -13,9 +13,56 @@
 
 #ifdef CONFIG_CPM1
 #include <asm/cpm1.h>
+#endif
+
+#if defined(CONFIG_FS_ENET_HAS_FEC)
+#include <asm/cpm.h>
+
+#if defined(CONFIG_FS_ENET_MPC5121_FEC)
+/* MPC5121 FEC has different register layout */
+struct fec {
+        u32 fec_reserved0;
+        u32 fec_ievent;                 /* Interrupt event reg */
+        u32 fec_imask;                  /* Interrupt mask reg */
+        u32 fec_reserved1;
+        u32 fec_r_des_active;           /* Receive descriptor reg */
+        u32 fec_x_des_active;           /* Transmit descriptor reg */
+        u32 fec_reserved2[3];
+        u32 fec_ecntrl;                 /* Ethernet control reg */
+        u32 fec_reserved3[6];
+        u32 fec_mii_data;               /* MII manage frame reg */
+        u32 fec_mii_speed;              /* MII speed control reg */
+        u32 fec_reserved4[7];
+        u32 fec_mib_ctrlstat;           /* MIB control/status reg */
+        u32 fec_reserved5[7];
+        u32 fec_r_cntrl;                /* Receive control reg */
+        u32 fec_reserved6[15];
+        u32 fec_x_cntrl;                /* Transmit Control reg */
+        u32 fec_reserved7[7];
+        u32 fec_addr_low;               /* Low 32bits MAC address */
+        u32 fec_addr_high;              /* High 16bits MAC address */
+        u32 fec_opd;                    /* Opcode + Pause duration */
+        u32 fec_reserved8[10];
+        u32 fec_hash_table_high;        /* High 32bits hash table */
+        u32 fec_hash_table_low;         /* Low 32bits hash table */
+        u32 fec_grp_hash_table_high;    /* High 32bits hash table */
+        u32 fec_grp_hash_table_low;     /* Low 32bits hash table */
+        u32 fec_reserved9[7];
+        u32 fec_x_wmrk;                 /* FIFO transmit water mark */
+        u32 fec_reserved10;
+        u32 fec_r_bound;                /* FIFO receive bound reg */
+        u32 fec_r_fstart;               /* FIFO receive start reg */
+        u32 fec_reserved11[11];
+        u32 fec_r_des_start;            /* Receive descriptor ring */
+        u32 fec_x_des_start;            /* Transmit descriptor ring */
+        u32 fec_r_buff_size;            /* Maximum receive buff size */
+        u32 fec_reserved12[26];
+        u32 fec_dma_control;            /* DMA Endian and other ctrl */
+};
+#endif
 
 struct fec_info {
-        fec_t __iomem *fecp;
+        struct fec __iomem *fecp;
         u32 mii_speed;
 };
 #endif
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 22e5a847a588..0a973e71876b 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.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>
@@ -34,6 +33,7 @@
 #include <linux/platform_device.h>
 #include <linux/phy.h>
 #include <linux/of_device.h>
+#include <linux/gfp.h>
 
 #include <asm/immap_cpm2.h>
 #include <asm/mpc8260.h>
@@ -218,7 +218,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 > FCC_MAX_MULTICAST_ADDRS) {
+            netdev_mc_count(dev) > FCC_MAX_MULTICAST_ADDRS) {
 
                 W32(ep, fen_gaddrh, 0xffffffff);
                 W32(ep, fen_gaddrl, 0xffffffff);
@@ -235,7 +235,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
@@ -476,8 +476,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 FS_ENET ERROR(s) 0x%x\n", dev->name, int_events);
+        struct fs_enet_private *fep = netdev_priv(dev);
+
+        dev_warn(fep->dev, "FS_ENET ERROR(s) 0x%x\n", int_events);
 }
 
 static int get_regs(struct net_device *dev, void *p, int *sizep)
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index ca7bcb8ab3a1..ec81f50d5919 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.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>
@@ -33,6 +32,7 @@
 #include <linux/fs.h>
 #include <linux/platform_device.h>
 #include <linux/of_device.h>
+#include <linux/gfp.h>
 
 #include <asm/irq.h>
 #include <asm/uaccess.h>
@@ -80,7 +80,7 @@
  */
 #define FEC_RESET_DELAY         50
 
-static int whack_reset(fec_t __iomem *fecp)
+static int whack_reset(struct fec __iomem *fecp)
 {
         int i;
 
@@ -168,7 +168,7 @@ static void cleanup_data(struct net_device *dev)
 static void set_promiscuous_mode(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         FS(fecp, r_cntrl, FEC_RCNTRL_PROM);
 }
@@ -216,11 +216,11 @@ static void set_multicast_one(struct net_device *dev, const u8 *mac)
 static void set_multicast_finish(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         /* if all multi or too many multicasts; just enable all */
         if ((dev->flags & IFF_ALLMULTI) != 0 ||
-            dev->mc_count > FEC_MAX_MULTICAST_ADDRS) {
+            netdev_mc_count(dev) > FEC_MAX_MULTICAST_ADDRS) {
                 fep->fec.hthi = 0xffffffffU;
                 fep->fec.htlo = 0xffffffffU;
         }
@@ -236,7 +236,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
@@ -246,7 +246,7 @@ static void set_multicast_list(struct net_device *dev)
 static void restart(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
         const struct fs_platform_info *fpi = fep->fpi;
         dma_addr_t rx_bd_base_phys, tx_bd_base_phys;
         int r;
@@ -257,8 +257,7 @@ static void restart(struct net_device *dev)
 
         r = whack_reset(fep->fec.fecp);
         if (r != 0)
-                printk(KERN_ERR DRV_MODULE_NAME
-                                ": %s FEC Reset FAILED!\n", dev->name);
+                dev_err(fep->dev, "FEC Reset FAILED!\n");
         /*
          * Set station address.
          */
@@ -281,7 +280,11 @@ static void restart(struct net_device *dev)
          * Set maximum receive buffer size.
          */
         FW(fecp, r_buff_size, PKT_MAXBLR_SIZE);
+#ifdef CONFIG_FS_ENET_MPC5121_FEC
+        FW(fecp, r_cntrl, PKT_MAXBUF_SIZE << 16);
+#else
         FW(fecp, r_hash, PKT_MAXBUF_SIZE);
+#endif
 
         /* get physical address */
         rx_bd_base_phys = fep->ring_mem_addr;
@@ -298,7 +301,11 @@ static void restart(struct net_device *dev)
         /*
          * Enable big endian and don't care about SDMA FC.
          */
+#ifdef CONFIG_FS_ENET_MPC5121_FEC
+        FS(fecp, dma_control, 0xC0000000);
+#else
         FW(fecp, fun_code, 0x78000000);
+#endif
 
         /*
          * Set MII speed.
@@ -309,9 +316,17 @@ static void restart(struct net_device *dev)
          * Clear any outstanding interrupt.
          */
         FW(fecp, ievent, 0xffc0);
+#ifndef CONFIG_FS_ENET_MPC5121_FEC
         FW(fecp, ivec, (virq_to_hw(fep->interrupt) / 2) << 29);
 
         FW(fecp, r_cntrl, FEC_RCNTRL_MII_MODE); /* MII enable */
+#else
+        /*
+         * Only set MII mode - do not touch maximum frame length
+         * configured before.
+         */
+        FS(fecp, r_cntrl, FEC_RCNTRL_MII_MODE);
+#endif
         /*
          * adjust to duplex mode
          */
@@ -340,7 +355,7 @@ static void stop(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
         const struct fs_platform_info *fpi = fep->fpi;
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         struct fec_info* feci= fep->phydev->bus->priv;
 
@@ -355,9 +370,7 @@ static void stop(struct net_device *dev)
                 udelay(1);
 
         if (i == FEC_RESET_DELAY)
-                printk(KERN_WARNING DRV_MODULE_NAME
-                       ": %s FEC timeout on graceful transmit stop\n",
-                       dev->name);
+                dev_warn(fep->dev, "FEC timeout on graceful transmit stop\n");
         /*
          * Disable FEC. Let only MII interrupts.
          */
@@ -378,7 +391,7 @@ static void stop(struct net_device *dev)
 static void napi_clear_rx_event(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         FW(fecp, ievent, FEC_NAPI_RX_EVENT_MSK);
 }
@@ -386,7 +399,7 @@ static void napi_clear_rx_event(struct net_device *dev)
 static void napi_enable_rx(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         FS(fecp, imask, FEC_NAPI_RX_EVENT_MSK);
 }
@@ -394,7 +407,7 @@ static void napi_enable_rx(struct net_device *dev)
 static void napi_disable_rx(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         FC(fecp, imask, FEC_NAPI_RX_EVENT_MSK);
 }
@@ -402,7 +415,7 @@ static void napi_disable_rx(struct net_device *dev)
 static void rx_bd_done(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         FW(fecp, r_des_active, 0x01000000);
 }
@@ -410,7 +423,7 @@ static void rx_bd_done(struct net_device *dev)
 static void tx_kickstart(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         FW(fecp, x_des_active, 0x01000000);
 }
@@ -418,7 +431,7 @@ static void tx_kickstart(struct net_device *dev)
 static u32 get_int_events(struct net_device *dev)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         return FR(fecp, ievent) & FR(fecp, imask);
 }
@@ -426,32 +439,33 @@ static u32 get_int_events(struct net_device *dev)
 static void clear_int_events(struct net_device *dev, u32 int_events)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
-        fec_t __iomem *fecp = fep->fec.fecp;
+        struct fec __iomem *fecp = fep->fec.fecp;
 
         FW(fecp, ievent, int_events);
 }
 
 static void ev_error(struct net_device *dev, u32 int_events)
 {
-        printk(KERN_WARNING DRV_MODULE_NAME
-               ": %s FEC ERROR(s) 0x%x\n", dev->name, int_events);
+        struct fs_enet_private *fep = netdev_priv(dev);
+
+        dev_warn(fep->dev, "FEC ERROR(s) 0x%x\n", int_events);
 }
 
 static int get_regs(struct net_device *dev, void *p, int *sizep)
 {
         struct fs_enet_private *fep = netdev_priv(dev);
 
-        if (*sizep < sizeof(fec_t))
+        if (*sizep < sizeof(struct fec))
                 return -EINVAL;
 
-        memcpy_fromio(p, fep->fec.fecp, sizeof(fec_t));
+        memcpy_fromio(p, fep->fec.fecp, sizeof(struct fec));
 
         return 0;
 }
 
 static int get_regs_len(struct net_device *dev)
 {
-        return sizeof(fec_t);
+        return sizeof(struct fec);
 }
 
 static void tx_restart(struct net_device *dev)
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)
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 96eba4280c5c..5944b65082cb 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -52,7 +52,7 @@
 static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location)
 {
         struct fec_info* fec = bus->priv;
-        fec_t __iomem *fecp = fec->fecp;
+        struct fec __iomem *fecp = fec->fecp;
         int i, ret = -1;
 
         BUG_ON((in_be32(&fecp->fec_r_cntrl) & FEC_RCNTRL_MII_MODE) == 0);
@@ -75,7 +75,7 @@ static int fs_enet_fec_mii_read(struct mii_bus *bus , int phy_id, int location)
 static int fs_enet_fec_mii_write(struct mii_bus *bus, int phy_id, int location, u16 val)
 {
         struct fec_info* fec = bus->priv;
-        fec_t __iomem *fecp = fec->fecp;
+        struct fec __iomem *fecp = fec->fecp;
         int i;
 
         /* this must never happen */