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

9 files changed, 31 insertions, 40 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index e79884e997ae..f80eee74a311 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -88,7 +88,7 @@ config SPI_BFIN_SPORT
 
 config SPI_AU1550
         tristate "Au1550/Au1200/Au1300 SPI Controller"
-        depends on MIPS_ALCHEMY && EXPERIMENTAL
+        depends on MIPS_ALCHEMY
         select SPI_BITBANG
         help
           If you say yes to this option, support will be included for the
@@ -188,7 +188,7 @@ config SPI_IMX
 
 config SPI_LM70_LLP
         tristate "Parallel port adapter for LM70 eval board (DEVELOPMENT)"
-        depends on PARPORT && EXPERIMENTAL
+        depends on PARPORT
         select SPI_BITBANG
         help
           This driver supports the NS LM70 LLP Evaluation Board,
@@ -204,7 +204,7 @@ config SPI_MPC52xx
 
 config SPI_MPC52xx_PSC
         tristate "Freescale MPC52xx PSC SPI controller"
-        depends on PPC_MPC52xx && EXPERIMENTAL
+        depends on PPC_MPC52xx
         help
           This enables using the Freescale MPC52xx Programmable Serial
           Controller in master SPI mode.
@@ -273,8 +273,8 @@ config SPI_OMAP_100K
           OMAP SPI 100K master controller for omap7xx boards.
 
 config SPI_ORION
-        tristate "Orion SPI master (EXPERIMENTAL)"
-        depends on PLAT_ORION && EXPERIMENTAL
+        tristate "Orion SPI master"
+        depends on PLAT_ORION
         help
           This enables using the SPI master controller on the Orion chips.
 
@@ -328,7 +328,7 @@ config SPI_RSPI
 
 config SPI_S3C24XX
         tristate "Samsung S3C24XX series SPI"
-        depends on ARCH_S3C24XX && EXPERIMENTAL
+        depends on ARCH_S3C24XX
         select SPI_BITBANG
         help
           SPI driver for Samsung S3C24XX series ARM SoCs
@@ -443,7 +443,7 @@ config SPI_XCOMM
 
 config SPI_XILINX
         tristate "Xilinx SPI controller common module"
-        depends on HAS_IOMEM && EXPERIMENTAL
+        depends on HAS_IOMEM
         select SPI_BITBANG
         help
           This exposes the SPI controller IP from the Xilinx EDK.
@@ -455,7 +455,7 @@ config SPI_XILINX
 
 config SPI_NUC900
         tristate "Nuvoton NUC900 series SPI"
-        depends on ARCH_W90X900 && EXPERIMENTAL
+        depends on ARCH_W90X900
         select SPI_BITBANG
         help
           SPI driver for Nuvoton NUC900 series ARM SoCs
@@ -489,7 +489,6 @@ comment "SPI Protocol Masters"
 
 config SPI_SPIDEV
         tristate "User mode SPI device driver support"
-        depends on EXPERIMENTAL
         help
           This supports user mode SPI protocol drivers.
 
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index aecbff16ad60..d7bac60253c9 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -1085,10 +1085,9 @@ static int ep93xx_spi_probe(struct platform_device *pdev)
 
         espi->sspdr_phys = res->start + SSPDR;
 
-        espi->regs_base = devm_request_and_ioremap(&pdev->dev, res);
-        if (!espi->regs_base) {
-                dev_err(&pdev->dev, "failed to map resources\n");
-                error = -ENODEV;
+        espi->regs_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(espi->regs_base)) {
+                error = PTR_ERR(espi->regs_base);
                 goto fail_put_clock;
         }
 
diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c
index e3d8b3197d22..22a0af0147fb 100644
--- a/drivers/spi/spi-mxs.c
+++ b/drivers/spi/spi-mxs.c
@@ -541,9 +541,9 @@ static int mxs_spi_probe(struct platform_device *pdev)
         if (!iores || irq_err < 0 || irq_dma < 0)
                 return -EINVAL;
 
