1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/net/ethernet/ibm/emac/tah.c b/drivers/net/ethernet/ibm/emac/tah.c
index 795f1393e2b6..c231a4a32c4d 100644
--- a/drivers/net/ethernet/ibm/emac/tah.c
+++ b/drivers/net/ethernet/ibm/emac/tah.c
@@ -25,7 +25,7 @@
 
 int tah_attach(struct platform_device *ofdev, int channel)
 {
-        struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
+        struct tah_instance *dev = platform_get_drvdata(ofdev);
 
         mutex_lock(&dev->lock);
         /* Reset has been done at probe() time... nothing else to do for now */
@@ -37,7 +37,7 @@ int tah_attach(struct platform_device *ofdev, int channel)
 
 void tah_detach(struct platform_device *ofdev, int channel)
 {
-        struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
+        struct tah_instance *dev = platform_get_drvdata(ofdev);
 
         mutex_lock(&dev->lock);
         --dev->users;
@@ -46,7 +46,7 @@ void tah_detach(struct platform_device *ofdev, int channel)
 
 void tah_reset(struct platform_device *ofdev)
 {
-        struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
+        struct tah_instance *dev = platform_get_drvdata(ofdev);
         struct tah_regs __iomem *p = dev->base;
         int n;
 
@@ -74,7 +74,7 @@ int tah_get_regs_len(struct platform_device *ofdev)
 
 void *tah_dump_regs(struct platform_device *ofdev, void *buf)
 {
-        struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
+        struct tah_instance *dev = platform_get_drvdata(ofdev);
         struct emac_ethtool_regs_subhdr *hdr = buf;
         struct tah_regs *regs = (struct tah_regs *)(hdr + 1);
 
@@ -118,7 +118,7 @@ static int tah_probe(struct platform_device *ofdev)
                 goto err_free;
         }
 
-        dev_set_drvdata(&ofdev->dev, dev);
+        platform_set_drvdata(ofdev, dev);
 
         /* Initialize TAH and enable IPv4 checksum verification, no TSO yet */
         tah_reset(ofdev);
@@ -137,9 +137,7 @@ static int tah_probe(struct platform_device *ofdev)
 
 static int tah_remove(struct platform_device *ofdev)
 {
-        struct tah_instance *dev = dev_get_drvdata(&ofdev->dev);
-
-        dev_set_drvdata(&ofdev->dev, NULL);
+        struct tah_instance *dev = platform_get_drvdata(ofdev);
 
         WARN_ON(dev->users != 0);