Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

[firefly-linux-kernel-4.4.55.git] / drivers / char / hw_random / omap-rng.c

diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index a07a5caa599cde1f0acf41c6dc4bbd32c9d92f36..1412565c01afb213407fea17469ce0037f301610 100644 (file)
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -115,22 +115,12 @@ static int __devinit omap_rng_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-       if (!res) {
-               ret = -ENOENT;
-               goto err_region;
-       }
-
-       if (!request_mem_region(res->start, resource_size(res), pdev->name)) {
-               ret = -EBUSY;
-               goto err_region;
-       }
-
-       dev_set_drvdata(&pdev->dev, res);
-       rng_base = ioremap(res->start, resource_size(res));
+       rng_base = devm_request_and_ioremap(&pdev->dev, res);
        if (!rng_base) {
                ret = -ENOMEM;
                goto err_ioremap;
        }
+       dev_set_drvdata(&pdev->dev, res);
 
        ret = hwrng_register(&omap_rng_ops);
        if (ret)
@@ -145,11 +135,8 @@ static int __devinit omap_rng_probe(struct platform_device *pdev)
        return 0;
 
 err_register:
-       iounmap(rng_base);
        rng_base = NULL;
 err_ioremap:
-       release_mem_region(res->start, resource_size(res));
-err_region:
        if (cpu_is_omap24xx()) {
                clk_disable(rng_ick);
                clk_put(rng_ick);
@@ -159,20 +146,15 @@ err_region:
 
 static int __exit omap_rng_remove(struct platform_device *pdev)
 {
-       struct resource *res = dev_get_drvdata(&pdev->dev);
-
        hwrng_unregister(&omap_rng_ops);
 
        omap_rng_write_reg(RNG_MASK_REG, 0x0);
 
-       iounmap(rng_base);
-
        if (cpu_is_omap24xx()) {
                clk_disable(rng_ick);
                clk_put(rng_ick);
        }
 
-       release_mem_region(res->start, resource_size(res));
        rng_base = NULL;
 
        return 0;