-        base = devm_request_and_ioremap(&pdev->dev, iores);
-        if (!base)
-                return -EADDRNOTAVAIL;
+        base = devm_ioremap_resource(&pdev->dev, iores);
+        if (IS_ERR(base))
+                return PTR_ERR(base);
 
         pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
         if (IS_ERR(pinctrl))
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 69945b014c96..893c3d78e426 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -1222,10 +1222,9 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
         r->end += regs_offset;
         mcspi->phys = r->start;
 
-        mcspi->base = devm_request_and_ioremap(&pdev->dev, r);
-        if (!mcspi->base) {
-                dev_dbg(&pdev->dev, "can't ioremap MCSPI\n");
-                status = -ENOMEM;
+        mcspi->base = devm_ioremap_resource(&pdev->dev, r);
+        if (IS_ERR(mcspi->base)) {
+                status = PTR_ERR(mcspi->base);
                 goto free_master;
         }
 
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 7cfbe9d3381f..e862ab8853aa 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1241,10 +1241,9 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
         /* the spi->mode bits understood by this driver: */
         master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
 
-        sdd->regs = devm_request_and_ioremap(&pdev->dev, mem_res);
-        if (sdd->regs == NULL) {
-                dev_err(&pdev->dev, "Unable to remap IO\n");
-                ret = -ENXIO;
+        sdd->regs = devm_ioremap_resource(&pdev->dev, mem_res);
+        if (IS_ERR(sdd->regs)) {
+                ret = PTR_ERR(sdd->regs);
                 goto err0;
         }
 
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index 6a5626d146b7..f59d4177b419 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -534,10 +534,9 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
                 }
         }
 
-        sspi->base = devm_request_and_ioremap(&pdev->dev, mem_res);
-        if (!sspi->base) {
-                dev_err(&pdev->dev, "IO remap failed!\n");
-                ret = -ENOMEM;
+        sspi->base = devm_ioremap_resource(&pdev->dev, mem_res);
+        if (IS_ERR(sspi->base)) {
+                ret = PTR_ERR(sspi->base);
                 goto free_master;
         }
 
diff --git a/drivers/spi/spi-tegra20-sflash.c b/drivers/spi/spi-tegra20-sflash.c
index 9a42c158e245..8a61b27a9f2d 100644
--- a/drivers/spi/spi-tegra20-sflash.c
+++ b/drivers/spi/spi-tegra20-sflash.c
@@ -516,11 +516,9 @@ static int tegra_sflash_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto exit_free_master;
         }
-        tsd->base = devm_request_and_ioremap(&pdev->dev, r);
-        if (!tsd->base) {
-                dev_err(&pdev->dev,
-                        "Cannot request memregion/iomap dma address\n");
-                ret = -EADDRNOTAVAIL;
+        tsd->base = devm_ioremap_resource(&pdev->dev, r);
+        if (IS_ERR(tsd->base)) {
+                ret = PTR_ERR(tsd->base);
                 goto exit_free_master;
         }
 
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 8d51db8dea6d..8458c4bf7172 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -1169,11 +1169,9 @@ static int tegra_slink_probe(struct platform_device *pdev)
                 goto exit_free_master;
         }
         tspi->phys = r->start;
-        tspi->base = devm_request_and_ioremap(&pdev->dev, r);
-        if (!tspi->base) {
-                dev_err(&pdev->dev,
-                        "Cannot request memregion/iomap dma address\n");
-                ret = -EADDRNOTAVAIL;
+        tspi->base = devm_ioremap_resource(&pdev->dev, r);
+        if (IS_ERR(tspi->base)) {
+                ret = PTR_ERR(tspi->base);
                 goto exit_free_master;
         }
 
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 6f193b02a9e8..f996c600eb8c 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1251,10 +1251,10 @@ int spi_master_resume(struct spi_master *master)
 }
 EXPORT_SYMBOL_GPL(spi_master_resume);
 
-static int __spi_master_match(struct device *dev, void *data)
+static int __spi_master_match(struct device *dev, const void *data)
 {
         struct spi_master *m;
-        u16 *bus_num = data;
+        const u16 *bus_num = data;
 
         m = container_of(dev, struct spi_master, dev);
         return m->bus_num == *bus_num;