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

17 files changed, 47 insertions, 66 deletions

diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig
index 4ef0d80b57f4..8567a7a64104 100644
--- a/drivers/media/Kconfig
+++ b/drivers/media/Kconfig
@@ -79,8 +79,7 @@ config MEDIA_RC_SUPPORT
 #
 
 config MEDIA_CONTROLLER
-        bool "Media Controller API (EXPERIMENTAL)"
-        depends on EXPERIMENTAL
+        bool "Media Controller API"
         depends on MEDIA_CAMERA_SUPPORT
         ---help---
           Enable the media controller API used to query media devices internal
@@ -100,8 +99,8 @@ config VIDEO_DEV
         default y
 
 config VIDEO_V4L2_SUBDEV_API
-        bool "V4L2 sub-device userspace API (EXPERIMENTAL)"
-        depends on VIDEO_DEV && MEDIA_CONTROLLER && EXPERIMENTAL
+        bool "V4L2 sub-device userspace API"
+        depends on VIDEO_DEV && MEDIA_CONTROLLER
         ---help---
           Enables the V4L2 sub-device pad-level userspace API used to configure
           video format, size and frame rate between hardware blocks.
diff --git a/drivers/media/pci/cx25821/Kconfig b/drivers/media/pci/cx25821/Kconfig
index 5f6b54213713..4017c9420348 100644
--- a/drivers/media/pci/cx25821/Kconfig
+++ b/drivers/media/pci/cx25821/Kconfig
@@ -18,7 +18,7 @@ config VIDEO_CX25821
 
 config VIDEO_CX25821_ALSA
         tristate "Conexant 25821 DMA audio support"
-        depends on VIDEO_CX25821 && SND && EXPERIMENTAL
+        depends on VIDEO_CX25821 && SND
         select SND_PCM
         ---help---
           This is a video4linux driver for direct (DMA) audio on
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3dcfea612c42..33241120a58c 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -98,8 +98,8 @@ config VIDEO_OMAP2
           This is a v4l2 driver for the TI OMAP2 camera capture interface
 
 config VIDEO_OMAP3
-        tristate "OMAP 3 Camera support (EXPERIMENTAL)"
-        depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
+        tristate "OMAP 3 Camera support"
+        depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
         ---help---
           Driver for an OMAP 3 camera controller.
 
@@ -169,8 +169,8 @@ config VIDEO_SAMSUNG_S5P_G2D
           2d graphics accelerator.
 
 config VIDEO_SAMSUNG_S5P_JPEG
-        tristate "Samsung S5P/Exynos4 JPEG codec driver (EXPERIMENTAL)"
-        depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P && EXPERIMENTAL
+        tristate "Samsung S5P/Exynos4 JPEG codec driver"
+        depends on VIDEO_DEV && VIDEO_V4L2 && PLAT_S5P
         select VIDEOBUF2_DMA_CONTIG
         select V4L2_MEM2MEM_DEV
         ---help---
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 2b1b9f30e1f9..c1a07133cc56 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1098,11 +1098,9 @@ static int gsc_probe(struct platform_device *pdev)
         mutex_init(&gsc->lock);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        gsc->regs = devm_request_and_ioremap(dev, res);
-        if (!gsc->regs) {
-                dev_err(dev, "failed to map registers\n");
-                return -ENOENT;
-        }
+        gsc->regs = devm_ioremap_resource(dev, res);
+        if (IS_ERR(gsc->regs))
+                return PTR_ERR(gsc->regs);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!res) {
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 6b155d7be8e0..4b9e0a28616a 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -941,9 +941,9 @@ static int emmaprp_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, pcdev);
 
