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

2 files changed, 16 insertions, 15 deletions

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e08d322d01d7..cdadce23e66d 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -163,7 +163,7 @@ config SATA_QSTOR
 
 config SATA_SX4
         tristate "Promise SATA SX4 support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for Promise Serial ATA SX4.
 
@@ -390,7 +390,7 @@ config PATA_CS5530
 
 config PATA_CS5535
         tristate "CS5535 PATA support (Experimental)"
-        depends on PCI && X86 && !X86_64 && EXPERIMENTAL
+        depends on PCI && X86 && !X86_64
         help
           This option enables support for the NatSemi/AMD CS5535
           companion chip used with the Geode processor family.
@@ -408,7 +408,7 @@ config PATA_CS5536
 
 config PATA_CYPRESS
         tristate "Cypress CY82C693 PATA support (Very Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the Cypress/Contaq CY82C693
           chipset found in some Alpha systems
@@ -496,7 +496,7 @@ config PATA_IMX
 
 config PATA_IT8213
         tristate "IT8213 PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the ITE 821 PATA
           controllers via the new ATA layer.
@@ -589,7 +589,7 @@ config PATA_OLDPIIX
 
 config PATA_OPTIDMA
         tristate "OPTI FireStar PATA support (Very Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables DMA/PIO support for the later OPTi
           controllers found on some old motherboards and in some
@@ -616,7 +616,7 @@ config PATA_PDC_OLD
 
 config PATA_RADISYS
         tristate "RADISYS 82600 PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the RADISYS 82600
           PATA controllers via the new ATA layer
@@ -687,7 +687,7 @@ config PATA_SIS
 
 config PATA_TOSHIBA
         tristate "Toshiba Piccolo support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           Support for the Toshiba Piccolo controllers. Currently only the
           primary channel is supported by this driver.
@@ -738,7 +738,7 @@ comment "PIO-only SFF controllers"
 
 config PATA_AT32
         tristate "Atmel AVR32 PATA support (Experimental)"
-        depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL
+        depends on AVR32 && PLATFORM_AT32AP
         help
           This option enables support for the IDE devices on the
           Atmel AT32AP platform.
@@ -755,7 +755,7 @@ config PATA_AT91
 
 config PATA_CMD640_PCI
         tristate "CMD640 PCI PATA support (Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables support for the CMD640 PCI IDE
           interface chip. Only the primary channel is currently
@@ -801,7 +801,7 @@ config PATA_NS87410
 
 config PATA_OPTI
         tristate "OPTI621/6215 PATA support (Very Experimental)"
-        depends on PCI && EXPERIMENTAL
+        depends on PCI
         help
           This option enables full PIO support for the early Opti ATA
           controllers found on some old motherboards.
@@ -881,7 +881,7 @@ config PATA_SAMSUNG_CF
 
 config PATA_WINBOND_VLB
         tristate "Winbond W83759A VLB PATA support (Experimental)"
-        depends on ISA && EXPERIMENTAL
+        depends on ISA
         select PATA_LEGACY
         help
           Support for the Winbond W83759A controller on Vesa Local Bus
@@ -909,7 +909,7 @@ config ATA_GENERIC
 
 config PATA_LEGACY
         tristate "Legacy ISA PATA support (Experimental)"
-        depends on (ISA || PCI) && EXPERIMENTAL
+        depends on (ISA || PCI)
         help
           This option enables support for ISA/VLB/PCI bus legacy PATA
           ports and allows them to be accessed via the new ATA layer.
diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c
index 556222f04731..c1bfaf43d109 100644
--- a/drivers/ata/pata_ep93xx.c
+++ b/drivers/ata/pata_ep93xx.c
@@ -31,6 +31,7 @@
  *   Copyright (C) 2006 Tower Technologies
  */
 
+#include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/init.h>
@@ -937,9 +938,9 @@ static int ep93xx_pata_probe(struct platform_device *pdev)
                 goto err_rel_gpio;
         }
 
-        ide_base = devm_request_and_ioremap(&pdev->dev, mem_res);
-        if (!ide_base) {
-                err = -ENXIO;
+        ide_base = devm_ioremap_resource(&pdev->dev, mem_res);
+        if (IS_ERR(ide_base)) {
+                err = PTR_ERR(ide_base);
                 goto err_rel_gpio;
         }