Merge tag 'nfs-for-3.11-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[cascardo/linux.git] / drivers / net / can / c_can / c_can_platform.c

diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index d63b919..b918c73 100644 (file)
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -201,8 +201,8 @@ static int c_can_plat_probe(struct platform_device *pdev)
                        priv->instance = pdev->id;
 
                res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-               priv->raminit_ctrlreg = devm_request_and_ioremap(&pdev->dev, res);
-               if (!priv->raminit_ctrlreg || priv->instance < 0)
+               priv->raminit_ctrlreg = devm_ioremap_resource(&pdev->dev, res);
+               if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
                        dev_info(&pdev->dev, "control memory is not used for raminit\n");
                else
                        priv->raminit = c_can_hw_raminit;
@@ -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);