Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / ata / pata_arasan_cf.c

diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
index 5d9ee99c21481eac524415091e57da0370fa7a64..80fe0f6fed2900865a0e3709b5ec7164ea91477b 100644 (file)
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
@@ -834,7 +834,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
-       acdev->clk = clk_get(&pdev->dev, NULL);
+       acdev->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(acdev->clk)) {
                dev_warn(&pdev->dev, "Clock not found\n");
                return PTR_ERR(acdev->clk);
@@ -843,9 +843,8 @@ static int arasan_cf_probe(struct platform_device *pdev)
        /* allocate host */
        host = ata_host_alloc(&pdev->dev, 1);
        if (!host) {
-               ret = -ENOMEM;
                dev_warn(&pdev->dev, "alloc host fail\n");
-               goto free_clk;
+               return -ENOMEM;
        }
 
        ap = host->ports[0];
@@ -894,7 +893,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
 
        ret = cf_init(acdev);
        if (ret)
-               goto free_clk;
+               return ret;
 
        cf_card_detect(acdev, 0);
 
@@ -904,8 +903,7 @@ static int arasan_cf_probe(struct platform_device *pdev)
                return 0;
 
        cf_exit(acdev);
-free_clk:
-       clk_put(acdev->clk);
+
        return ret;
 }
 
@@ -916,7 +914,6 @@ static int arasan_cf_remove(struct platform_device *pdev)
 
        ata_host_detach(host);
        cf_exit(acdev);
-       clk_put(acdev->clk);
 
        return 0;
 }