Merge branch 'for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / atmel-tdes.c

diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c
index 504e90340074eb0bd52942b07a0992ac9b3739a9..2c7a628d0375fd43d80f82084b38eed009a8f032 100644 (file)
--- a/drivers/crypto/atmel-tdes.c
+++ b/drivers/crypto/atmel-tdes.c
@@ -1359,7 +1359,6 @@ static int atmel_tdes_probe(struct platform_device *pdev)
        struct crypto_platform_data     *pdata;
        struct device *dev = &pdev->dev;
        struct resource *tdes_res;
-       unsigned long tdes_phys_size;
        int err;
 
        tdes_dd = devm_kmalloc(&pdev->dev, sizeof(*tdes_dd), GFP_KERNEL);
@@ -1393,7 +1392,6 @@ static int atmel_tdes_probe(struct platform_device *pdev)
                goto res_err;
        }
        tdes_dd->phys_base = tdes_res->start;
-       tdes_phys_size = resource_size(tdes_res);
 
        /* Get the IRQ */
        tdes_dd->irq = platform_get_irq(pdev,  0);
@@ -1403,26 +1401,26 @@ static int atmel_tdes_probe(struct platform_device *pdev)
                goto res_err;
        }
 
-       err = request_irq(tdes_dd->irq, atmel_tdes_irq, IRQF_SHARED,
-                       "atmel-tdes", tdes_dd);
+       err = devm_request_irq(&pdev->dev, tdes_dd->irq, atmel_tdes_irq,
+                              IRQF_SHARED, "atmel-tdes", tdes_dd);
        if (err) {
                dev_err(dev, "unable to request tdes irq.\n");
-               goto tdes_irq_err;
+               goto res_err;
        }
 
        /* Initializing the clock */
-       tdes_dd->iclk = clk_get(&pdev->dev, "tdes_clk");
+       tdes_dd->iclk = devm_clk_get(&pdev->dev, "tdes_clk");
        if (IS_ERR(tdes_dd->iclk)) {
                dev_err(dev, "clock initialization failed.\n");
                err = PTR_ERR(tdes_dd->iclk);
-               goto clk_err;
+               goto res_err;
        }
 
-       tdes_dd->io_base = ioremap(tdes_dd->phys_base, tdes_phys_size);
+       tdes_dd->io_base = devm_ioremap_resource(&pdev->dev, tdes_res);
        if (!tdes_dd->io_base) {
                dev_err(dev, "can't ioremap\n");
                err = -ENOMEM;
-               goto tdes_io_err;
+               goto res_err;
        }
 
        atmel_tdes_hw_version_init(tdes_dd);
@@ -1478,12 +1476,6 @@ err_tdes_dma:
 err_pdata:
        atmel_tdes_buff_cleanup(tdes_dd);
 err_tdes_buff:
-       iounmap(tdes_dd->io_base);
-tdes_io_err:
-       clk_put(tdes_dd->iclk);
-clk_err:
-       free_irq(tdes_dd->irq, tdes_dd);
-tdes_irq_err:
 res_err:
        tasklet_kill(&tdes_dd->done_task);
        tasklet_kill(&tdes_dd->queue_task);
@@ -1514,13 +1506,6 @@ static int atmel_tdes_remove(struct platform_device *pdev)
 
        atmel_tdes_buff_cleanup(tdes_dd);
 
-       iounmap(tdes_dd->io_base);
-
-       clk_put(tdes_dd->iclk);
-
-       if (tdes_dd->irq >= 0)
-               free_irq(tdes_dd->irq, tdes_dd);
-
        return 0;
 }