Merge tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6

Pull fbdev updates from Florian Tobias Schandinat:
 "This includes:
   - large updates for OMAP
     - basic OMAP5 DSS support for DPI and DSI outputs
     - large cleanups and restructuring
   - some update to Exynos and da8xx-fb
   - removal of the pnx4008 driver (arch removed)
   - various other small patches"

Fix up some trivial conflicts (mostly just include line changes, but
also some due to the renaming of the deferred work functions by Tejun).

* tag 'fbdev-updates-for-3.7' of git://github.com/schandinat/linux-2.6: (193 commits)
  gbefb: fix compile error
  video: mark nuc900fb_map_video_memory as __devinit
  video/mx3fb: set .owner to prevent module unloading while being used
  video: exynos_dp: use clk_prepare_enable and clk_disable_unprepare
  drivers/video/exynos/exynos_mipi_dsi.c: fix error return code
  drivers/video/savage/savagefb_driver.c: fix error return code
  video: s3c-fb: use clk_prepare_enable and clk_disable_unprepare
  da8xx-fb: save and restore LCDC context across suspend/resume cycle
  da8xx-fb: add pm_runtime support
  video/udlfb: fix line counting in fb_write
  OMAPDSS: add missing include for string.h
  OMAPDSS: DISPC: Configure color conversion coefficients for writeback
  OMAPDSS: DISPC: Add manager like functions for writeback
  OMAPDSS: DISPC: Configure writeback FIFOs
  OMAPDSS: DISPC: Configure writeback specific parameters in dispc_wb_setup()
  OMAPDSS: DISPC: Configure overlay-like parameters in dispc_wb_setup
  OMAPDSS: DISPC: Add function to set channel in for writeback
  OMAPDSS: DISPC: Don't set chroma resampling bit for writeback
  OMAPDSS: DISPC: Downscale chroma if plane is writeback
  OMAPDSS: DISPC: Configure input and output sizes for writeback
  ...

1 files changed, 6 insertions, 11 deletions

diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c
index f2c092da84b0..755ef3e65caf 100644
--- a/drivers/video/ep93xx-fb.c
+++ b/drivers/video/ep93xx-fb.c
@@ -529,7 +529,8 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
          * any of the framebuffer registers.
          */
         fbi->res = res;
-        fbi->mmio_base = ioremap(res->start, resource_size(res));
+        fbi->mmio_base = devm_ioremap(&pdev->dev, res->start,
+                                      resource_size(res));
         if (!fbi->mmio_base) {
                 err = -ENXIO;
                 goto failed_resource;
@@ -553,20 +554,20 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
         if (err == 0) {
                 dev_err(info->dev, "No suitable video mode found\n");
                 err = -EINVAL;
-                goto failed_mode;
+                goto failed_resource;
         }
 
         if (mach_info->setup) {
                 err = mach_info->setup(pdev);
                 if (err)
-                        goto failed_mode;
+                        goto failed_resource;
         }
 
         err = ep93xxfb_check_var(&info->var, info);
         if (err)
                 goto failed_check;
 
-        fbi->clk = clk_get(info->dev, NULL);
+        fbi->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(fbi->clk)) {
                 err = PTR_ERR(fbi->clk);
                 fbi->clk = NULL;
@@ -578,19 +579,15 @@ static int __devinit ep93xxfb_probe(struct platform_device *pdev)
 
         err = register_framebuffer(info);
         if (err)
-                goto failed;
+                goto failed_check;
 
         dev_info(info->dev, "registered. Mode = %dx%d-%d\n",
                  info->var.xres, info->var.yres, info->var.bits_per_pixel);
         return 0;
 
-failed:
-        clk_put(fbi->clk);
 failed_check:
         if (fbi->mach_info->teardown)
                 fbi->mach_info->teardown(pdev);
-failed_mode:
-        iounmap(fbi->mmio_base);
 failed_resource:
         ep93xxfb_dealloc_videomem(info);
 failed_videomem:
@@ -609,8 +606,6 @@ static int __devexit ep93xxfb_remove(struct platform_device *pdev)
 
         unregister_framebuffer(info);
         clk_disable(fbi->clk);
-        clk_put(fbi->clk);
-        iounmap(fbi->mmio_base);
         ep93xxfb_dealloc_videomem(info);
         fb_dealloc_cmap(&info->cmap);