char: Convert to devm_ioremap_resource()

Convert all uses of devm_request_and_ioremap() to the newly introduced
devm_ioremap_resource() which provides more consistent error handling.

Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/hw_random/exynos-rng.c b/drivers/char/hw_random/exynos-rng.c
index 48bbfec..4673fc4 100644 (file)
--- a/drivers/char/hw_random/exynos-rng.c
+++ b/drivers/char/hw_random/exynos-rng.c
@@ -104,6 +104,7 @@ static int exynos_read(struct hwrng *rng, void *buf,
 static int exynos_rng_probe(struct platform_device *pdev)
 {
        struct exynos_rng *exynos_rng;
+       struct resource *res;
 
        exynos_rng = devm_kzalloc(&pdev->dev, sizeof(struct exynos_rng),
                                        GFP_KERNEL);
@@ -120,10 +121,10 @@ static int exynos_rng_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       exynos_rng->mem = devm_request_and_ioremap(&pdev->dev,
-                       platform_get_resource(pdev, IORESOURCE_MEM, 0));
-       if (!exynos_rng->mem)
-               return -EBUSY;
+       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+       exynos_rng->mem = devm_ioremap_resource(&pdev->dev, res);
+       if (IS_ERR(exynos_rng->mem))
+               return PTR_ERR(exynos_rng->mem);
 
        platform_set_drvdata(pdev, exynos_rng);
 

diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index d8c54e2..749dc16 100644 (file)
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -124,9 +124,9 @@ static int omap_rng_probe(struct platform_device *pdev)
                goto err_ioremap;
        }
 
-       priv->base = devm_request_and_ioremap(&pdev->dev, priv->mem_res);
-       if (!priv->base) {
-               ret = -ENOMEM;
+       priv->base = devm_ioremap_resource(&pdev->dev, priv->mem_res);
+       if (IS_ERR(priv->base)) {
+               ret = PTR_ERR(priv->base);
                goto err_ioremap;
        }
        dev_set_drvdata(&pdev->dev, priv);

diff --git a/drivers/char/hw_random/tx4939-rng.c b/drivers/char/hw_random/tx4939-rng.c
index de473ef..3099198 100644 (file)
--- a/drivers/char/hw_random/tx4939-rng.c
+++ b/drivers/char/hw_random/tx4939-rng.c
@@ -7,6 +7,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  */
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -115,9 +116,9 @@ static int __init tx4939_rng_probe(struct platform_device *dev)
        rngdev = devm_kzalloc(&dev->dev, sizeof(*rngdev), GFP_KERNEL);
        if (!rngdev)
                return -ENOMEM;
-       rngdev->base = devm_request_and_ioremap(&dev->dev, r);
-       if (!rngdev->base)
-               return -EBUSY;
+       rngdev->base = devm_ioremap_resource(&dev->dev, r);
+       if (IS_ERR(rngdev->base))
+               return PTR_ERR(rngdev->base);
 
        rngdev->rng.name = dev_name(&dev->dev);
        rngdev->rng.data_present = tx4939_rng_data_present;