6 files changed, 34 insertions, 49 deletions

diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 519e19e23955..079450fe5e96 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -1279,7 +1279,7 @@ static void emac_force_link_update(struct emac_instance *dev)
         netif_carrier_off(dev->ndev);
         smp_rmb();
         if (dev->link_polling) {
-                cancel_rearming_delayed_work(&dev->link_work);
+                cancel_delayed_work_sync(&dev->link_work);
                 if (dev->link_polling)
                         schedule_delayed_work(&dev->link_work,  PHY_POLL_LINK_OFF);
         }
@@ -1294,7 +1294,7 @@ static int emac_close(struct net_device *ndev)
 
         if (dev->phy.address >= 0) {
                 dev->link_polling = 0;
-                cancel_rearming_delayed_work(&dev->link_work);
+                cancel_delayed_work_sync(&dev->link_work);
         }
         mutex_lock(&dev->link_lock);
         emac_netif_stop(dev);
@@ -2053,13 +2053,6 @@ static void emac_ethtool_get_pauseparam(struct net_device *ndev,
         mutex_unlock(&dev->link_lock);
 }
 
-static u32 emac_ethtool_get_rx_csum(struct net_device *ndev)
-{
-        struct emac_instance *dev = netdev_priv(ndev);
-
-        return dev->tah_dev != NULL;
-}
-
 static int emac_get_regs_len(struct emac_instance *dev)
 {
         if (emac_has_feature(dev, EMAC_FTR_EMAC4))
@@ -2095,11 +2088,11 @@ static void *emac_dump_regs(struct emac_instance *dev, void *buf)
         if (emac_has_feature(dev, EMAC_FTR_EMAC4)) {
                 hdr->version = EMAC4_ETHTOOL_REGS_VER;
                 memcpy_fromio(hdr + 1, dev->emacp, EMAC4_ETHTOOL_REGS_SIZE(dev));
-                return ((void *)(hdr + 1) + EMAC4_ETHTOOL_REGS_SIZE(dev));
+                return (void *)(hdr + 1) + EMAC4_ETHTOOL_REGS_SIZE(dev);
         } else {
                 hdr->version = EMAC_ETHTOOL_REGS_VER;
                 memcpy_fromio(hdr + 1, dev->emacp, EMAC_ETHTOOL_REGS_SIZE(dev));
-                return ((void *)(hdr + 1) + EMAC_ETHTOOL_REGS_SIZE(dev));
+                return (void *)(hdr + 1) + EMAC_ETHTOOL_REGS_SIZE(dev);
         }
 }
 
@@ -2203,15 +2196,11 @@ static const struct ethtool_ops emac_ethtool_ops = {
         .get_ringparam = emac_ethtool_get_ringparam,
         .get_pauseparam = emac_ethtool_get_pauseparam,
 
-        .get_rx_csum = emac_ethtool_get_rx_csum,
-
         .get_strings = emac_ethtool_get_strings,
         .get_sset_count = emac_ethtool_get_sset_count,
         .get_ethtool_stats = emac_ethtool_get_ethtool_stats,
 
         .get_link = ethtool_op_get_link,
-        .get_tx_csum = ethtool_op_get_tx_csum,
-        .get_sg = ethtool_op_get_sg,
 };
 
 static int emac_ioctl(struct net_device *ndev, struct ifreq *rq, int cmd)
@@ -2293,7 +2282,7 @@ static int __devinit emac_check_deps(struct emac_instance *dev,
                 if (deps[i].drvdata != NULL)
                         there++;
         }
-        return (there == EMAC_DEP_COUNT);
+        return there == EMAC_DEP_COUNT;
 }
 
 static void emac_put_deps(struct emac_instance *dev)
@@ -2719,8 +2708,7 @@ static const struct net_device_ops emac_gige_netdev_ops = {
         .ndo_change_mtu         = emac_change_mtu,
 };
 
