net: can: use platform_{get,set}_drvdata()

Use the wrapper functions for getting and setting the driver data using
platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
so we can directly pass a struct platform_device.

Also, unnecessary dev_set_drvdata() is removed, because the driver core
clears the driver data to NULL after device_release or on probe failure.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

3 files changed, 6 insertions, 10 deletions

diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c
index 5c8da4661489..06a282397fff 100644
--- a/drivers/net/can/sja1000/sja1000_isa.c
+++ b/drivers/net/can/sja1000/sja1000_isa.c
@@ -197,7 +197,7 @@ static int sja1000_isa_probe(struct platform_device *pdev)
         else
                 priv->cdr = CDR_DEFAULT;
 
-        dev_set_drvdata(&pdev->dev, dev);
+        platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         err = register_sja1000dev(dev);
@@ -225,12 +225,11 @@ static int sja1000_isa_probe(struct platform_device *pdev)
 
 static int sja1000_isa_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(&pdev->dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sja1000_priv *priv = netdev_priv(dev);
         int idx = pdev->id;
 
         unregister_sja1000dev(dev);
-        dev_set_drvdata(&pdev->dev, NULL);
 
         if (mem[idx]) {
                 iounmap(priv->reg_base);
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index 8e0c4a001939..31ad33911167 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -72,13 +72,11 @@ static void sja1000_ofp_write_reg(const struct sja1000_priv *priv,
 
 static int sja1000_ofp_remove(struct platform_device *ofdev)
 {
-        struct net_device *dev = dev_get_drvdata(&ofdev->dev);
+        struct net_device *dev = platform_get_drvdata(ofdev);
         struct sja1000_priv *priv = netdev_priv(dev);
         struct device_node *np = ofdev->dev.of_node;
         struct resource res;
 
-        dev_set_drvdata(&ofdev->dev, NULL);
-
         unregister_sja1000dev(dev);
         free_sja1000dev(dev);
         iounmap(priv->reg_base);
@@ -181,7 +179,7 @@ static int sja1000_ofp_probe(struct platform_device *ofdev)
                  priv->reg_base, dev->irq, priv->can.clock.freq,
                  priv->ocr, priv->cdr);
 
-        dev_set_drvdata(&ofdev->dev, dev);
+        platform_set_drvdata(ofdev, dev);
         SET_NETDEV_DEV(dev, &ofdev->dev);
 
         err = register_sja1000dev(dev);
diff --git a/drivers/net/can/sja1000/sja1000_platform.c b/drivers/net/can/sja1000/sja1000_platform.c
index 21619bb5b869..8e259c541036 100644
--- a/drivers/net/can/sja1000/sja1000_platform.c
+++ b/drivers/net/can/sja1000/sja1000_platform.c
@@ -135,7 +135,7 @@ static int sp_probe(struct platform_device *pdev)
                 break;
         }
 
-        dev_set_drvdata(&pdev->dev, dev);
+        platform_set_drvdata(pdev, dev);
         SET_NETDEV_DEV(dev, &pdev->dev);
 
         err = register_sja1000dev(dev);
@@ -161,12 +161,11 @@ static int sp_probe(struct platform_device *pdev)
 
 static int sp_remove(struct platform_device *pdev)
 {
-        struct net_device *dev = dev_get_drvdata(&pdev->dev);
+        struct net_device *dev = platform_get_drvdata(pdev);
         struct sja1000_priv *priv = netdev_priv(dev);
         struct resource *res;
 
         unregister_sja1000dev(dev);
-        dev_set_drvdata(&pdev->dev, NULL);
 
         if (priv->reg_base)
                 iounmap(priv->reg_base);