-        pcdev->base_emma = devm_request_and_ioremap(&pdev->dev, res_emma);
-        if (!pcdev->base_emma) {
-                ret = -ENXIO;
+        pcdev->base_emma = devm_ioremap_resource(&pdev->dev, res_emma);
+        if (IS_ERR(pcdev->base_emma)) {
+                ret = PTR_ERR(pcdev->base_emma);
                 goto rel_vdev;
         }
 
diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c
index e2716c35f8f1..09a8c9cac5c9 100644
--- a/drivers/media/platform/s3c-camif/camif-core.c
+++ b/drivers/media/platform/s3c-camif/camif-core.c
@@ -433,11 +433,9 @@ static int s3c_camif_probe(struct platform_device *pdev)
 
         mres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        camif->io_base = devm_request_and_ioremap(dev, mres);
-        if (!camif->io_base) {
-                dev_err(dev, "failed to obtain I/O memory\n");
-                return -ENOENT;
-        }
+        camif->io_base = devm_ioremap_resource(dev, mres);
+        if (IS_ERR(camif->io_base))
+                return PTR_ERR(camif->io_base);
 
         ret = camif_request_irqs(pdev, camif);
         if (ret < 0)
diff --git a/drivers/media/platform/s5p-fimc/Kconfig b/drivers/media/platform/s5p-fimc/Kconfig
index c16b20d86ed2..f997a5203b7c 100644
--- a/drivers/media/platform/s5p-fimc/Kconfig
+++ b/drivers/media/platform/s5p-fimc/Kconfig
@@ -2,7 +2,6 @@
 config VIDEO_SAMSUNG_S5P_FIMC
         bool "Samsung S5P/EXYNOS SoC camera interface driver (experimental)"
         depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && PLAT_S5P && PM_RUNTIME
-        depends on EXPERIMENTAL
         help
           Say Y here to enable camera host interface devices for
           Samsung S5P and EXYNOS SoC series.
diff --git a/drivers/media/platform/s5p-fimc/fimc-core.c b/drivers/media/platform/s5p-fimc/fimc-core.c
index 545b46ae12a1..acc0f84ffa56 100644
--- a/drivers/media/platform/s5p-fimc/fimc-core.c
+++ b/drivers/media/platform/s5p-fimc/fimc-core.c
@@ -909,11 +909,9 @@ static int fimc_probe(struct platform_device *pdev)
         mutex_init(&fimc->lock);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        fimc->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (fimc->regs == NULL) {
-                dev_err(&pdev->dev, "Failed to obtain io memory\n");
-                return -ENOENT;
-        }
+        fimc->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(fimc->regs))
+                return PTR_ERR(fimc->regs);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL) {
diff --git a/drivers/media/platform/s5p-fimc/fimc-lite.c b/drivers/media/platform/s5p-fimc/fimc-lite.c
index ed67220d0a64..67db9f8102e4 100644
--- a/drivers/media/platform/s5p-fimc/fimc-lite.c
+++ b/drivers/media/platform/s5p-fimc/fimc-lite.c
@@ -1426,11 +1426,9 @@ static int fimc_lite_probe(struct platform_device *pdev)
         mutex_init(&fimc->lock);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        fimc->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (fimc->regs == NULL) {
-                dev_err(&pdev->dev, "Failed to obtain io memory\n");
-                return -ENOENT;
-        }
+        fimc->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(fimc->regs))
+                return PTR_ERR(fimc->regs);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL) {
diff --git a/drivers/media/platform/s5p-fimc/mipi-csis.c b/drivers/media/platform/s5p-fimc/mipi-csis.c
index ec3fa7d75306..7abae012f55e 100644
--- a/drivers/media/platform/s5p-fimc/mipi-csis.c
+++ b/drivers/media/platform/s5p-fimc/mipi-csis.c
@@ -686,11 +686,9 @@ static int s5pcsis_probe(struct platform_device *pdev)
         }
 
         mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        state->regs = devm_request_and_ioremap(&pdev->dev, mem_res);
-        if (state->regs == NULL) {
-                dev_err(&pdev->dev, "Failed to request and remap io memory\n");
-                return -ENXIO;
-        }
+        state->regs = devm_ioremap_resource(&pdev->dev, mem_res);
+        if (IS_ERR(state->regs))
+                return PTR_ERR(state->regs);
 
         state->irq = platform_get_irq(pdev, 0);
         if (state->irq < 0) {
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index 1bfbc325836b..6ed259fb1046 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -708,11 +708,9 @@ static int g2d_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        dev->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (dev->regs == NULL) {
-                        dev_err(&pdev->dev, "Failed to obtain io memory\n");
-                        return -ENOENT;
-        }
+        dev->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(dev->regs))
+                return PTR_ERR(dev->regs);
 
         dev->clk = clk_get(&pdev->dev, "sclk_fimg2d");
         if (IS_ERR_OR_NULL(dev->clk)) {
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 17983c4c9a9a..3b023752bcb4 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1325,11 +1325,9 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
         /* memory-mapped registers */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        jpeg->regs = devm_request_and_ioremap(&pdev->dev, res);
-        if (jpeg->regs == NULL) {
-                dev_err(&pdev->dev, "Failed to obtain io memory\n");
-                return -ENOENT;
-        }
+        jpeg->regs = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(jpeg->regs))
+                return PTR_ERR(jpeg->regs);
 
         /* interrupt service routine registration */
         jpeg->irq = ret = platform_get_irq(pdev, 0);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 681bc6ba149d..8b7fbc7cc04d 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1047,11 +1047,9 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        dev->regs_base = devm_request_and_ioremap(&pdev->dev, res);
