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()
  ...

7 files changed, 23 insertions, 34 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2f66b2e42490..f410cb16dd22 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1530,7 +1530,6 @@ config SMP
 
 config SMP_ON_UP
         bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
         depends on SMP && !XIP_KERNEL
         default y
         help
@@ -1731,7 +1730,7 @@ config AEABI
 
 config OABI_COMPAT
         bool "Allow old ABI binaries to run with this kernel (EXPERIMENTAL)"
-        depends on AEABI && EXPERIMENTAL && !THUMB2_KERNEL
+        depends on AEABI && !THUMB2_KERNEL
         default y
         help
           This option preserves the old syscall interface along with the
@@ -1855,7 +1854,6 @@ config SECCOMP
 
 config CC_STACKPROTECTOR
         bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
         help
           This option turns on the -fstack-protector GCC feature. This
           feature puts, at the beginning of functions, a canary value on
@@ -1872,7 +1870,7 @@ config XEN_DOM0
 
 config XEN
         bool "Xen guest support on ARM (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && ARM && OF
+        depends on ARM && OF
         depends on CPU_V7 && !CPU_V6
         help
           Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.
@@ -1941,7 +1939,7 @@ config ZBOOT_ROM
 
 choice
         prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)"
-        depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
+        depends on ZBOOT_ROM && ARCH_SH7372
         default ZBOOT_ROM_NONE
         help
           Include experimental SD/MMC loading code in the ROM-able zImage.
@@ -1970,7 +1968,7 @@ endchoice
 
 config ARM_APPENDED_DTB
         bool "Use appended device tree blob to zImage (EXPERIMENTAL)"
-        depends on OF && !ZBOOT_ROM && EXPERIMENTAL
+        depends on OF && !ZBOOT_ROM
         help
           With this option, the boot code will look for a device tree binary
           (DTB) appended to zImage
@@ -2088,7 +2086,7 @@ config XIP_PHYS_ADDR
 
 config KEXEC
         bool "Kexec system call (EXPERIMENTAL)"
-        depends on EXPERIMENTAL && (!SMP || HOTPLUG_CPU)
+        depends on (!SMP || HOTPLUG_CPU)
         help
           kexec is a system call that implements the ability to shutdown your
           current kernel, and to start another kernel.  It is like a reboot
@@ -2110,7 +2108,6 @@ config ATAGS_PROC
 
 config CRASH_DUMP
         bool "Build kdump crash kernel (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
         help
           Generate crash dump after being started by kexec. This should
           be normally only set in special crash dump kernels which are
@@ -2177,7 +2174,7 @@ config CPU_FREQ_S3C
 
 config CPU_FREQ_S3C24XX
         bool "CPUfreq driver for Samsung S3C24XX series CPUs (EXPERIMENTAL)"
-        depends on ARCH_S3C24XX && CPU_FREQ && EXPERIMENTAL
+        depends on ARCH_S3C24XX && CPU_FREQ
         select CPU_FREQ_S3C
         help
           This enables the CPUfreq driver for the Samsung S3C24XX family
@@ -2189,7 +2186,7 @@ config CPU_FREQ_S3C24XX
 
 config CPU_FREQ_S3C24XX_PLL
         bool "Support CPUfreq changing of PLL frequency (EXPERIMENTAL)"
-        depends on CPU_FREQ_S3C24XX && EXPERIMENTAL
+        depends on CPU_FREQ_S3C24XX
         help
           Compile in support for changing the PLL frequency from the
           S3C24XX series CPUfreq driver. The PLL takes time to settle
@@ -2252,7 +2249,7 @@ config FPE_NWFPE_XP
 
 config FPE_FASTFPE
         bool "FastFPE math emulation (EXPERIMENTAL)"
-        depends on (!AEABI || OABI_COMPAT) && !CPU_32v3 && EXPERIMENTAL
+        depends on (!AEABI || OABI_COMPAT) && !CPU_32v3
         ---help---
           Say Y here to include the FAST floating point emulator in the kernel.
           This is an experimental much faster emulator which now also has full
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 661030d6bc6c..fc2a591e1676 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -32,7 +32,7 @@ config FRAME_POINTER
 
 config ARM_UNWIND
         bool "Enable stack unwinding support (EXPERIMENTAL)"
-        depends on AEABI && EXPERIMENTAL
+        depends on AEABI
         default y
         help
           This option enables stack unwinding support in the kernel
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 8033cb747c86..64bac53da0e8 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -1134,11 +1134,9 @@ static int gpmc_probe(struct platform_device *pdev)
         phys_base = res->start;
         mem_size = resource_size(res);
 
-        gpmc_base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!gpmc_base) {
-                dev_err(&pdev->dev, "error: request memory / ioremap\n");
-                return -EADDRNOTAVAIL;
-        }
+        gpmc_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(gpmc_base))
+                return PTR_ERR(gpmc_base);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL)
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 25df14a9e268..3445c4f42347 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -291,8 +291,8 @@ config MACH_JIVE
           Say Y here if you are using the Logitech Jive.
 
 config MACH_JIVE_SHOW_BOOTLOADER
-        bool "Allow access to bootloader partitions in MTD (EXPERIMENTAL)"
-        depends on MACH_JIVE && EXPERIMENTAL
+        bool "Allow access to bootloader partitions in MTD"
+        depends on MACH_JIVE
 
 config MACH_S3C2413
         bool
diff --git a/arch/arm/mach-tegra/tegra2_emc.c b/arch/arm/mach-tegra/tegra2_emc.c
index e18aa2f83ebf..ce7ce42a1ac9 100644
--- a/arch/arm/mach-tegra/tegra2_emc.c
+++ b/arch/arm/mach-tegra/tegra2_emc.c
@@ -312,11 +312,9 @@ static int tegra_emc_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        emc_regbase = devm_request_and_ioremap(&pdev->dev, res);
-        if (!emc_regbase) {
-                dev_err(&pdev->dev, "failed to remap registers\n");
-                return -ENOMEM;
-        }
+        emc_regbase = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(emc_regbase))
+                return PTR_ERR(emc_regbase);
 
         pdata = pdev->dev.platform_data;
 
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
index 7b433f3bddca..a0daa2fb5de6 100644
--- a/arch/arm/plat-omap/dmtimer.c
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -808,11 +808,9 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
                 return  -ENOMEM;
         }
 
-        timer->io_base = devm_request_and_ioremap(dev, mem);
-        if (!timer->io_base) {
-                dev_err(dev, "%s: region already claimed.\n", __func__);
-                return -ENOMEM;
-        }
+        timer->io_base = devm_ioremap_resource(dev, mem);
+        if (IS_ERR(timer->io_base))
+                return PTR_ERR(timer->io_base);
 
         if (dev->of_node) {
                 if (of_find_property(dev->of_node, "ti,timer-alwon", NULL))
diff --git a/arch/arm/plat-samsung/adc.c b/arch/arm/plat-samsung/adc.c
index 2d676ab50f73..ca07cb1b155a 100644
--- a/arch/arm/plat-samsung/adc.c
+++ b/arch/arm/plat-samsung/adc.c
@@ -386,11 +386,9 @@ static int s3c_adc_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
-        adc->regs = devm_request_and_ioremap(dev, regs);
-        if (!adc->regs) {
-                dev_err(dev, "failed to map registers\n");
-                return -ENXIO;
-        }
+        adc->regs = devm_ioremap_resource(dev, regs);
+        if (IS_ERR(adc->regs))
+                return PTR_ERR(adc->regs);
 
         ret = regulator_enable(adc->vdd);
         if (ret)