-static int __devinit emac_probe(struct platform_device *ofdev,
-                                const struct of_device_id *match)
+static int __devinit emac_probe(struct platform_device *ofdev)
 {
         struct net_device *ndev;
         struct emac_instance *dev;
@@ -2860,8 +2848,10 @@ static int __devinit emac_probe(struct platform_device *ofdev,
         if (err != 0)
                 goto err_detach_tah;
 
-        if (dev->tah_dev)
-                ndev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
+        if (dev->tah_dev) {
+                ndev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG;
+                ndev->features |= ndev->hw_features | NETIF_F_RXCSUM;
+        }
         ndev->watchdog_timeo = 5 * HZ;
         if (emac_phy_supports_gige(dev->phy_mode)) {
                 ndev->netdev_ops = &emac_gige_netdev_ops;
@@ -2871,7 +2861,6 @@ static int __devinit emac_probe(struct platform_device *ofdev,
         SET_ETHTOOL_OPS(ndev, &emac_ethtool_ops);
 
         netif_carrier_off(ndev);
-        netif_stop_queue(ndev);
 
         err = register_netdev(ndev);
         if (err) {
@@ -2951,7 +2940,7 @@ static int __devexit emac_remove(struct platform_device *ofdev)
 
         unregister_netdev(dev->ndev);
 
-        flush_scheduled_work();
+        cancel_work_sync(&dev->reset_work);
 
         if (emac_has_feature(dev, EMAC_FTR_HAS_TAH))
                 tah_detach(dev->tah_dev, dev->tah_port);
@@ -2995,7 +2984,7 @@ static struct of_device_id emac_match[] =
 };
 MODULE_DEVICE_TABLE(of, emac_match);
 
-static struct of_platform_driver emac_driver = {
+static struct platform_driver emac_driver = {
         .driver = {
                 .name = "emac",
                 .owner = THIS_MODULE,
@@ -3070,7 +3059,7 @@ static int __init emac_init(void)
         rc = tah_init();
         if (rc)
                 goto err_rgmii;
-        rc = of_register_platform_driver(&emac_driver);
+        rc = platform_driver_register(&emac_driver);
         if (rc)
                 goto err_tah;
 
@@ -3092,7 +3081,7 @@ static void __exit emac_exit(void)
 {
         int i;
 
-        of_unregister_platform_driver(&emac_driver);
+        platform_driver_unregister(&emac_driver);
 
         tah_exit();
         rgmii_exit();
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h
index 9e37e3d9c51d..4fec0844d59d 100644
--- a/drivers/net/ibm_newemac/core.h
+++ b/drivers/net/ibm_newemac/core.h
@@ -410,7 +410,7 @@ static inline u32 *emac_xaht_base(struct emac_instance *dev)
         else
                 offset = offsetof(struct emac_regs, u0.emac4.iaht1);
 
-        return ((u32 *)((ptrdiff_t)p + offset));
+        return (u32 *)((ptrdiff_t)p + offset);
 }
 
 static inline u32 *emac_gaht_base(struct emac_instance *dev)
@@ -418,7 +418,7 @@ static inline u32 *emac_gaht_base(struct emac_instance *dev)
         /* GAHT registers always come after an identical number of
          * IAHT registers.
          */
-        return (emac_xaht_base(dev) + EMAC_XAHT_REGS(dev));
+        return emac_xaht_base(dev) + EMAC_XAHT_REGS(dev);
 }
 
 static inline u32 *emac_iaht_base(struct emac_instance *dev)
@@ -426,7 +426,7 @@ static inline u32 *emac_iaht_base(struct emac_instance *dev)
         /* IAHT registers always come before an identical number of
          * GAHT registers.
          */
-        return (emac_xaht_base(dev));
+        return emac_xaht_base(dev);
 }
 
 /* Ethtool get_regs complex data.
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index d5717e2123e1..d268f404b7b0 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -517,8 +517,7 @@ void *mal_dump_regs(struct mal_instance *mal, void *buf)
         return regs + 1;
 }
 
-static int __devinit mal_probe(struct platform_device *ofdev,
-                               const struct of_device_id *match)
+static int __devinit mal_probe(struct platform_device *ofdev)
 {
         struct mal_instance *mal;
         int err = 0, i, bd_size;
@@ -789,7 +788,7 @@ static struct of_device_id mal_platform_match[] =
         {},
 };
 
-static struct of_platform_driver mal_of_driver = {
+static struct platform_driver mal_of_driver = {
         .driver = {
                 .name = "mcmal",
                 .owner = THIS_MODULE,
@@ -801,10 +800,10 @@ static struct of_platform_driver mal_of_driver = {
 
 int __init mal_init(void)
 {
-        return of_register_platform_driver(&mal_of_driver);
+        return platform_driver_register(&mal_of_driver);
 }
 
 void mal_exit(void)
 {
-        of_unregister_platform_driver(&mal_of_driver);
+        platform_driver_unregister(&mal_of_driver);
 }
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index dd61798897ac..4fa53f3def64 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -228,8 +228,7 @@ void *rgmii_dump_regs(struct platform_device *ofdev, void *buf)
 }
 
 
-static int __devinit rgmii_probe(struct platform_device *ofdev,
-                                 const struct of_device_id *match)
+static int __devinit rgmii_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct rgmii_instance *dev;
@@ -318,7 +317,7 @@ static struct of_device_id rgmii_match[] =
         {},
 };
 
-static struct of_platform_driver rgmii_driver = {
+static struct platform_driver rgmii_driver = {
         .driver = {
                 .name = "emac-rgmii",
                 .owner = THIS_MODULE,
@@ -330,10 +329,10 @@ static struct of_platform_driver rgmii_driver = {
 
 int __init rgmii_init(void)
 {
-        return of_register_platform_driver(&rgmii_driver);
+        return platform_driver_register(&rgmii_driver);
 }
 
 void rgmii_exit(void)
 {
-        of_unregister_platform_driver(&rgmii_driver);
+        platform_driver_unregister(&rgmii_driver);
 }
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index 299aa49490c0..5f51bf7c9dc5 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -60,7 +60,7 @@ void tah_reset(struct platform_device *ofdev)
                 printk(KERN_ERR "%s: reset timeout\n",
                         ofdev->dev.of_node->full_name);
 
-        /* 10KB TAH TX FIFO accomodates the max MTU of 9000 */
+        /* 10KB TAH TX FIFO accommodates the max MTU of 9000 */
         out_be32(&p->mr,
                  TAH_MR_CVR | TAH_MR_ST_768 | TAH_MR_TFS_10KB | TAH_MR_DTFP |
                  TAH_MR_DIG);
@@ -87,8 +87,7 @@ void *tah_dump_regs(struct platform_device *ofdev, void *buf)
         return regs + 1;
 }
 
-static int __devinit tah_probe(struct platform_device *ofdev,
-                               const struct of_device_id *match)
+static int __devinit tah_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct tah_instance *dev;
@@ -165,7 +164,7 @@ static struct of_device_id tah_match[] =
         {},
 };
 
-static struct of_platform_driver tah_driver = {
+static struct platform_driver tah_driver = {
         .driver = {
                 .name = "emac-tah",
                 .owner = THIS_MODULE,
@@ -177,10 +176,10 @@ static struct of_platform_driver tah_driver = {
 
 int __init tah_init(void)
 {
-        return of_register_platform_driver(&tah_driver);
+        return platform_driver_register(&tah_driver);
 }
 
 void tah_exit(void)
 {
-        of_unregister_platform_driver(&tah_driver);
+        platform_driver_unregister(&tah_driver);
 }
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 34ed6ee8ca8a..97449e786d61 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -231,8 +231,7 @@ void *zmii_dump_regs(struct platform_device *ofdev, void *buf)
         return regs + 1;
 }
 
-static int __devinit zmii_probe(struct platform_device *ofdev,
-                                const struct of_device_id *match)
+static int __devinit zmii_probe(struct platform_device *ofdev)
 {
         struct device_node *np = ofdev->dev.of_node;
         struct zmii_instance *dev;
@@ -312,7 +311,7 @@ static struct of_device_id zmii_match[] =
         {},
 };
 
-static struct of_platform_driver zmii_driver = {
+static struct platform_driver zmii_driver = {
         .driver = {
                 .name = "emac-zmii",
                 .owner = THIS_MODULE,
@@ -324,10 +323,10 @@ static struct of_platform_driver zmii_driver = {
 
 int __init zmii_init(void)
 {
-        return of_register_platform_driver(&zmii_driver);
+        return platform_driver_register(&zmii_driver);
 }
 
 void zmii_exit(void)
 {
-        of_unregister_platform_driver(&zmii_driver);
+        platform_driver_unregister(&zmii_driver);
 }