-        if (dev->regs_base == NULL) {
-                dev_err(&pdev->dev, "Failed to obtain io memory\n");
-                return -ENOENT;
-        }
+        dev->regs_base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(dev->regs_base))
+                return PTR_ERR(dev->regs_base);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (res == NULL) {
diff --git a/drivers/media/platform/s5p-tv/Kconfig b/drivers/media/platform/s5p-tv/Kconfig
index ea11a513033f..7b659bd09bfd 100644
--- a/drivers/media/platform/s5p-tv/Kconfig
+++ b/drivers/media/platform/s5p-tv/Kconfig
@@ -7,9 +7,8 @@
 # Licensed under GPL
 
 config VIDEO_SAMSUNG_S5P_TV
-        bool "Samsung TV driver for S5P platform (experimental)"
+        bool "Samsung TV driver for S5P platform"
         depends on PLAT_S5P && PM_RUNTIME
-        depends on EXPERIMENTAL
         default n
         ---help---
           Say Y here to enable selecting the TV output devices for
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 8bda2c908aba..1abdc7d9c744 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -1707,9 +1707,9 @@ static int mx27_camera_emma_init(struct platform_device *pdev)
                 goto out;
         }
 
-        pcdev->base_emma = devm_request_and_ioremap(pcdev->dev, res_emma);
-        if (!pcdev->base_emma) {
-                err = -EADDRNOTAVAIL;
+        pcdev->base_emma = devm_ioremap_resource(pcdev->dev, res_emma);
+        if (IS_ERR(pcdev->base_emma)) {
+                err = PTR_ERR(pcdev->base_emma);
                 goto out;
         }
 
@@ -1824,9 +1824,9 @@ static int mx2_camera_probe(struct platform_device *pdev)
         INIT_LIST_HEAD(&pcdev->discard);
         spin_lock_init(&pcdev->lock);
 
-        pcdev->base_csi = devm_request_and_ioremap(&pdev->dev, res_csi);
-        if (!pcdev->base_csi) {
-                err = -EADDRNOTAVAIL;
+        pcdev->base_csi = devm_ioremap_resource(&pdev->dev, res_csi);
+        if (IS_ERR(pcdev->base_csi)) {
+                err = PTR_ERR(pcdev->base_csi);
                 goto exit;
         }
 
diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
index 834bfecbed73..7a622dbe9b6d 100644
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -134,7 +134,7 @@ config DVB_USB_MXL111SF
 
 config DVB_USB_RTL28XXU
         tristate "Realtek RTL28xxU DVB USB support"
-        depends on DVB_USB_V2 && EXPERIMENTAL
+        depends on DVB_USB_V2
         select DVB_RTL2830
         select DVB_RTL2832
         select MEDIA_TUNER_QT1010 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/usb/pvrusb2/Kconfig b/drivers/media/usb/pvrusb2/Kconfig
index 32b11c15bb1a..60a2604e4cb3 100644
--- a/drivers/media/usb/pvrusb2/Kconfig
+++ b/drivers/media/usb/pvrusb2/Kconfig
@@ -17,9 +17,9 @@ config VIDEO_PVRUSB2
           module will be called pvrusb2
 
 config VIDEO_PVRUSB2_SYSFS
-        bool "pvrusb2 sysfs support (EXPERIMENTAL)"
+        bool "pvrusb2 sysfs support"
         default y
-        depends on VIDEO_PVRUSB2 && SYSFS && EXPERIMENTAL
+        depends on VIDEO_PVRUSB2 && SYSFS
         ---help---
           This option enables the operation of a sysfs based
           interface for query and control of the pvrusb2 driver.
@@ -33,9 +33,9 @@ config VIDEO_PVRUSB2_SYSFS
           Note: This feature is experimental and subject to change.
 
 config VIDEO_PVRUSB2_DVB
-        bool "pvrusb2 ATSC/DVB support (EXPERIMENTAL)"
+        bool "pvrusb2 ATSC/DVB support"
         default y
-        depends on VIDEO_PVRUSB2 && DVB_CORE && EXPERIMENTAL
+        depends on VIDEO_PVRUSB2 && DVB_CORE
         select DVB_LGDT330X if MEDIA_SUBDRV_AUTOSELECT
         select DVB_S5H1409 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_S5H1411 if MEDIA_SUBDRV_AUTOSELECT