5 files changed, 3 insertions, 10 deletions

diff --git a/drivers/net/can/at91_can.c b/drivers/net/can/at91_can.c
index db52f4414def..556656661d6b 100644
--- a/drivers/net/can/at91_can.c
+++ b/drivers/net/can/at91_can.c
@@ -1393,8 +1393,6 @@ static int at91_can_remove(struct platform_device *pdev)
 
         unregister_netdev(dev);
 
-        platform_set_drvdata(pdev, NULL);
-
         iounmap(priv->reg_base);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index d63b91904f82..6b6130b8bdc4 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -234,7 +234,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
         return 0;
 
 exit_free_device:
-        platform_set_drvdata(pdev, NULL);
         free_c_can_dev(dev);
 exit_iounmap:
         iounmap(addr);
@@ -255,7 +254,6 @@ static int c_can_plat_remove(struct platform_device *pdev)
         struct resource *mem;
 
         unregister_c_can_dev(dev);
-        platform_set_drvdata(pdev, NULL);
 
         free_c_can_dev(dev);
         iounmap(priv->base);
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 769d29ed106d..4a40a186c8c8 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@ -1127,7 +1127,6 @@ static int flexcan_remove(struct platform_device *pdev)
         struct resource *mem;
 
         unregister_flexcandev(dev);
-        platform_set_drvdata(pdev, NULL);
         iounmap(priv->base);
 
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
diff --git a/drivers/net/can/grcan.c b/drivers/net/can/grcan.c
index 17fbc7a09224..9e9d0d628e7b 100644
--- a/drivers/net/can/grcan.c
+++ b/drivers/net/can/grcan.c
@@ -1683,10 +1683,9 @@ static int grcan_probe(struct platform_device *ofdev)
         }
 
         res = platform_get_resource(ofdev, IORESOURCE_MEM, 0);
-        base = devm_request_and_ioremap(&ofdev->dev, res);
-        if (!base) {
-                dev_err(&ofdev->dev, "couldn't map IO resource\n");
-                err = -EADDRNOTAVAIL;
+        base = devm_ioremap_resource(&ofdev->dev, res);
+        if (IS_ERR(base)) {
+                err = PTR_ERR(base);
                 goto exit_error;
         }
 
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index f21fc37ec578..3a349a22d5bc 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -1001,7 +1001,6 @@ static int ti_hecc_remove(struct platform_device *pdev)
         iounmap(priv->base);
         release_mem_region(res->start, resource_size(res));
         free_candev(ndev);
-        platform_set_drvdata(pdev, NULL);
 
         return 0;
 }