Merge branches 'for-3.18/always-poll-quirk', 'for-3.18/logitech', 'for-3.18/picolcd...

[sfrench/cifs-2.6.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 12430be6448acd86d4fa530cab24f6deb3a462a8..109cb44291f51f3af4c45979aa3b3ef53099d061 100644 (file)
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -208,40 +208,31 @@ static int c_can_plat_probe(struct platform_device *pdev)
        }
 
        /* get the appropriate clk */
-       clk = clk_get(&pdev->dev, NULL);
+       clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(clk)) {
-               dev_err(&pdev->dev, "no clock defined\n");
-               ret = -ENODEV;
+               ret = PTR_ERR(clk);
                goto exit;
        }
 
        /* get the platform data */
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        irq = platform_get_irq(pdev, 0);
-       if (!mem || irq <= 0) {
+       if (irq <= 0) {
                ret = -ENODEV;
-               goto exit_free_clk;
-       }
-
-       if (!request_mem_region(mem->start, resource_size(mem),
-                               KBUILD_MODNAME)) {
-               dev_err(&pdev->dev, "resource unavailable\n");
-               ret = -ENODEV;
-               goto exit_free_clk;
+               goto exit;
        }
 
-       addr = ioremap(mem->start, resource_size(mem));
-       if (!addr) {
-               dev_err(&pdev->dev, "failed to map can port\n");
-               ret = -ENOMEM;
-               goto exit_release_mem;
+       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       addr = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(addr)) {
+               ret =  PTR_ERR(addr);
+               goto exit;
        }
 
        /* allocate the c_can device */
        dev = alloc_c_can_dev();
        if (!dev) {
                ret = -ENOMEM;
-               goto exit_iounmap;
+               goto exit;
        }
 
        priv = netdev_priv(dev);
@@ -289,7 +280,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
 
                priv->raminit_ctrlreg = devm_ioremap(&pdev->dev, res->start,
                                                     resource_size(res));
-               if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
+               if (!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_ti;
@@ -322,12 +313,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
 
 exit_free_device:
        free_c_can_dev(dev);
-exit_iounmap:
-       iounmap(addr);
-exit_release_mem:
-       release_mem_region(mem->start, resource_size(mem));
-exit_free_clk:
-       clk_put(clk);
 exit:
        dev_err(&pdev->dev, "probe failed\n");
 
@@ -337,18 +322,10 @@ exit:
 static int c_can_plat_remove(struct platform_device *pdev)
 {
        struct net_device *dev = platform_get_drvdata(pdev);
-       struct c_can_priv *priv = netdev_priv(dev);
-       struct resource *mem;
 
        unregister_c_can_dev(dev);
 
        free_c_can_dev(dev);
-       iounmap(priv->base);
-
-       mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       release_mem_region(mem->start, resource_size(mem));
-
-       clk_put(priv->priv);
 
        return 0;
 }