Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg Kroah-Hartman:
 "Here is the big driver core merge for 3.9-rc1

  There are two major series here, both of which touch lots of drivers
  all over the kernel, and will cause you some merge conflicts:

   - add a new function called devm_ioremap_resource() to properly be
     able to check return values.

   - remove CONFIG_EXPERIMENTAL

  Other than those patches, there's not much here, some minor fixes and
  updates"

Fix up trivial conflicts

* tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (221 commits)
  base: memory: fix soft/hard_offline_page permissions
  drivercore: Fix ordering between deferred_probe and exiting initcalls
  backlight: fix class_find_device() arguments
  TTY: mark tty_get_device call with the proper const values
  driver-core: constify data for class_find_device()
  firmware: Ignore abort check when no user-helper is used
  firmware: Reduce ifdef CONFIG_FW_LOADER_USER_HELPER
  firmware: Make user-mode helper optional
  firmware: Refactoring for splitting user-mode helper code
  Driver core: treat unregistered bus_types as having no devices
  watchdog: Convert to devm_ioremap_resource()
  thermal: Convert to devm_ioremap_resource()
  spi: Convert to devm_ioremap_resource()
  power: Convert to devm_ioremap_resource()
  mtd: Convert to devm_ioremap_resource()
  mmc: Convert to devm_ioremap_resource()
  mfd: Convert to devm_ioremap_resource()
  media: Convert to devm_ioremap_resource()
  iommu: Convert to devm_ioremap_resource()
  drm: Convert to devm_ioremap_resource()
  ...

3 files changed, 12 insertions, 10 deletions

diff --git a/drivers/char/hw_random/exynos-rng.c b/drivers/char/hw_random/exynos-rng.c
index 48bbfeca4b5d..4673fc4ad931 100644
--- 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 d8c54e253761..749dc16ca2cc 100644
--- 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 de473ef3882b..30991989d65b 100644
--- 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;