Merge tag 'fbdev-v5.3' of git://github.com/bzolnier/linux

Pull fbdev updates from Bartlomiej Zolnierkiewicz: - remove fbdev notifier usage for fbcon (as prep work to clean up the fbcon locking), add locking checks in vt/console code and make assorted cleanups in fbdev and backlight code (Daniel Vetter) - add COMPILE_TEST support to atmel_lcdfb, da8xx-fb, gbefb, imxfb, pvr2fb and pxa168fb drivers (me) - fix DMA API abuse in au1200fb and jz4740_fb drivers (Christoph Hellwig) - add check for new BGRT status field rotation bits in efifb driver (Hans de Goede) - mark expected switch fall-throughs in s3c-fb driver (Gustavo A. R. Silva) - remove fbdev mxsfb driver in favour of the drm version (Fabio Estevam) - remove broken rfbi code from omap2fb driver (me) - misc fixes (Arnd Bergmann, Shobhit Kukreti, Wei Yongjun, me) - misc cleanups (Gustavo A. R. Silva, Colin Ian King, me) * tag 'fbdev-v5.3' of git://github.com/bzolnier/linux: (62 commits) video: fbdev: imxfb: fix a typo in imxfb_probe() video: fbdev: s3c-fb: Mark expected switch fall-throughs video: fbdev: s3c-fb: fix sparse warnings about using incorrect types video: fbdev: don't print error message on framebuffer_alloc() failure video: fbdev: intelfb: return -ENOMEM on framebuffer_alloc() failure video: fbdev: s3c-fb: return -ENOMEM on framebuffer_alloc() failure vga_switcheroo: Depend upon fbcon being built-in, if enabled video: fbdev: omap2: remove rfbi video: fbdev: atmel_lcdfb: remove redundant initialization to variable ret video: fbdev-MMP: Use struct_size() in devm_kzalloc() video: fbdev: controlfb: fix warnings about comparing pointer to 0 efifb: BGRT: Add check for new BGRT status field rotation bits jz4740_fb: fix DMA API abuse video: fbdev: pvr2fb: fix link error for pvr2fb_pci_exit video: fbdev: s3c-fb: add COMPILE_TEST support video: fbdev: imxfb: fix sparse warnings about using incorrect types video: fbdev: pvr2fb: fix build warning when compiling as module fbcon: Export fbcon_update_vcs backlight: simplify lcd notifier staging/olpc_dcon: Add drm conversion to TODO ...
author: Linus Torvalds <torvalds@linux-foundation.org> 2019-07-09 12:55:45 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2019-07-09 12:55:45 -0400
commit: 2d41ef5432b76ae90dc0db93026f1d981f874ec4 (patch)
tree: dc97253d9328e8652614bfe8026748dd53c6561a
parent: ed63b9c873601ca113da5c7b1745e3946493e9f3 (diff)
parent: 732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f (diff)
82 files changed, 582 insertions, 3259 deletions
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
index 50e18ed37fa6..cac0bb09db14 100644
--- a/arch/arm/mach-pxa/am200epd.c
+++ b/arch/arm/mach-pxa/am200epd.c
@@ -347,8 +347,17 @@ int __init am200_init(void)
 {
        int ret;
-        /* before anything else, we request notification for any fb
+        /*
-         * creation events */
+         * Before anything else, we request notification for any fb
+         * creation events.
+         *
+         * FIXME: This is terrible and needs to be nuked. The notifier is used
+         * to get at the fb base address from the boot splash fb driver, which
+         * is then passed to metronomefb. Instaed of metronomfb or this board
+         * support file here figuring this out on their own.
+         *
+         * See also the #ifdef in fbmem.c.
+         */
        fb_register_client(&am200_fb_notif);
        pxa2xx_mfp_config(ARRAY_AND_SIZE(am200_pin_config));
diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 84ab482d0db6..c8c770b05ed9 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -23,6 +23,7 @@ config VGA_SWITCHEROO
        depends on X86
        depends on ACPI
        depends on PCI
+        depends on (FRAMEBUFFER_CONSOLE=n || FB=y)
        select VGA_ARB
        help
          Many laptops released in 2008/9/10 have two GPUs with a multiplexer
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index a132c37d7334..65d7541c413a 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -35,6 +35,7 @@
 #include <linux/debugfs.h>
 #include <linux/fb.h>
 #include <linux/fs.h>
+#include <linux/fbcon.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/pm_domain.h>
@@ -736,14 +737,8 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
        if (!active->driver_power_control)
                set_audio_state(active->id, VGA_SWITCHEROO_OFF);
-        if (new_client->fb_info) {
+        if (new_client->fb_info)
-                struct fb_event event;
+                fbcon_remap_all(new_client->fb_info);
-                console_lock();
-                event.info = new_client->fb_info;
-                fb_notifier_call_chain(FB_EVENT_REMAP_ALL_CONSOLE, &event);
-                console_unlock();
-        }
        mutex_lock(&vgasr_priv.mux_hw_lock);
        ret = vgasr_priv.handler->switchto(new_client->id);
diff --git a/drivers/hid/hid-picolcd_fb.c b/drivers/hid/hid-picolcd_fb.c
index 6897e14e7cb7..e162a668fb7e 100644
--- a/drivers/hid/hid-picolcd_fb.c
+++ b/drivers/hid/hid-picolcd_fb.c
@@ -512,10 +512,8 @@ int picolcd_init_framebuffer(struct picolcd_data *data)
                        sizeof(struct fb_deferred_io) +
                        sizeof(struct picolcd_fb_data) +
                        PICOLCDFB_SIZE, dev);
-        if (info == NULL) {
+        if (!info)
-                dev_err(dev, "failed to allocate a framebuffer\n");
                goto err_nomem;
-        }
        info->fbdefio = info->par;
        *info->fbdefio = picolcd_fb_defio;
diff --git a/drivers/media/pci/ivtv/ivtvfb.c b/drivers/media/pci/ivtv/ivtvfb.c
index 800b3654cac5..95a56cce9b65 100644
--- a/drivers/media/pci/ivtv/ivtvfb.c
+++ b/drivers/media/pci/ivtv/ivtvfb.c
@@ -1256,11 +1256,7 @@ static int ivtvfb_callback_cleanup(struct device *dev, void *p)
                itv->streams[IVTV_DEC_STREAM_TYPE_MPG].vdev.device_caps &=
                        ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
                itv->v4l2_cap &= ~V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
-                if (unregister_framebuffer(&itv->osd_info->ivtvfb_info)) {
+                unregister_framebuffer(&itv->osd_info->ivtvfb_info);
-                        IVTVFB_WARN("Framebuffer %d is in use, cannot unload\n",
-                                       itv->instance);
-                        return 0;
-                }
                IVTVFB_INFO("Unregister framebuffer %d\n", itv->instance);
                itv->ivtvfb_restore = NULL;
                ivtvfb_blank(FB_BLANK_VSYNC_SUSPEND, &oi->ivtvfb_info);
diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
index 9b07badf4c6c..7cbc1bdd2d8a 100644
--- a/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@ -891,7 +891,9 @@ int fbtft_unregister_framebuffer(struct fb_info *fb_info)
        if (par->fbtftops.unregister_backlight)
                par->fbtftops.unregister_backlight(par);
        fbtft_sysfs_exit(par);
-        return unregister_framebuffer(fb_info);
+        unregister_framebuffer(fb_info);
+        return 0;
 }
 EXPORT_SYMBOL(fbtft_unregister_framebuffer);
diff --git a/drivers/staging/olpc_dcon/TODO b/drivers/staging/olpc_dcon/TODO
index 665a0b061719..fe09efbc7f77 100644
--- a/drivers/staging/olpc_dcon/TODO
+++ b/drivers/staging/olpc_dcon/TODO
@@ -1,4 +1,11 @@
 TODO:
+        - complete rewrite:
+          1. The underlying fbdev drivers need to be converted into drm kernel
+             modesetting drivers.
+          2. The dcon low-power display mode can then be integrated using the
+             drm damage tracking and self-refresh helpers.
+          This bolted-on self-refresh support that digs around in fbdev
+          internals, but isn't properly integrated, is not the correct solution.
        - see if vx855 gpio API can be made similar enough to cs5535 so we can
          share more code
        - convert all uses of the old GPIO API from <linux/gpio.h> to the
diff --git a/drivers/staging/olpc_dcon/olpc_dcon.c b/drivers/staging/olpc_dcon/olpc_dcon.c
index 6b714f740ac3..a254238be181 100644
--- a/drivers/staging/olpc_dcon/olpc_dcon.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon.c
@@ -250,11 +250,7 @@ static bool dcon_blank_fb(struct dcon_priv *dcon, bool blank)
        int err;
        console_lock();
-        if (!lock_fb_info(dcon->fbinfo)) {
+        lock_fb_info(dcon->fbinfo);
-                console_unlock();
-                dev_err(&dcon->client->dev, "unable to lock framebuffer\n");
-                return false;
-        }
        dcon->ignore_fb_events = true;
        err = fb_blank(dcon->fbinfo,
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 5c0ca1c24b6f..ec92f36ab5c4 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3822,6 +3822,8 @@ int con_is_bound(const struct consw *csw)
 {
        int i, bound = 0;
+        WARN_CONSOLE_UNLOCKED();
        for (i = 0; i < MAX_NR_CONSOLES; i++) {
                if (con_driver_map[i] == csw) {
                        bound = 1;
@@ -3834,6 +3836,20 @@ int con_is_bound(const struct consw *csw)
 EXPORT_SYMBOL(con_is_bound);
 /**
+ * con_is_visible - checks whether the current console is visible
+ * @vc: virtual console
+ *
+ * RETURNS: zero if not visible, nonzero if visible
+ */
+bool con_is_visible(const struct vc_data *vc)
+{
+        WARN_CONSOLE_UNLOCKED();
+        return *vc->vc_display_fg == vc;
+}
+EXPORT_SYMBOL(con_is_visible);
+/**
 * con_debug_enter - prepare the console for the kernel debugger
 * @sw: console driver
 *
@@ -4166,6 +4182,8 @@ void do_blank_screen(int entering_gfx)
        struct vc_data *vc = vc_cons[fg_console].d;
        int i;
+        might_sleep();
        WARN_CONSOLE_UNLOCKED();
        if (console_blanked) {
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 1ef8b6fd62ac..5dc07106a59e 100644
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -47,7 +47,7 @@ static int fb_notifier_callback(struct notifier_block *self,
        int fb_blank = 0;
        /* If we aren't interested in this event, skip it immediately ... */
-        if (event != FB_EVENT_BLANK && event != FB_EVENT_CONBLANK)
+        if (event != FB_EVENT_BLANK)
                return 0;
        bd = container_of(self, struct backlight_device, fb_notif);
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c
index 151b18776add..d6b653aa4ee9 100644
--- a/drivers/video/backlight/lcd.c
+++ b/drivers/video/backlight/lcd.c
@@ -30,18 +30,6 @@ static int fb_notifier_callback(struct notifier_block *self,
        struct lcd_device *ld;
        struct fb_event *evdata = data;
-        /* If we aren't interested in this event, skip it immediately ... */
-        switch (event) {
-        case FB_EVENT_BLANK:
-        case FB_EVENT_MODE_CHANGE:
-        case FB_EVENT_MODE_CHANGE_ALL:
-        case FB_EARLY_EVENT_BLANK:
-        case FB_R_EARLY_EVENT_BLANK:
-                break;
-        default:
-                return 0;
-        }
        ld = container_of(self, struct lcd_device, fb_notif);
        if (!ld->ops)
                return 0;
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index ff886e99104b..2a0d0bda7faa 100644
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -34,6 +34,8 @@ static bool dummycon_putc_called;
 void dummycon_register_output_notifier(struct notifier_block *nb)
 {
+        WARN_CONSOLE_UNLOCKED();
        raw_notifier_chain_register(&dummycon_output_nh, nb);
        if (dummycon_putc_called)
@@ -42,11 +44,15 @@ void dummycon_register_output_notifier(struct notifier_block *nb)
 void dummycon_unregister_output_notifier(struct notifier_block *nb)
 {
+        WARN_CONSOLE_UNLOCKED();
        raw_notifier_chain_unregister(&dummycon_output_nh, nb);
 }
 static void dummycon_putc(struct vc_data *vc, int c, int ypos, int xpos)
 {
+        WARN_CONSOLE_UNLOCKED();
        dummycon_putc_called = true;
        raw_notifier_call_chain(&dummycon_output_nh, 0, NULL);
 }
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig
index 1b2f5f31fb6f..b174af914e7a 100644
--- a/drivers/video/fbdev/Kconfig
+++ b/drivers/video/fbdev/Kconfig
@@ -332,7 +332,8 @@ config FB_SA1100
 config FB_IMX
        tristate "Freescale i.MX1/21/25/27 LCD support"
-        depends on FB && ARCH_MXC
+        depends on FB && HAVE_CLK && HAS_IOMEM
+        depends on ARCH_MXC || COMPILE_TEST
        select LCD_CLASS_DEVICE
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@ -670,7 +671,8 @@ config FB_HGA
 config FB_GBE
        bool "SGI Graphics Backend frame buffer support"
-        depends on (FB = y) && SGI_IP32
+        depends on (FB = y) && HAS_IOMEM
+        depends on SGI_IP32 || COMPILE_TEST
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -808,7 +810,8 @@ config FB_XVR1000
 config FB_PVR2
        tristate "NEC PowerVR 2 display support"
-        depends on FB && SH_DREAMCAST
+        depends on FB && HAS_IOMEM
+        depends on SH_DREAMCAST || COMPILE_TEST
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -856,7 +859,8 @@ config FB_S1D13XXX
 config FB_ATMEL
        tristate "AT91 LCD Controller support"
-        depends on FB && OF && HAVE_FB_ATMEL
+        depends on FB && OF && HAVE_CLK && HAS_IOMEM
+        depends on HAVE_FB_ATMEL || COMPILE_TEST
        select FB_BACKLIGHT
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@ -1729,7 +1733,8 @@ config FB_68328
 config FB_PXA168
        tristate "PXA168/910 LCD framebuffer support"
-        depends on FB && (CPU_PXA168 || CPU_PXA910)
+        depends on FB && HAVE_CLK && HAS_IOMEM
+        depends on CPU_PXA168 || CPU_PXA910 || COMPILE_TEST
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -1873,7 +1878,8 @@ config FB_TMIO_ACCELL
 config FB_S3C
        tristate "Samsung S3C framebuffer support"
-        depends on FB && (CPU_S3C2416 || ARCH_S3C64XX)
+        depends on FB && HAVE_CLK && HAS_IOMEM
+        depends on (CPU_S3C2416 || ARCH_S3C64XX) || COMPILE_TEST
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -2055,7 +2061,8 @@ config FB_SH7760
 config FB_DA8XX
        tristate "DA8xx/OMAP-L1xx/AM335x Framebuffer support"
-        depends on FB && (ARCH_DAVINCI_DA8XX || SOC_AM33XX)
+        depends on FB && HAVE_CLK && HAS_IOMEM
+        depends on ARCH_DAVINCI_DA8XX || SOC_AM33XX || COMPILE_TEST
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@ -2172,7 +2179,7 @@ config FB_EP93XX
 config FB_PRE_INIT_FB
        bool "Don't reinitialize, use bootloader's GDC/Display configuration"
-        depends on FB && (FB_MB862XX_LIME || FB_MXS)
+        depends on FB && FB_MB862XX_LIME
        ---help---
          Select this option if display contents should be inherited as set by
          the bootloader.
@@ -2213,17 +2220,6 @@ config FB_JZ4740
        help
          Framebuffer support for the JZ4740 SoC.
-config FB_MXS
-        tristate "MXS LCD framebuffer support"
-        depends on FB && (ARCH_MXS || ARCH_MXC)
-        select FB_CFB_FILLRECT
-        select FB_CFB_COPYAREA
-        select FB_CFB_IMAGEBLIT
-        select FB_MODE_HELPERS
-        select VIDEOMODE_HELPERS
-        help
-          Framebuffer support for the MXS SoC.
 config FB_PUV3_UNIGFX
        tristate "PKUnity v3 Unigfx framebuffer support"
        depends on FB && UNICORE32 && ARCH_PUV3
diff --git a/drivers/video/fbdev/Makefile b/drivers/video/fbdev/Makefile
index 655f2537cac1..7dc4861a93e6 100644
--- a/drivers/video/fbdev/Makefile
+++ b/drivers/video/fbdev/Makefile
@@ -131,7 +131,6 @@ obj-$(CONFIG_FB_VGA16)            += vga16fb.o
 obj-$(CONFIG_FB_OF)               += offb.o
 obj-$(CONFIG_FB_MX3)              += mx3fb.o
 obj-$(CONFIG_FB_DA8XX)            += da8xx-fb.o
-obj-$(CONFIG_FB_MXS)              += mxsfb.o
 obj-$(CONFIG_FB_SSD1307)          += ssd1307fb.o
 obj-$(CONFIG_FB_SIMPLE)           += simplefb.o
diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c
index 758457026694..91ddc9602014 100644
--- a/drivers/video/fbdev/amifb.c
+++ b/drivers/video/fbdev/amifb.c
@@ -3554,10 +3554,8 @@ static int __init amifb_probe(struct platform_device *pdev)
        custom.dmacon = DMAF_ALL | DMAF_MASTER;
        info = framebuffer_alloc(sizeof(struct amifb_par), &pdev->dev);
-        if (!info) {
+        if (!info)
-                dev_err(&pdev->dev, "framebuffer_alloc failed\n");
                return -ENOMEM;
-        }
        strcpy(info->fix.id, "Amiga ");
        info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
diff --git a/drivers/video/fbdev/arkfb.c b/drivers/video/fbdev/arkfb.c
index 13ba371e70aa..f940e8b66b85 100644
--- a/drivers/video/fbdev/arkfb.c
+++ b/drivers/video/fbdev/arkfb.c
@@ -954,10 +954,8 @@ static int ark_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        /* Allocate and fill driver data structure */
        info = framebuffer_alloc(sizeof(struct arkfb_info), &(dev->dev));
-        if (! info) {
+        if (!info)
-                dev_err(&(dev->dev), "cannot allocate memory\n");
                return -ENOMEM;
-        }
        par = info->par;
        mutex_init(&par->open_lock);
diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c
index b986af2a8042..fc9dfb0a95af 100644
--- a/drivers/video/fbdev/atafb.c
+++ b/drivers/video/fbdev/atafb.c
@@ -77,29 +77,8 @@
 #define SWITCH_SND7 0x80
 #define SWITCH_NONE 0x00
 #define up(x, r) (((x) + (r) - 1) & ~((r)-1))
-        /*
-         * Interface to the world
-         */
-static int atafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info);
-static int atafb_set_par(struct fb_info *info);
-static int atafb_setcolreg(unsigned int regno, unsigned int red, unsigned int green,
-                           unsigned int blue, unsigned int transp,
-                           struct fb_info *info);
-static int atafb_blank(int blank, struct fb_info *info);
-static int atafb_pan_display(struct fb_var_screeninfo *var,
-                             struct fb_info *info);
-static void atafb_fillrect(struct fb_info *info,
-                           const struct fb_fillrect *rect);
-static void atafb_copyarea(struct fb_info *info,
-                           const struct fb_copyarea *region);
-static void atafb_imageblit(struct fb_info *info, const struct fb_image *image);
-static int atafb_ioctl(struct fb_info *info, unsigned int cmd,
-                       unsigned long arg);
 static int default_par;         /* default resolution (0=none) */
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index e67dfd94bf1d..5ff8e0320d95 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -673,7 +673,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
        lcdc_writel(sinfo, ATMEL_LCDC_MVAL, 0);
        /* Disable all interrupts */
-        lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
+        lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0U);
        /* Enable FIFO & DMA errors */
        lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI | ATMEL_LCDC_OWRI | ATMEL_LCDC_MERI);
@@ -950,7 +950,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
        struct fb_videomode fb_vm;
        struct gpio_desc *gpiod;
        struct videomode vm;
-        int ret = -ENOENT;
+        int ret;
        int i;
        sinfo->config = (struct atmel_lcdfb_config*)
@@ -1053,10 +1053,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
        ret = -ENOMEM;
        info = framebuffer_alloc(sizeof(struct atmel_lcdfb_info), dev);
-        if (!info) {
+        if (!info)
-                dev_err(dev, "cannot allocate memory\n");
                goto out;
-        }
        sinfo = info->par;
        sinfo->pdev = pdev;
@@ -1291,7 +1289,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
         * We don't want to handle interrupts while the clock is
         * stopped. It may take forever.
         */
-        lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
+        lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0U);
        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR);
        lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
index 794434891291..8504e19437ff 100644
--- a/drivers/video/fbdev/aty/aty128fb.c
+++ b/drivers/video/fbdev/aty/aty128fb.c
@@ -2103,10 +2103,9 @@ static int aty128_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* We have the resources. Now virtualize them */
        info = framebuffer_alloc(sizeof(struct aty128fb_par), &pdev->dev);
-        if (info == NULL) {
+        if (!info)
-                printk(KERN_ERR "aty128fb: can't alloc fb_info_aty128\n");
                goto err_free_mmio;
-        }
        par = info->par;
        info->pseudo_palette = par->pseudo_palette;
@@ -2350,70 +2349,6 @@ static int aty128fb_ioctl(struct fb_info *info, u_int cmd, u_long arg)
        return -EINVAL;
 }
-#if 0
-    /*
-     *  Accelerated functions
-     */
-static inline void aty128_rectcopy(int srcx, int srcy, int dstx, int dsty,
-                                   u_int width, u_int height,
-                                   struct fb_info_aty128 *par)
-{
-        u32 save_dp_datatype, save_dp_cntl, dstval;
-        if (!width || !height)
-                return;
-        dstval = depth_to_dst(par->current_par.crtc.depth);
-        if (dstval == DST_24BPP) {
-                srcx *= 3;
-                dstx *= 3;
-                width *= 3;
-        } else if (dstval == -EINVAL) {
-                printk("aty128fb: invalid depth or RGBA\n");
-                return;
-        }
-        wait_for_fifo(2, par);
-        save_dp_datatype = aty_ld_le32(DP_DATATYPE);
-        save_dp_cntl     = aty_ld_le32(DP_CNTL);
-        wait_for_fifo(6, par);
-        aty_st_le32(SRC_Y_X, (srcy << 16) | srcx);
-        aty_st_le32(DP_MIX, ROP3_SRCCOPY | DP_SRC_RECT);
-        aty_st_le32(DP_CNTL, DST_X_LEFT_TO_RIGHT | DST_Y_TOP_TO_BOTTOM);
-        aty_st_le32(DP_DATATYPE, save_dp_datatype | dstval | SRC_DSTCOLOR);
-        aty_st_le32(DST_Y_X, (dsty << 16) | dstx);
-        aty_st_le32(DST_HEIGHT_WIDTH, (height << 16) | width);
-        par->blitter_may_be_busy = 1;
-        wait_for_fifo(2, par);
-        aty_st_le32(DP_DATATYPE, save_dp_datatype);
-        aty_st_le32(DP_CNTL, save_dp_cntl);
-}
-    /*
-     * Text mode accelerated functions
-     */
-static void fbcon_aty128_bmove(struct display *p, int sy, int sx, int dy,
-                               int dx, int height, int width)
-{
-        sx     *= fontwidth(p);
-        sy     *= fontheight(p);
-        dx     *= fontwidth(p);
-        dy     *= fontheight(p);
-        width  *= fontwidth(p);
-        height *= fontheight(p);
-        aty128_rectcopy(sx, sy, dx, dy, width, height,
-                        (struct fb_info_aty128 *)p->fb_info);
-}
-#endif /* 0 */
 static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
 {
        u32     pmgt;
diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index b6fe103df145..72bcfbe42e49 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -3550,10 +3550,9 @@ static int atyfb_pci_probe(struct pci_dev *pdev,
        /* Allocate framebuffer */
        info = framebuffer_alloc(sizeof(struct atyfb_par), &pdev->dev);
-        if (!info) {
+        if (!info)
-                PRINTKE("atyfb_pci_probe() can't alloc fb_info\n");
                return -ENOMEM;
-        }
        par = info->par;
        par->bus_type = PCI;
        info->fix = atyfb_fix;
@@ -3643,10 +3642,9 @@ static int __init atyfb_atari_probe(void)
                }
                info = framebuffer_alloc(sizeof(struct atyfb_par), NULL);
-                if (!info) {
+                if (!info)
-                        PRINTKE("atyfb_atari_probe() can't alloc fb_info\n");
                        return -ENOMEM;
-                }
                par = info->par;
                info->fix = atyfb_fix;
@@ -3916,8 +3914,7 @@ static int atyfb_reboot_notify(struct notifier_block *nb,
        if (!reboot_info)
                goto out;
-        if (!lock_fb_info(reboot_info))
+        lock_fb_info(reboot_info);
-                goto out;
        par = reboot_info->par;
diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c
index e8594bbaea60..6f891d82eebe 100644
--- a/drivers/video/fbdev/aty/radeon_base.c
+++ b/drivers/video/fbdev/aty/radeon_base.c
@@ -2294,8 +2294,6 @@ static int radeonfb_pci_register(struct pci_dev *pdev,
        info = framebuffer_alloc(sizeof(struct radeonfb_info), &pdev->dev);
        if (!info) {
-                printk (KERN_ERR "radeonfb (%s): could not allocate memory\n",
-                        pci_name(pdev));
                ret = -ENOMEM;
                goto err_disable;
        }
diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
index 3872ccef4cb2..26caffb02b7e 100644
--- a/drivers/video/fbdev/au1200fb.c
+++ b/drivers/video/fbdev/au1200fb.c
@@ -147,6 +147,7 @@ struct au1200_lcd_iodata_t {
 struct au1200fb_device {
        struct fb_info *fb_info;                /* FB driver info record */
        struct au1200fb_platdata *pd;
+        struct device *dev;
        int                                     plane;
        unsigned char*          fb_mem;         /* FrameBuffer memory map */
@@ -1232,10 +1233,8 @@ static int au1200fb_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
        struct au1200fb_device *fbdev = info->par;
-        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+        return dma_mmap_attrs(fbdev->dev, vma, fbdev->fb_mem, fbdev->fb_phys,
-        pgprot_val(vma->vm_page_prot) |= _CACHE_MASK; /* CCA=7 */
+                        fbdev->fb_len, DMA_ATTR_NON_CONSISTENT);
-        return vm_iomap_memory(vma, fbdev->fb_phys, fbdev->fb_len);
 }
 static void set_global(u_int cmd, struct au1200_lcd_global_regs_t *pdata)
@@ -1647,7 +1646,6 @@ static int au1200fb_drv_probe(struct platform_device *dev)
        struct au1200fb_device *fbdev;
        struct au1200fb_platdata *pd;
        struct fb_info *fbi = NULL;
-        unsigned long page;
        int bpp, plane, ret, irq;
        print_info("" DRIVER_DESC "");
@@ -1685,6 +1683,7 @@ static int au1200fb_drv_probe(struct platform_device *dev)
                fbdev = fbi->par;
                fbdev->fb_info = fbi;
                fbdev->pd = pd;
+                fbdev->dev = &dev->dev;
                fbdev->plane = plane;
@@ -1702,16 +1701,6 @@ static int au1200fb_drv_probe(struct platform_device *dev)
                        goto failed;
                }
-                /*
-                 * Set page reserved so that mmap will work. This is necessary
-                 * since we'll be remapping normal memory.
-                 */
-                for (page = (unsigned long)fbdev->fb_phys;
-                     page < PAGE_ALIGN((unsigned long)fbdev->fb_phys +
-                             fbdev->fb_len);
-                     page += PAGE_SIZE) {
-                        SetPageReserved(pfn_to_page(page >> PAGE_SHIFT)); /* LCD DMA is NOT coherent on Au1200 */
-                }
                print_dbg("Framebuffer memory map at %p", fbdev->fb_mem);
                print_dbg("phys=0x%08x, size=%dK", fbdev->fb_phys, fbdev->fb_len / 1024);
diff --git a/drivers/video/fbdev/chipsfb.c b/drivers/video/fbdev/chipsfb.c
index ca549e1532e6..f4dc320dcafe 100644
--- a/drivers/video/fbdev/chipsfb.c
+++ b/drivers/video/fbdev/chipsfb.c
@@ -366,7 +366,6 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent)
        p = framebuffer_alloc(0, &dp->dev);
        if (p == NULL) {
-                dev_err(&dp->dev, "Cannot allocate framebuffer structure\n");
                rc = -ENOMEM;
                goto err_disable;
        }
diff --git a/drivers/video/fbdev/cirrusfb.c b/drivers/video/fbdev/cirrusfb.c
index b3be06dd2908..e4ce5667b125 100644
--- a/drivers/video/fbdev/cirrusfb.c
+++ b/drivers/video/fbdev/cirrusfb.c
@@ -2093,7 +2093,6 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
        info = framebuffer_alloc(sizeof(struct cirrusfb_info), &pdev->dev);
        if (!info) {
-                printk(KERN_ERR "cirrusfb: could not allocate memory\n");
                ret = -ENOMEM;
                goto err_out;
        }
@@ -2206,10 +2205,8 @@ static int cirrusfb_zorro_register(struct zorro_dev *z,
        struct cirrusfb_info *cinfo;
        info = framebuffer_alloc(sizeof(struct cirrusfb_info), &z->dev);
-        if (!info) {
+        if (!info)
-                printk(KERN_ERR "cirrusfb: could not allocate memory\n");
                return -ENOMEM;
-        }
        zcl = (const struct zorrocl *)ent->driver_data;
        btype = zcl->type;
diff --git a/drivers/video/fbdev/controlfb.c b/drivers/video/fbdev/controlfb.c
index 7af8db28bb80..9a680ef3ffc3 100644
--- a/drivers/video/fbdev/controlfb.c
+++ b/drivers/video/fbdev/controlfb.c
@@ -182,7 +182,7 @@ int init_module(void)
        int ret = -ENXIO;
        dp = of_find_node_by_name(NULL, "control");
-        if (dp != 0 && !control_of_init(dp))
+        if (dp && !control_of_init(dp))
                ret = 0;
        of_node_put(dp);
@@ -580,7 +580,7 @@ static int __init control_init(void)
        control_setup(option);
        dp = of_find_node_by_name(NULL, "control");
-        if (dp != 0 && !control_of_init(dp))
+        if (dp && !control_of_init(dp))
                ret = 0;
        of_node_put(dp);
@@ -683,8 +683,8 @@ static int __init control_of_init(struct device_node *dp)
                return -ENXIO;
        }
        p = kzalloc(sizeof(*p), GFP_KERNEL);
-        if (p == 0)
+        if (!p)
-                return -ENXIO;
+                return -ENOMEM;
        control_fb = p; /* save it for cleanups */
        /* Map in frame buffer and registers */
diff --git a/drivers/video/fbdev/core/fbcmap.c b/drivers/video/fbdev/core/fbcmap.c
index 2811c4afde01..e5ae33c1a8e8 100644
--- a/drivers/video/fbdev/core/fbcmap.c
+++ b/drivers/video/fbdev/core/fbcmap.c
@@ -285,11 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user *cmap, struct fb_info *info)
                goto out;
        }
        umap.start = cmap->start;
-        if (!lock_fb_info(info)) {
+        lock_fb_info(info);
-                rc = -ENODEV;
-                goto out;
-        }
        rc = fb_set_cmap(&umap, info);
        unlock_fb_info(info);
 out:
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
index a9c69ae30878..c9235a2f42f8 100644
--- a/drivers/video/fbdev/core/fbcon.c
+++ b/drivers/video/fbdev/core/fbcon.c
@@ -76,6 +76,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/crc32.h> /* For counting font checksums */
+#include <linux/uaccess.h>
 #include <asm/fb.h>
 #include <asm/irq.h>
@@ -87,13 +88,32 @@
 #  define DPRINTK(fmt, args...)
 #endif
+/*
+ * FIXME: Locking
+ *
+ * - fbcon state itself is protected by the console_lock, and the code does a
+ *   pretty good job at making sure that lock is held everywhere it's needed.
+ *
+ * - access to the registered_fb array is entirely unprotected. This should use
+ *   proper object lifetime handling, i.e. get/put_fb_info. This also means
+ *   switching from indices to proper pointers for fb_info everywhere.
+ *
+ * - fbcon doesn't bother with fb_lock/unlock at all. This is buggy, since it
+ *   means concurrent access to the same fbdev from both fbcon and userspace
+ *   will blow up. To fix this all fbcon calls from fbmem.c need to be moved out
+ *   of fb_lock/unlock protected sections, since otherwise we'll recurse and
+ *   deadlock eventually. Aside: Due to these deadlock issues the fbdev code in
+ *   fbmem.c cannot use locking asserts, and there's lots of callers which get
+ *   the rules wrong, e.g. fbsysfs.c entirely missed fb_lock/unlock calls too.
+ */
 enum {
        FBCON_LOGO_CANSHOW      = -1,   /* the logo can be shown */
        FBCON_LOGO_DRAW         = -2,   /* draw the logo to a console */
        FBCON_LOGO_DONTSHOW     = -3    /* do not show the logo */
 };
-static struct display fb_display[MAX_NR_CONSOLES];
+static struct fbcon_display fb_display[MAX_NR_CONSOLES];
 static signed char con2fb_map[MAX_NR_CONSOLES];
 static signed char con2fb_map_boot[MAX_NR_CONSOLES];
@@ -112,7 +132,6 @@ static int softback_lines;
 static int first_fb_vc;
 static int last_fb_vc = MAX_NR_CONSOLES - 1;
 static int fbcon_is_default = 1; 
-static int fbcon_has_exited;
 static int primary_device = -1;
 static int fbcon_has_console_bind;
@@ -185,11 +204,11 @@ static __inline__ void ywrap_up(struct vc_data *vc, int count);
 static __inline__ void ywrap_down(struct vc_data *vc, int count);
 static __inline__ void ypan_up(struct vc_data *vc, int count);
 static __inline__ void ypan_down(struct vc_data *vc, int count);
-static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int sx,
+static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, int sx,
                            int dy, int dx, int height, int width, u_int y_break);
 static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
                           int unit);
-static void fbcon_redraw_move(struct vc_data *vc, struct display *p,
+static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p,
                              int line, int count, int dy);
 static void fbcon_modechanged(struct fb_info *info);
 static void fbcon_set_all_vcs(struct fb_info *info);
@@ -220,7 +239,7 @@ static void fbcon_rotate(struct fb_info *info, u32 rotate)
        fb_info = registered_fb[con2fb_map[ops->currcon]];
        if (info == fb_info) {
-                struct display *p = &fb_display[ops->currcon];
+                struct fbcon_display *p = &fb_display[ops->currcon];
                if (rotate < 4)
                        p->con_rotate = rotate;
@@ -235,7 +254,7 @@ static void fbcon_rotate_all(struct fb_info *info, u32 rotate)
 {
        struct fbcon_ops *ops = info->fbcon_par;
        struct vc_data *vc;
-        struct display *p;
+        struct fbcon_display *p;
        int i;
        if (!ops || ops->currcon < 0 || rotate > 3)
@@ -900,7 +919,7 @@ static int set_con2fb_map(int unit, int newidx, int user)
 *  Low Level Operations
 */
 /* NOTE: fbcon cannot be __init: it may be called from do_take_over_console later */
-static int var_to_display(struct display *disp,
+static int var_to_display(struct fbcon_display *disp,
                          struct fb_var_screeninfo *var,
                          struct fb_info *info)
 {
@@ -925,7 +944,7 @@ static int var_to_display(struct display *disp,
 }
 static void display_to_var(struct fb_var_screeninfo *var,
-                           struct display *disp)
+                           struct fbcon_display *disp)
 {
        fb_videomode_to_var(var, disp->mode);
        var->xres_virtual = disp->xres_virtual;
@@ -946,7 +965,7 @@ static void display_to_var(struct fb_var_screeninfo *var,
 static const char *fbcon_startup(void)
 {
        const char *display_desc = "frame buffer device";
-        struct display *p = &fb_display[fg_console];
+        struct fbcon_display *p = &fb_display[fg_console];
        struct vc_data *vc = vc_cons[fg_console].d;
        const struct font_desc *font = NULL;
        struct module *owner;
@@ -1050,23 +1069,26 @@ static const char *fbcon_startup(void)
                info->var.bits_per_pixel);
        fbcon_add_cursor_timer(info);
-        fbcon_has_exited = 0;
        return display_desc;
 }
 static void fbcon_init(struct vc_data *vc, int init)
 {
-        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
+        struct fb_info *info;
        struct fbcon_ops *ops;
        struct vc_data **default_mode = vc->vc_display_fg;
        struct vc_data *svc = *default_mode;
-        struct display *t, *p = &fb_display[vc->vc_num];
+        struct fbcon_display *t, *p = &fb_display[vc->vc_num];
        int logo = 1, new_rows, new_cols, rows, cols, charcnt = 256;
        int cap, ret;
-        if (info_idx == -1 || info == NULL)
+        if (WARN_ON(info_idx == -1))
            return;
+        if (con2fb_map[vc->vc_num] == -1)
+                con2fb_map[vc->vc_num] = info_idx;
+        info = registered_fb[con2fb_map[vc->vc_num]];
        cap = info->flags;
        if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
@@ -1203,7 +1225,7 @@ static void fbcon_init(struct vc_data *vc, int init)
        ops->p = &fb_display[fg_console];
 }
-static void fbcon_free_font(struct display *p, bool freefont)
+static void fbcon_free_font(struct fbcon_display *p, bool freefont)
 {
        if (freefont && p->userfont && p->fontdata && (--REFCOUNT(p->fontdata) == 0))
                kfree(p->fontdata - FONT_EXTRA_WORDS * sizeof(int));
@@ -1215,7 +1237,7 @@ static void set_vc_hi_font(struct vc_data *vc, bool set);
 static void fbcon_deinit(struct vc_data *vc)
 {
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        struct fb_info *info;
        struct fbcon_ops *ops;
        int idx;
@@ -1288,7 +1310,7 @@ static void fbcon_clear(struct vc_data *vc, int sy, int sx, int height,
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        u_int y_break;
        if (fbcon_is_inactive(vc, info))
@@ -1324,7 +1346,7 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s,
                        int count, int ypos, int xpos)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        struct fbcon_ops *ops = info->fbcon_par;
        if (!fbcon_is_inactive(vc, info))
@@ -1388,7 +1410,7 @@ static int scrollback_current = 0;
 static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
                           int unit)
 {
-        struct display *p, *t;
+        struct fbcon_display *p, *t;
        struct vc_data **default_mode, *vc;
        struct vc_data *svc;
        struct fbcon_ops *ops = info->fbcon_par;
@@ -1457,7 +1479,7 @@ static __inline__ void ywrap_up(struct vc_data *vc, int count)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        
        p->yscroll += count;
        if (p->yscroll >= p->vrows)     /* Deal with wrap */
@@ -1476,7 +1498,7 @@ static __inline__ void ywrap_down(struct vc_data *vc, int count)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        
        p->yscroll -= count;
        if (p->yscroll < 0)     /* Deal with wrap */
@@ -1494,7 +1516,7 @@ static __inline__ void ywrap_down(struct vc_data *vc, int count)
 static __inline__ void ypan_up(struct vc_data *vc, int count)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        struct fbcon_ops *ops = info->fbcon_par;
        p->yscroll += count;
@@ -1519,7 +1541,7 @@ static __inline__ void ypan_up_redraw(struct vc_data *vc, int t, int count)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        p->yscroll += count;
@@ -1542,7 +1564,7 @@ static __inline__ void ypan_up_redraw(struct vc_data *vc, int t, int count)
 static __inline__ void ypan_down(struct vc_data *vc, int count)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        struct fbcon_ops *ops = info->fbcon_par;
        
        p->yscroll -= count;
@@ -1567,7 +1589,7 @@ static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        p->yscroll -= count;
@@ -1587,7 +1609,7 @@ static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count)
        scrollback_current = 0;
 }
-static void fbcon_redraw_softback(struct vc_data *vc, struct display *p,
+static void fbcon_redraw_softback(struct vc_data *vc, struct fbcon_display *p,
                                  long delta)
 {
        int count = vc->vc_rows;
@@ -1680,7 +1702,7 @@ static void fbcon_redraw_softback(struct vc_data *vc, struct display *p,
        }
 }
-static void fbcon_redraw_move(struct vc_data *vc, struct display *p,
+static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p,
                              int line, int count, int dy)
 {
        unsigned short *s = (unsigned short *)
@@ -1715,7 +1737,7 @@ static void fbcon_redraw_move(struct vc_data *vc, struct display *p,
 }
 static void fbcon_redraw_blit(struct vc_data *vc, struct fb_info *info,
-                        struct display *p, int line, int count, int ycount)
+                        struct fbcon_display *p, int line, int count, int ycount)
 {
        int offset = ycount * vc->vc_cols;
        unsigned short *d = (unsigned short *)
@@ -1764,7 +1786,7 @@ static void fbcon_redraw_blit(struct vc_data *vc, struct fb_info *info,
        }
 }
-static void fbcon_redraw(struct vc_data *vc, struct display *p,
+static void fbcon_redraw(struct vc_data *vc, struct fbcon_display *p,
                         int line, int count, int offset)
 {
        unsigned short *d = (unsigned short *)
@@ -1848,7 +1870,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b,
                enum con_scroll dir, unsigned int count)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        int scroll_partial = info->flags & FBINFO_PARTIAL_PAN_OK;
        if (fbcon_is_inactive(vc, info))
@@ -2052,7 +2074,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
                        int height, int width)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        
        if (fbcon_is_inactive(vc, info))
                return;
@@ -2071,7 +2093,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
                        p->vrows - p->yscroll);
 }
-static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int sx, 
+static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, int sx,
                            int dy, int dx, int height, int width, u_int y_break)
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
@@ -2113,7 +2135,7 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
                   height, width);
 }
-static void updatescrollmode(struct display *p,
+static void updatescrollmode(struct fbcon_display *p,
                                        struct fb_info *info,
                                        struct vc_data *vc)
 {
@@ -2165,7 +2187,7 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        struct fb_var_screeninfo var = info->var;
        int x_diff, y_diff, virt_w, virt_h, virt_fw, virt_fh;
@@ -2210,7 +2232,7 @@ static int fbcon_switch(struct vc_data *vc)
 {
        struct fb_info *info, *old_info = NULL;
        struct fbcon_ops *ops;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        struct fb_var_screeninfo var;
        int i, ret, prev_console, charcnt = 256;
@@ -2348,8 +2370,6 @@ static int fbcon_switch(struct vc_data *vc)
 static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info,
                                int blank)
 {
-        struct fb_event event;
        if (blank) {
                unsigned short charmask = vc->vc_hi_font_mask ?
                        0x1ff : 0xff;
@@ -2360,14 +2380,6 @@ static void fbcon_generic_blank(struct vc_data *vc, struct fb_info *info,
                fbcon_clear(vc, 0, 0, vc->vc_rows, vc->vc_cols);
                vc->vc_video_erase_char = oldc;
        }
-        if (!lock_fb_info(info))
-                return;
-        event.info = info;
-        event.data = &blank;
-        fb_notifier_call_chain(FB_EVENT_CONBLANK, &event);
-        unlock_fb_info(info);
 }
 static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
@@ -2394,9 +2406,8 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
                        fbcon_cursor(vc, blank ? CM_ERASE : CM_DRAW);
                        ops->cursor_flash = (!blank);
-                        if (!(info->flags & FBINFO_MISC_USEREVENT))
+                        if (fb_blank(info, blank))
-                                if (fb_blank(info, blank))
+                                fbcon_generic_blank(vc, info, blank);
-                                        fbcon_generic_blank(vc, info, blank);
                }
                if (!blank)
@@ -2553,7 +2564,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
 {
        struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *p = &fb_display[vc->vc_num];
+        struct fbcon_display *p = &fb_display[vc->vc_num];
        int resize;
        int cnt;
        char *old_data = NULL;
@@ -2601,7 +2612,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
 static int fbcon_copy_font(struct vc_data *vc, int con)
 {
-        struct display *od = &fb_display[con];
+        struct fbcon_display *od = &fb_display[con];
        struct console_font *f = &vc->vc_font;
        if (od->fontdata == f->data)
@@ -2826,7 +2837,7 @@ static void fbcon_scrolldelta(struct vc_data *vc, int lines)
 {
        struct fb_info *info = registered_fb[con2fb_map[fg_console]];
        struct fbcon_ops *ops = info->fbcon_par;
-        struct display *disp = &fb_display[fg_console];
+        struct fbcon_display *disp = &fb_display[fg_console];
        int offset, limit, scrollback_old;
        if (softback_top) {
@@ -2918,7 +2929,7 @@ static int fbcon_set_origin(struct vc_data *vc)
        return 0;
 }
-static void fbcon_suspended(struct fb_info *info)
+void fbcon_suspended(struct fb_info *info)
 {
        struct vc_data *vc = NULL;
        struct fbcon_ops *ops = info->fbcon_par;
@@ -2931,7 +2942,7 @@ static void fbcon_suspended(struct fb_info *info)
        fbcon_cursor(vc, CM_ERASE);
 }
-static void fbcon_resumed(struct fb_info *info)
+void fbcon_resumed(struct fb_info *info)
 {
        struct vc_data *vc;
        struct fbcon_ops *ops = info->fbcon_par;
@@ -2947,7 +2958,7 @@ static void fbcon_modechanged(struct fb_info *info)
 {
        struct fbcon_ops *ops = info->fbcon_par;
        struct vc_data *vc;
-        struct display *p;
+        struct fbcon_display *p;
        int rows, cols;
        if (!ops || ops->currcon < 0)
@@ -2987,7 +2998,7 @@ static void fbcon_set_all_vcs(struct fb_info *info)
 {
        struct fbcon_ops *ops = info->fbcon_par;
        struct vc_data *vc;
-        struct display *p;
+        struct fbcon_display *p;
        int i, rows, cols, fg = -1;
        if (!ops || ops->currcon < 0)
@@ -3018,11 +3029,21 @@ static void fbcon_set_all_vcs(struct fb_info *info)
                fbcon_modechanged(info);
 }
-static int fbcon_mode_deleted(struct fb_info *info,
-                              struct fb_videomode *mode)
+void fbcon_update_vcs(struct fb_info *info, bool all)
+{
+        if (all)
+                fbcon_set_all_vcs(info);
+        else
+                fbcon_modechanged(info);
+}
+EXPORT_SYMBOL(fbcon_update_vcs);
+int fbcon_mode_deleted(struct fb_info *info,
+                       struct fb_videomode *mode)
 {
        struct fb_info *fb_info;
-        struct display *p;
+        struct fbcon_display *p;
        int i, j, found = 0;
        /* before deletion, ensure that mode is not in use */
@@ -3045,7 +3066,7 @@ static int fbcon_mode_deleted(struct fb_info *info,
 }
 #ifdef CONFIG_VT_HW_CONSOLE_BINDING
-static int fbcon_unbind(void)
+static void fbcon_unbind(void)
 {
        int ret;
@@ -3054,25 +3075,21 @@ static int fbcon_unbind(void)
        if (!ret)
                fbcon_has_console_bind = 0;
-        return ret;
 }
 #else
-static inline int fbcon_unbind(void)
+static inline void fbcon_unbind(void) {}
-{
-        return -EINVAL;
-}
 #endif /* CONFIG_VT_HW_CONSOLE_BINDING */
 /* called with console_lock held */
-static int fbcon_fb_unbind(int idx)
+void fbcon_fb_unbind(struct fb_info *info)
 {
        int i, new_idx = -1, ret = 0;
+        int idx = info->node;
        WARN_CONSOLE_UNLOCKED();
        if (!fbcon_has_console_bind)
-                return 0;
+                return;
        for (i = first_fb_vc; i <= last_fb_vc; i++) {
                if (con2fb_map[i] != idx &&
@@ -3105,26 +3122,24 @@ static int fbcon_fb_unbind(int idx)
                                                                     idx, 0);
                                        if (ret) {
                                                con2fb_map[i] = idx;
-                                                return ret;
+                                                return;
                                        }
                                }
                        }
                }
-                ret = fbcon_unbind();
+                fbcon_unbind();
        }
-        return ret;
 }
 /* called with console_lock held */
-static int fbcon_fb_unregistered(struct fb_info *info)
+void fbcon_fb_unregistered(struct fb_info *info)
 {
        int i, idx;
        WARN_CONSOLE_UNLOCKED();
        if (deferred_takeover)
-                return 0;
+                return;
        idx = info->node;
        for (i = first_fb_vc; i <= last_fb_vc; i++) {
@@ -3153,21 +3168,18 @@ static int fbcon_fb_unregistered(struct fb_info *info)
        if (!num_registered_fb)
                do_unregister_con_driver(&fb_con);
-        return 0;
 }
-/* called with console_lock held */
+void fbcon_remap_all(struct fb_info *info)
-static void fbcon_remap_all(int idx)
 {
-        int i;
+        int i, idx = info->node;
-        WARN_CONSOLE_UNLOCKED();
+        console_lock();
        if (deferred_takeover) {
                for (i = first_fb_vc; i <= last_fb_vc; i++)
                        con2fb_map_boot[i] = idx;
                fbcon_map_override();
+                console_unlock();
                return;
        }
@@ -3180,6 +3192,7 @@ static void fbcon_remap_all(int idx)
                       first_fb_vc + 1, last_fb_vc + 1);
                info_idx = idx;
        }
+        console_unlock();
 }
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
@@ -3213,7 +3226,7 @@ static inline void fbcon_select_primary(struct fb_info *info)
 #endif /* CONFIG_FRAMEBUFFER_DETECT_PRIMARY */
 /* called with console_lock held */
-static int fbcon_fb_registered(struct fb_info *info)
+int fbcon_fb_registered(struct fb_info *info)
 {
        int ret = 0, i, idx;
@@ -3247,7 +3260,7 @@ static int fbcon_fb_registered(struct fb_info *info)
        return ret;
 }
-static void fbcon_fb_blanked(struct fb_info *info, int blank)
+void fbcon_fb_blanked(struct fb_info *info, int blank)
 {
        struct fbcon_ops *ops = info->fbcon_par;
        struct vc_data *vc;
@@ -3269,7 +3282,7 @@ static void fbcon_fb_blanked(struct fb_info *info, int blank)
        ops->blank_state = blank;
 }
-static void fbcon_new_modelist(struct fb_info *info)
+void fbcon_new_modelist(struct fb_info *info)
 {
        int i;
        struct vc_data *vc;
@@ -3290,11 +3303,11 @@ static void fbcon_new_modelist(struct fb_info *info)
        }
 }
-static void fbcon_get_requirement(struct fb_info *info,
+void fbcon_get_requirement(struct fb_info *info,
-                                  struct fb_blit_caps *caps)
+                           struct fb_blit_caps *caps)
 {
        struct vc_data *vc;
-        struct display *p;
+        struct fbcon_display *p;
        if (caps->flags) {
                int i, charcnt;
@@ -3326,80 +3339,47 @@ static void fbcon_get_requirement(struct fb_info *info,
        }
 }
-static int fbcon_event_notify(struct notifier_block *self,
+int fbcon_set_con2fb_map_ioctl(void __user *argp)
-                              unsigned long action, void *data)
 {
-        struct fb_event *event = data;
+        struct fb_con2fbmap con2fb;
-        struct fb_info *info = event->info;
+        int ret;
-        struct fb_videomode *mode;
-        struct fb_con2fbmap *con2fb;
-        struct fb_blit_caps *caps;
-        int idx, ret = 0;
-        /*
-         * ignore all events except driver registration and deregistration
-         * if fbcon is not active
-         */
-        if (fbcon_has_exited && !(action == FB_EVENT_FB_REGISTERED ||
-                                  action == FB_EVENT_FB_UNREGISTERED))
-                goto done;
-        switch(action) {
+        if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
-        case FB_EVENT_SUSPEND:
+                return -EFAULT;
-                fbcon_suspended(info);
+        if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                break;
+                return -EINVAL;
-        case FB_EVENT_RESUME:
+        if (con2fb.framebuffer >= FB_MAX)
-                fbcon_resumed(info);
+                return -EINVAL;
-                break;
+        if (!registered_fb[con2fb.framebuffer])
-        case FB_EVENT_MODE_CHANGE:
+                request_module("fb%d", con2fb.framebuffer);
-                fbcon_modechanged(info);
+        if (!registered_fb[con2fb.framebuffer]) {
-                break;
+                return -EINVAL;
-        case FB_EVENT_MODE_CHANGE_ALL:
-                fbcon_set_all_vcs(info);
-                break;
-        case FB_EVENT_MODE_DELETE:
-                mode = event->data;
-                ret = fbcon_mode_deleted(info, mode);
-                break;
-        case FB_EVENT_FB_UNBIND:
-                idx = info->node;
-                ret = fbcon_fb_unbind(idx);
-                break;
-        case FB_EVENT_FB_REGISTERED:
-                ret = fbcon_fb_registered(info);
-                break;
-        case FB_EVENT_FB_UNREGISTERED:
-                ret = fbcon_fb_unregistered(info);
-                break;
-        case FB_EVENT_SET_CONSOLE_MAP:
-                /* called with console lock held */
-                con2fb = event->data;
-                ret = set_con2fb_map(con2fb->console - 1,
-                                     con2fb->framebuffer, 1);
-                break;
-        case FB_EVENT_GET_CONSOLE_MAP:
-                con2fb = event->data;
-                con2fb->framebuffer = con2fb_map[con2fb->console - 1];
-                break;
-        case FB_EVENT_BLANK:
-                fbcon_fb_blanked(info, *(int *)event->data);
-                break;
-        case FB_EVENT_NEW_MODELIST:
-                fbcon_new_modelist(info);
-                break;
-        case FB_EVENT_GET_REQ:
-                caps = event->data;
-                fbcon_get_requirement(info, caps);
-                break;
-        case FB_EVENT_REMAP_ALL_CONSOLE:
-                idx = info->node;
-                fbcon_remap_all(idx);
-                break;
        }
-done:
+        console_lock();
+        ret = set_con2fb_map(con2fb.console - 1,
+                             con2fb.framebuffer, 1);
+        console_unlock();
        return ret;
 }
+int fbcon_get_con2fb_map_ioctl(void __user *argp)
+{
+        struct fb_con2fbmap con2fb;
+        if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+                return -EFAULT;
+        if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
+                return -EINVAL;
+        console_lock();
+        con2fb.framebuffer = con2fb_map[con2fb.console - 1];
+        console_unlock();
+        return copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
+}
 /*
 *  The console `switch' structure for the frame buffer based console
 */
@@ -3431,10 +3411,6 @@ static const struct consw fb_con = {
        .con_debug_leave        = fbcon_debug_leave,
 };
-static struct notifier_block fbcon_event_notifier = {
-        .notifier_call  = fbcon_event_notify,
-};
 static ssize_t store_rotate(struct device *device,
                            struct device_attribute *attr, const char *buf,
                            size_t count)
@@ -3443,9 +3419,6 @@ static ssize_t store_rotate(struct device *device,
        int rotate, idx;
        char **last = NULL;
-        if (fbcon_has_exited)
-                return count;
        console_lock();
        idx = con2fb_map[fg_console];
@@ -3468,9 +3441,6 @@ static ssize_t store_rotate_all(struct device *device,
        int rotate, idx;
        char **last = NULL;
-        if (fbcon_has_exited)
-                return count;
        console_lock();
        idx = con2fb_map[fg_console];
@@ -3491,9 +3461,6 @@ static ssize_t show_rotate(struct device *device,
        struct fb_info *info;
        int rotate = 0, idx;
-        if (fbcon_has_exited)
-                return 0;
        console_lock();
        idx = con2fb_map[fg_console];
@@ -3514,9 +3481,6 @@ static ssize_t show_cursor_blink(struct device *device,
        struct fbcon_ops *ops;
        int idx, blink = -1;
-        if (fbcon_has_exited)
-                return 0;
        console_lock();
        idx = con2fb_map[fg_console];
@@ -3543,9 +3507,6 @@ static ssize_t store_cursor_blink(struct device *device,
        int blink, idx;
        char **last = NULL;
-        if (fbcon_has_exited)
-                return count;
        console_lock();
        idx = con2fb_map[fg_console];
@@ -3668,9 +3629,6 @@ static void fbcon_exit(void)
        struct fb_info *info;
        int i, j, mapped;
-        if (fbcon_has_exited)
-                return;
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER
        if (deferred_takeover) {
                dummycon_unregister_output_notifier(&fbcon_output_nb);
@@ -3695,7 +3653,7 @@ static void fbcon_exit(void)
                for (j = first_fb_vc; j <= last_fb_vc; j++) {
                        if (con2fb_map[j] == i) {
                                mapped = 1;
-                                break;
+                                con2fb_map[j] = -1;
                        }
                }
@@ -3718,8 +3676,6 @@ static void fbcon_exit(void)
                                info->queue.func = NULL;
                }
        }
-        fbcon_has_exited = 1;
 }
 void __init fb_console_init(void)
@@ -3727,7 +3683,6 @@ void __init fb_console_init(void)
        int i;
        console_lock();
-        fb_register_client(&fbcon_event_notifier);
        fbcon_device = device_create(fb_class, NULL, MKDEV(0, 0), NULL,
                                     "fbcon");
@@ -3763,7 +3718,6 @@ static void __exit fbcon_deinit_device(void)
 void __exit fb_console_exit(void)
 {
        console_lock();
-        fb_unregister_client(&fbcon_event_notifier);
        fbcon_deinit_device();
        device_destroy(fb_class, MKDEV(0, 0));
        fbcon_exit();
diff --git a/drivers/video/fbdev/core/fbcon.h b/drivers/video/fbdev/core/fbcon.h
index 21912a3ba32f..20dea853765f 100644
--- a/drivers/video/fbdev/core/fbcon.h
+++ b/drivers/video/fbdev/core/fbcon.h
@@ -25,7 +25,7 @@
    *    low-level frame buffer device
    */
-struct display {
+struct fbcon_display {
    /* Filled in by the low-level console driver */
    const u_char *fontdata;
    int userfont;                   /* != 0 if fontdata kmalloc()ed */
@@ -68,7 +68,7 @@ struct fbcon_ops {
        struct fb_var_screeninfo var;  /* copy of the current fb_var_screeninfo */
        struct timer_list cursor_timer; /* Cursor timer */
        struct fb_cursor cursor_state;
-        struct display *p;
+        struct fbcon_display *p;
        struct fb_info *info;
        int    currcon;                 /* Current VC. */
        int    cur_blink_jiffies;
@@ -225,7 +225,7 @@ extern int  soft_cursor(struct fb_info *info, struct fb_cursor *cursor);
 #define FBCON_ATTRIBUTE_REVERSE   2
 #define FBCON_ATTRIBUTE_BOLD      4
-static inline int real_y(struct display *p, int ypos)
+static inline int real_y(struct fbcon_display *p, int ypos)
 {
        int rows = p->vrows;
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index d1949c92be98..64dd732021d8 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -80,17 +80,6 @@ static void put_fb_info(struct fb_info *fb_info)
                fb_info->fbops->fb_destroy(fb_info);
 }
-int lock_fb_info(struct fb_info *info)
-{
-        mutex_lock(&info->lock);
-        if (!info->fbops) {
-                mutex_unlock(&info->lock);
-                return 0;
-        }
-        return 1;
-}
-EXPORT_SYMBOL(lock_fb_info);
 /*
 * Helpers
 */
@@ -943,16 +932,13 @@ EXPORT_SYMBOL(fb_pan_display);
 static int fb_check_caps(struct fb_info *info, struct fb_var_screeninfo *var,
                         u32 activate)
 {
-        struct fb_event event;
        struct fb_blit_caps caps, fbcaps;
        int err = 0;
        memset(&caps, 0, sizeof(caps));
        memset(&fbcaps, 0, sizeof(fbcaps));
        caps.flags = (activate & FB_ACTIVATE_ALL) ? 1 : 0;
-        event.info = info;
+        fbcon_get_requirement(info, &caps);
-        event.data = &caps;
-        fb_notifier_call_chain(FB_EVENT_GET_REQ, &event);
        info->fbops->fb_get_caps(info, &fbcaps, var);
        if (((fbcaps.x ^ caps.x) & caps.x) ||
@@ -968,6 +954,10 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
 {
        int flags = info->flags;
        int ret = 0;
+        u32 activate;
+        struct fb_var_screeninfo old_var;
+        struct fb_videomode mode;
+        struct fb_event event;
        if (var->activate & FB_ACTIVATE_INV_MODE) {
                struct fb_videomode mode1, mode2;
@@ -977,100 +967,90 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                /* make sure we don't delete the videomode of current var */
                ret = fb_mode_is_equal(&mode1, &mode2);
-                if (!ret) {
+                if (!ret)
-                    struct fb_event event;
+                        fbcon_mode_deleted(info, &mode1);
-                    event.info = info;
-                    event.data = &mode1;
-                    ret = fb_notifier_call_chain(FB_EVENT_MODE_DELETE, &event);
-                }
                if (!ret)
-                    fb_delete_videomode(&mode1, &info->modelist);
+                        fb_delete_videomode(&mode1, &info->modelist);
-                ret = (ret) ? -EINVAL : 0;
+                return ret ? -EINVAL : 0;
-                goto done;
        }
-        if ((var->activate & FB_ACTIVATE_FORCE) ||
+        if (!(var->activate & FB_ACTIVATE_FORCE) &&
-            memcmp(&info->var, var, sizeof(struct fb_var_screeninfo))) {
+            !memcmp(&info->var, var, sizeof(struct fb_var_screeninfo)))
-                u32 activate = var->activate;
+                return 0;
-                /* When using FOURCC mode, make sure the red, green, blue and
+        activate = var->activate;
-                 * transp fields are set to 0.
-                 */
-                if ((info->fix.capabilities & FB_CAP_FOURCC) &&
-                    var->grayscale > 1) {
-                        if (var->red.offset     || var->green.offset    ||
-                            var->blue.offset    || var->transp.offset   ||
-                            var->red.length     || var->green.length    ||
-                            var->blue.length    || var->transp.length   ||
-                            var->red.msb_right  || var->green.msb_right ||
-                            var->blue.msb_right || var->transp.msb_right)
-                                return -EINVAL;
-                }
-                if (!info->fbops->fb_check_var) {
+        /* When using FOURCC mode, make sure the red, green, blue and
-                        *var = info->var;
+         * transp fields are set to 0.
-                        goto done;
+         */
-                }
+        if ((info->fix.capabilities & FB_CAP_FOURCC) &&
+            var->grayscale > 1) {
+                if (var->red.offset     || var->green.offset    ||
+                    var->blue.offset    || var->transp.offset   ||
+                    var->red.length     || var->green.length    ||
+                    var->blue.length    || var->transp.length   ||
+                    var->red.msb_right  || var->green.msb_right ||
+                    var->blue.msb_right || var->transp.msb_right)
+                        return -EINVAL;
+        }
-                ret = info->fbops->fb_check_var(var, info);
+        if (!info->fbops->fb_check_var) {
+                *var = info->var;
+                return 0;
+        }
-                if (ret)
+        ret = info->fbops->fb_check_var(var, info);
-                        goto done;
-                if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
+        if (ret)
-                        struct fb_var_screeninfo old_var;
+                return ret;
-                        struct fb_videomode mode;
-                        if (info->fbops->fb_get_caps) {
+        if ((var->activate & FB_ACTIVATE_MASK) != FB_ACTIVATE_NOW)
-                                ret = fb_check_caps(info, var, activate);
+                return 0;
-                                if (ret)
+        if (info->fbops->fb_get_caps) {
-                                        goto done;
+                ret = fb_check_caps(info, var, activate);
-                        }
-                        old_var = info->var;
+                if (ret)
-                        info->var = *var;
+                        return ret;
+        }
-                        if (info->fbops->fb_set_par) {
+        old_var = info->var;
-                                ret = info->fbops->fb_set_par(info);
+        info->var = *var;
-                                if (ret) {
+        if (info->fbops->fb_set_par) {
-                                        info->var = old_var;
+                ret = info->fbops->fb_set_par(info);
-                                        printk(KERN_WARNING "detected "
-                                                "fb_set_par error, "
-                                                "error code: %d\n", ret);
-                                        goto done;
-                                }
-                        }
-                        fb_pan_display(info, &info->var);
+                if (ret) {
-                        fb_set_cmap(&info->cmap, info);
+                        info->var = old_var;
-                        fb_var_to_videomode(&mode, &info->var);
+                        printk(KERN_WARNING "detected "
+                                "fb_set_par error, "
+                                "error code: %d\n", ret);
+                        return ret;
+                }
+        }
-                        if (info->modelist.prev && info->modelist.next &&
+        fb_pan_display(info, &info->var);
-                            !list_empty(&info->modelist))
+        fb_set_cmap(&info->cmap, info);
-                                ret = fb_add_videomode(&mode, &info->modelist);
+        fb_var_to_videomode(&mode, &info->var);
-                        if (!ret && (flags & FBINFO_MISC_USEREVENT)) {
+        if (info->modelist.prev && info->modelist.next &&
-                                struct fb_event event;
+            !list_empty(&info->modelist))
-                                int evnt = (activate & FB_ACTIVATE_ALL) ?
+                ret = fb_add_videomode(&mode, &info->modelist);
-                                        FB_EVENT_MODE_CHANGE_ALL :
-                                        FB_EVENT_MODE_CHANGE;
-                                info->flags &= ~FBINFO_MISC_USEREVENT;
+        if (ret)
-                                event.info = info;
+                return ret;
-                                event.data = &mode;
-                                fb_notifier_call_chain(evnt, &event);
-                        }
-                }
-        }
- done:
+        event.info = info;
-        return ret;
+        event.data = &mode;
+        fb_notifier_call_chain(FB_EVENT_MODE_CHANGE, &event);
+        if (flags & FBINFO_MISC_USEREVENT)
+                fbcon_update_vcs(info, activate & FB_ACTIVATE_ALL);
+        return 0;
 }
 EXPORT_SYMBOL(fb_set_var);
@@ -1112,17 +1092,14 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
        struct fb_ops *fb;
        struct fb_var_screeninfo var;
        struct fb_fix_screeninfo fix;
-        struct fb_con2fbmap con2fb;
        struct fb_cmap cmap_from;
        struct fb_cmap_user cmap;
-        struct fb_event event;
        void __user *argp = (void __user *)arg;
        long ret = 0;
        switch (cmd) {
        case FBIOGET_VSCREENINFO:
-                if (!lock_fb_info(info))
+                lock_fb_info(info);
-                        return -ENODEV;
                var = info->var;
                unlock_fb_info(info);
@@ -1132,10 +1109,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                if (copy_from_user(&var, argp, sizeof(var)))
                        return -EFAULT;
                console_lock();
-                if (!lock_fb_info(info)) {
+                lock_fb_info(info);
-                        console_unlock();
-                        return -ENODEV;
-                }
                info->flags |= FBINFO_MISC_USEREVENT;
                ret = fb_set_var(info, &var);
                info->flags &= ~FBINFO_MISC_USEREVENT;
@@ -1145,8 +1119,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                        ret = -EFAULT;
                break;
        case FBIOGET_FSCREENINFO:
-                if (!lock_fb_info(info))
+                lock_fb_info(info);
-                        return -ENODEV;
                fix = info->fix;
                if (info->flags & FBINFO_HIDE_SMEM_START)
                        fix.smem_start = 0;
@@ -1162,8 +1135,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
        case FBIOGETCMAP:
                if (copy_from_user(&cmap, argp, sizeof(cmap)))
                        return -EFAULT;
-                if (!lock_fb_info(info))
+                lock_fb_info(info);
-                        return -ENODEV;
                cmap_from = info->cmap;
                unlock_fb_info(info);
                ret = fb_cmap_to_user(&cmap_from, &cmap);
@@ -1172,10 +1144,7 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                if (copy_from_user(&var, argp, sizeof(var)))
                        return -EFAULT;
                console_lock();
-                if (!lock_fb_info(info)) {
+                lock_fb_info(info);
-                        console_unlock();
-                        return -ENODEV;
-                }
                ret = fb_pan_display(info, &var);
                unlock_fb_info(info);
                console_unlock();
@@ -1186,58 +1155,22 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
                ret = -EINVAL;
                break;
        case FBIOGET_CON2FBMAP:
-                if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+                ret = fbcon_get_con2fb_map_ioctl(argp);
-                        return -EFAULT;
-                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                        return -EINVAL;
-                con2fb.framebuffer = -1;
-                event.data = &con2fb;
-                if (!lock_fb_info(info))
-                        return -ENODEV;
-                event.info = info;
-                fb_notifier_call_chain(FB_EVENT_GET_CONSOLE_MAP, &event);
-                unlock_fb_info(info);
-                ret = copy_to_user(argp, &con2fb, sizeof(con2fb)) ? -EFAULT : 0;
                break;
        case FBIOPUT_CON2FBMAP:
-                if (copy_from_user(&con2fb, argp, sizeof(con2fb)))
+                ret = fbcon_set_con2fb_map_ioctl(argp);
-                        return -EFAULT;
-                if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES)
-                        return -EINVAL;
-                if (con2fb.framebuffer >= FB_MAX)
-                        return -EINVAL;
-                if (!registered_fb[con2fb.framebuffer])
-                        request_module("fb%d", con2fb.framebuffer);
-                if (!registered_fb[con2fb.framebuffer]) {
-                        ret = -EINVAL;
-                        break;
-                }
-                event.data = &con2fb;
-                console_lock();
-                if (!lock_fb_info(info)) {
-                        console_unlock();
-                        return -ENODEV;
-                }
-                event.info = info;
-                ret = fb_notifier_call_chain(FB_EVENT_SET_CONSOLE_MAP, &event);
-                unlock_fb_info(info);
-                console_unlock();
                break;
        case FBIOBLANK:
                console_lock();
-                if (!lock_fb_info(info)) {
+                lock_fb_info(info);
-                        console_unlock();
-                        return -ENODEV;
-                }
-                info->flags |= FBINFO_MISC_USEREVENT;
                ret = fb_blank(info, arg);
-                info->flags &= ~FBINFO_MISC_USEREVENT;
+                /* might again call into fb_blank */
+                fbcon_fb_blanked(info, arg);
                unlock_fb_info(info);
                console_unlock();
                break;
        default:
-                if (!lock_fb_info(info))
+                lock_fb_info(info);
-                        return -ENODEV;
                fb = info->fbops;
                if (fb->fb_ioctl)
                        ret = fb->fb_ioctl(info, cmd, arg);
@@ -1357,8 +1290,7 @@ static int fb_get_fscreeninfo(struct fb_info *info, unsigned int cmd,
 {
        struct fb_fix_screeninfo fix;
-        if (!lock_fb_info(info))
+        lock_fb_info(info);
-                return -ENODEV;
        fix = info->fix;
        if (info->flags & FBINFO_HIDE_SMEM_START)
                fix.smem_start = 0;
@@ -1418,8 +1350,6 @@ fb_mmap(struct file *file, struct vm_area_struct * vma)
        if (!info)
                return -ENODEV;
        fb = info->fbops;
-        if (!fb)
-                return -ENODEV;
        mutex_lock(&info->mm_lock);
        if (fb->fb_mmap) {
                int res;
@@ -1483,7 +1413,7 @@ __releases(&info->lock)
        if (IS_ERR(info))
                return PTR_ERR(info);
-        mutex_lock(&info->lock);
+        lock_fb_info(info);
        if (!try_module_get(info->fbops->owner)) {
                res = -ENODEV;
                goto out;
@@ -1499,7 +1429,7 @@ __releases(&info->lock)
                fb_deferred_io_open(info, inode, file);
 #endif
 out:
-        mutex_unlock(&info->lock);
+        unlock_fb_info(info);
        if (res)
                put_fb_info(info);
        return res;
@@ -1512,11 +1442,11 @@ __releases(&info->lock)
 {
        struct fb_info * const info = file->private_data;
-        mutex_lock(&info->lock);
+        lock_fb_info(info);
        if (info->fbops->fb_release)
                info->fbops->fb_release(info,1);
        module_put(info->fbops->owner);
-        mutex_unlock(&info->lock);
+        unlock_fb_info(info);
        put_fb_info(info);
        return 0;
 }
@@ -1621,13 +1551,13 @@ static bool fb_do_apertures_overlap(struct apertures_struct *gena,
        return false;
 }
-static int do_unregister_framebuffer(struct fb_info *fb_info);
+static void do_unregister_framebuffer(struct fb_info *fb_info);
 #define VGA_FB_PHYS 0xA0000
-static int do_remove_conflicting_framebuffers(struct apertures_struct *a,
+static void do_remove_conflicting_framebuffers(struct apertures_struct *a,
-                                              const char *name, bool primary)
+                                               const char *name, bool primary)
 {
-        int i, ret;
+        int i;
        /* check all firmware fbs and kick off if the base addr overlaps */
        for_each_registered_fb(i) {
@@ -1643,13 +1573,9 @@ static int do_remove_conflicting_framebuffers(struct apertures_struct *a,
                        printk(KERN_INFO "fb%d: switching to %s from %s\n",
                               i, name, registered_fb[i]->fix.id);
-                        ret = do_unregister_framebuffer(registered_fb[i]);
+                        do_unregister_framebuffer(registered_fb[i]);
-                        if (ret)
-                                return ret;
                }
        }
-        return 0;
 }
 static bool lockless_register_fb;
@@ -1660,17 +1586,14 @@ MODULE_PARM_DESC(lockless_register_fb,
 static int do_register_framebuffer(struct fb_info *fb_info)
 {
        int i, ret;
-        struct fb_event event;
        struct fb_videomode mode;
        if (fb_check_foreignness(fb_info))
                return -ENOSYS;
-        ret = do_remove_conflicting_framebuffers(fb_info->apertures,
+        do_remove_conflicting_framebuffers(fb_info->apertures,
-                                                 fb_info->fix.id,
+                                           fb_info->fix.id,
-                                                 fb_is_primary_device(fb_info));
+                                           fb_is_primary_device(fb_info));
-        if (ret)
-                return ret;
        if (num_registered_fb == FB_MAX)
                return -ENXIO;
@@ -1723,20 +1646,22 @@ static int do_register_framebuffer(struct fb_info *fb_info)
        fb_add_videomode(&mode, &fb_info->modelist);
        registered_fb[i] = fb_info;
-        event.info = fb_info;
+#ifdef CONFIG_GUMSTIX_AM200EPD
+        {
+                struct fb_event event;
+                event.info = fb_info;
+                fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
+        }
+#endif
        if (!lockless_register_fb)
                console_lock();
        else
                atomic_inc(&ignore_console_lock_warning);
-        if (!lock_fb_info(fb_info)) {
+        lock_fb_info(fb_info);
-                ret = -ENODEV;
+        ret = fbcon_fb_registered(fb_info);
-                goto unlock_console;
-        }
-        ret = 0;
-        fb_notifier_call_chain(FB_EVENT_FB_REGISTERED, &event);
        unlock_fb_info(fb_info);
-unlock_console:
        if (!lockless_register_fb)
                console_unlock();
        else
@@ -1744,44 +1669,44 @@ unlock_console:
        return ret;
 }
-static int unbind_console(struct fb_info *fb_info)
+static void unbind_console(struct fb_info *fb_info)
 {
-        struct fb_event event;
-        int ret;
        int i = fb_info->node;
-        if (i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)
+        if (WARN_ON(i < 0 || i >= FB_MAX || registered_fb[i] != fb_info))
-                return -EINVAL;
+                return;
        console_lock();
-        if (!lock_fb_info(fb_info)) {
+        lock_fb_info(fb_info);
-                console_unlock();
+        fbcon_fb_unbind(fb_info);
-                return -ENODEV;
-        }
-        event.info = fb_info;
-        ret = fb_notifier_call_chain(FB_EVENT_FB_UNBIND, &event);
        unlock_fb_info(fb_info);
        console_unlock();
-        return ret;
 }
-static int __unlink_framebuffer(struct fb_info *fb_info);
+void unlink_framebuffer(struct fb_info *fb_info)
-static int do_unregister_framebuffer(struct fb_info *fb_info)
 {
-        struct fb_event event;
+        int i;
-        int ret;
+        i = fb_info->node;
+        if (WARN_ON(i < 0 || i >= FB_MAX || registered_fb[i] != fb_info))
+                return;
-        ret = unbind_console(fb_info);
+        if (!fb_info->dev)
+                return;
-        if (ret)
+        device_destroy(fb_class, MKDEV(FB_MAJOR, i));
-                return -EINVAL;
        pm_vt_switch_unregister(fb_info->dev);
-        __unlink_framebuffer(fb_info);
+        unbind_console(fb_info);
+        fb_info->dev = NULL;
+}
+EXPORT_SYMBOL(unlink_framebuffer);
+static void do_unregister_framebuffer(struct fb_info *fb_info)
+{
+        unlink_framebuffer(fb_info);
        if (fb_info->pixmap.addr &&
            (fb_info->pixmap.flags & FB_PIXMAP_DEFAULT))
                kfree(fb_info->pixmap.addr);
@@ -1789,46 +1714,21 @@ static int do_unregister_framebuffer(struct fb_info *fb_info)
        registered_fb[fb_info->node] = NULL;
        num_registered_fb--;
        fb_cleanup_device(fb_info);
-        event.info = fb_info;
+#ifdef CONFIG_GUMSTIX_AM200EPD
+        {
+                struct fb_event event;
+                event.info = fb_info;
+                fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
+        }
+#endif
        console_lock();
-        fb_notifier_call_chain(FB_EVENT_FB_UNREGISTERED, &event);
+        fbcon_fb_unregistered(fb_info);
        console_unlock();
        /* this may free fb info */
        put_fb_info(fb_info);
-        return 0;
 }
-static int __unlink_framebuffer(struct fb_info *fb_info)
-{
-        int i;
-        i = fb_info->node;
-        if (i < 0 || i >= FB_MAX || registered_fb[i] != fb_info)
-                return -EINVAL;
-        if (fb_info->dev) {
-                device_destroy(fb_class, MKDEV(FB_MAJOR, i));
-                fb_info->dev = NULL;
-        }
-        return 0;
-}
-int unlink_framebuffer(struct fb_info *fb_info)
-{
-        int ret;
-        ret = __unlink_framebuffer(fb_info);
-        if (ret)
-                return ret;
-        unbind_console(fb_info);
-        return 0;
-}
-EXPORT_SYMBOL(unlink_framebuffer);
 /**
 * remove_conflicting_framebuffers - remove firmware-configured framebuffers
 * @a: memory range, users of which are to be removed
@@ -1842,7 +1742,6 @@ EXPORT_SYMBOL(unlink_framebuffer);
 int remove_conflicting_framebuffers(struct apertures_struct *a,
                                    const char *name, bool primary)
 {
-        int ret;
        bool do_free = false;
        if (!a) {
@@ -1856,13 +1755,13 @@ int remove_conflicting_framebuffers(struct apertures_struct *a,
        }
        mutex_lock(&registration_lock);
-        ret = do_remove_conflicting_framebuffers(a, name, primary);
+        do_remove_conflicting_framebuffers(a, name, primary);
        mutex_unlock(&registration_lock);
        if (do_free)
                kfree(a);
-        return ret;
+        return 0;
 }
 EXPORT_SYMBOL(remove_conflicting_framebuffers);
@@ -1959,16 +1858,12 @@ EXPORT_SYMBOL(register_framebuffer);
 *      that the driver implements fb_open() and fb_release() to
 *      check that no processes are using the device.
 */
-int
+void
 unregister_framebuffer(struct fb_info *fb_info)
 {
-        int ret;
        mutex_lock(&registration_lock);
-        ret = do_unregister_framebuffer(fb_info);
+        do_unregister_framebuffer(fb_info);
        mutex_unlock(&registration_lock);
-        return ret;
 }
 EXPORT_SYMBOL(unregister_framebuffer);
@@ -1983,15 +1878,14 @@ EXPORT_SYMBOL(unregister_framebuffer);
 */
 void fb_set_suspend(struct fb_info *info, int state)
 {
-        struct fb_event event;
+        WARN_CONSOLE_UNLOCKED();
-        event.info = info;
        if (state) {
-                fb_notifier_call_chain(FB_EVENT_SUSPEND, &event);
+                fbcon_suspended(info);
                info->state = FBINFO_STATE_SUSPENDED;
        } else {
                info->state = FBINFO_STATE_RUNNING;
-                fb_notifier_call_chain(FB_EVENT_RESUME, &event);
+                fbcon_resumed(info);
        }
 }
 EXPORT_SYMBOL(fb_set_suspend);
@@ -2059,7 +1953,6 @@ subsys_initcall(fbmem_init);
 int fb_new_modelist(struct fb_info *info)
 {
-        struct fb_event event;
        struct fb_var_screeninfo var = info->var;
        struct list_head *pos, *n;
        struct fb_modelist *modelist;
@@ -2079,14 +1972,12 @@ int fb_new_modelist(struct fb_info *info)
                }
        }
-        err = 1;
+        if (list_empty(&info->modelist))
+                return 1;
-        if (!list_empty(&info->modelist)) {
+        fbcon_new_modelist(info);
-                event.info = info;
-                err = fb_notifier_call_chain(FB_EVENT_NEW_MODELIST, &event);
-        }
-        return err;
+        return 0;
 }
 MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbdev/core/fbsysfs.c b/drivers/video/fbdev/core/fbsysfs.c
index 954ed99e80da..d54c88f88991 100644
--- a/drivers/video/fbdev/core/fbsysfs.c
+++ b/drivers/video/fbdev/core/fbsysfs.c
@@ -14,6 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/slab.h>
 #include <linux/fb.h>
+#include <linux/fbcon.h>
 #include <linux/console.h>
 #include <linux/module.h>
@@ -175,10 +176,7 @@ static ssize_t store_modes(struct device *device,
                return -EINVAL;
        console_lock();
-        if (!lock_fb_info(fb_info)) {
+        lock_fb_info(fb_info);
-                console_unlock();
-                return -ENODEV;
-        }
        list_splice(&fb_info->modelist, &old_list);
        fb_videomode_to_modelist((const struct fb_videomode *)buf, i,
@@ -304,12 +302,13 @@ static ssize_t store_blank(struct device *device,
 {
        struct fb_info *fb_info = dev_get_drvdata(device);
        char *last = NULL;
-        int err;
+        int err, arg;
+        arg = simple_strtoul(buf, &last, 0);
        console_lock();
-        fb_info->flags |= FBINFO_MISC_USEREVENT;
+        err = fb_blank(fb_info, arg);
-        err = fb_blank(fb_info, simple_strtoul(buf, &last, 0));
+        /* might again call into fb_blank */
-        fb_info->flags &= ~FBINFO_MISC_USEREVENT;
+        fbcon_fb_blanked(fb_info, arg);
        console_unlock();
        if (err < 0)
                return err;
@@ -405,10 +404,7 @@ static ssize_t store_fbstate(struct device *device,
        state = simple_strtoul(buf, &last, 0);
        console_lock();
-        if (!lock_fb_info(fb_info)) {
+        lock_fb_info(fb_info);
-                console_unlock();
-                return -ENODEV;
-        }
        fb_set_suspend(fb_info, (int)state);
diff --git a/drivers/video/fbdev/cyber2000fb.c b/drivers/video/fbdev/cyber2000fb.c
index 0de12be823c0..3a2d9ff0aa42 100644
--- a/drivers/video/fbdev/cyber2000fb.c
+++ b/drivers/video/fbdev/cyber2000fb.c
@@ -58,7 +58,6 @@
 struct cfb_info {
        struct fb_info          fb;
        struct display_switch   *dispsw;
-        struct display          *display;
        unsigned char           __iomem *region;
        unsigned char           __iomem *regs;
        u_int                   id;
@@ -1639,10 +1638,6 @@ static void cyberpro_common_resume(struct cfb_info *cfb)
 }
 /*
- * PCI specific support.
- */
-#ifdef CONFIG_PCI
-/*
 * We need to wake up the CyberPro, and make sure its in linear memory
 * mode.  Unfortunately, this is specific to the platform and card that
 * we are running on.
@@ -1858,7 +1853,6 @@ static struct pci_driver cyberpro_driver = {
        .resume         = cyberpro_pci_resume,
        .id_table       = cyberpro_pci_table
 };
-#endif
 /*
 * I don't think we can use the "module_init" stuff here because
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 9ea817ac1d81..b1cf248f3291 100644
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -1387,7 +1387,6 @@ static int fb_probe(struct platform_device *device)
        da8xx_fb_info = framebuffer_alloc(sizeof(struct da8xx_fb_par),
                                        &device->dev);
        if (!da8xx_fb_info) {
-                dev_dbg(&device->dev, "Memory allocation failed for fb_info\n");
                ret = -ENOMEM;
                goto err_pm_runtime_disable;
        }
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 9f39f0c360e0..04a22663b4fb 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -169,6 +169,11 @@ static void efifb_show_boot_graphics(struct fb_info *info)
                return;
        }
+        if (bgrt_tab.status & 0x06) {
+                pr_info("efifb: BGRT rotation bits set, not showing boot graphics\n");
+                return;
+        }
        /* Avoid flashing the logo if we're going to print std probe messages */
        if (console_loglevel > CONSOLE_LOGLEVEL_QUIET)
                return;
@@ -448,7 +453,6 @@ static int efifb_probe(struct platform_device *dev)
        info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
        if (!info) {
-                pr_err("efifb: cannot allocate framebuffer\n");
                err = -ENOMEM;
                goto err_release_mem;
        }
diff --git a/drivers/video/fbdev/gbefb.c b/drivers/video/fbdev/gbefb.c
index 3fcb33232ba3..b9f6a82a0495 100644
--- a/drivers/video/fbdev/gbefb.c
+++ b/drivers/video/fbdev/gbefb.c
@@ -39,9 +39,7 @@ struct gbefb_par {
        int valid;
 };
-#ifdef CONFIG_SGI_IP32
 #define GBE_BASE        0x16000000 /* SGI O2 */
-#endif
 /* macro for fastest write-though access to the framebuffer */
 #ifdef CONFIG_MIPS
@@ -51,10 +49,6 @@ struct gbefb_par {
 #define pgprot_fb(_prot) (((_prot) & (~_CACHE_MASK)) | _CACHE_CACHABLE_NO_WA)
 #endif
 #endif
-#ifdef CONFIG_X86
-#define pgprot_fb(_prot) (((_prot) & ~_PAGE_CACHE_MASK) |       \
-                          cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS))
-#endif
 /*
 *  RAM we reserve for the frame buffer. This defines the maximum screen
@@ -279,7 +273,7 @@ static void gbe_turn_off(void)
        val = 0;
        SET_GBE_FIELD(VT_XY, FREEZE, val, 1);
        gbe->vt_xy = val;
-        udelay(10000);
+        mdelay(10);
        for (i = 0; i < 10000; i++) {
                val = gbe->vt_xy;
                if (GET_GBE_FIELD(VT_XY, FREEZE, val) != 1)
@@ -294,7 +288,7 @@ static void gbe_turn_off(void)
        val = gbe->dotclock;
        SET_GBE_FIELD(DOTCLK, RUN, val, 0);
        gbe->dotclock = val;
-        udelay(10000);
+        mdelay(10);
        for (i = 0; i < 10000; i++) {
                val = gbe->dotclock;
                if (GET_GBE_FIELD(DOTCLK, RUN, val))
@@ -331,7 +325,7 @@ static void gbe_turn_on(void)
        val = gbe->dotclock;
        SET_GBE_FIELD(DOTCLK, RUN, val, 1);
        gbe->dotclock = val;
-        udelay(10000);
+        mdelay(10);
        for (i = 0; i < 10000; i++) {
                val = gbe->dotclock;
                if (GET_GBE_FIELD(DOTCLK, RUN, val) != 1)
@@ -346,7 +340,7 @@ static void gbe_turn_on(void)
        val = 0;
        SET_GBE_FIELD(VT_XY, FREEZE, val, 0);
        gbe->vt_xy = val;
-        udelay(10000);
+        mdelay(10);
        for (i = 0; i < 10000; i++) {
                val = gbe->vt_xy;
                if (GET_GBE_FIELD(VT_XY, FREEZE, val))
@@ -547,7 +541,7 @@ static void gbe_set_timing_info(struct gbe_timing_info *timing)
        SET_GBE_FIELD(DOTCLK, P, val, timing->pll_p);
        SET_GBE_FIELD(DOTCLK, RUN, val, 0);     /* do not start yet */
        gbe->dotclock = val;
-        udelay(10000);
+        mdelay(10);
        /* setup pixel counter */
        val = 0;
@@ -1018,9 +1012,10 @@ static int gbefb_mmap(struct fb_info *info,
        /* remap using the fastest write-through mode on architecture */
        /* try not polluting the cache when possible */
+#ifdef CONFIG_MIPS
        pgprot_val(vma->vm_page_prot) =
                pgprot_fb(pgprot_val(vma->vm_page_prot));
+#endif
        /* VM_IO | VM_DONTEXPAND | VM_DONTDUMP are set by remap_pfn_range() */
        /* look for the starting tile */
diff --git a/drivers/video/fbdev/grvga.c b/drivers/video/fbdev/grvga.c
index df5d546e57e9..d22e8b0c906d 100644
--- a/drivers/video/fbdev/grvga.c
+++ b/drivers/video/fbdev/grvga.c
@@ -336,10 +336,8 @@ static int grvga_probe(struct platform_device *dev)
        char *options = NULL, *mode_opt = NULL;
        info = framebuffer_alloc(sizeof(struct grvga_par), &dev->dev);
-        if (!info) {
+        if (!info)
-                dev_err(&dev->dev, "framebuffer_alloc failed\n");
                return -ENOMEM;
-        }
        /* Expecting: "grvga: modestring, [addr:<framebuffer physical address>], [size:<framebuffer size>]
         *
diff --git a/drivers/video/fbdev/gxt4500.c b/drivers/video/fbdev/gxt4500.c
index 37527a10b954..c7502fd8f447 100644
--- a/drivers/video/fbdev/gxt4500.c
+++ b/drivers/video/fbdev/gxt4500.c
@@ -643,10 +643,9 @@ static int gxt4500_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
        info = framebuffer_alloc(sizeof(struct gxt4500_par), &pdev->dev);
-        if (!info) {
+        if (!info)
-                dev_err(&pdev->dev, "gxt4500: cannot alloc FB info record\n");
                goto err_free_fb;
-        }
        par = info->par;
        cardtype = ent->driver_data;
        par->refclk_ps = cardinfo[cardtype].refclk_ps;
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 00f5bdcc6c6f..2dcb7c58b31e 100644
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -762,10 +762,8 @@ static int hvfb_probe(struct hv_device *hdev,
        int ret;
        info = framebuffer_alloc(sizeof(struct hvfb_par), &hdev->device);
-        if (!info) {
+        if (!info)
-                pr_err("No memory for framebuffer info\n");
                return -ENOMEM;
-        }
        par = info->par;
        par->info = info;
diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c
index 24d3280a5b5f..347cf8babc3e 100644
--- a/drivers/video/fbdev/i740fb.c
+++ b/drivers/video/fbdev/i740fb.c
@@ -1006,10 +1006,8 @@ static int i740fb_probe(struct pci_dev *dev, const struct pci_device_id *ent)
        u8 *edid;
        info = framebuffer_alloc(sizeof(struct i740fb_par), &(dev->dev));
-        if (!info) {
+        if (!info)
-                dev_err(&(dev->dev), "cannot allocate framebuffer\n");
                return -ENOMEM;
-        }
        par = info->par;
        mutex_init(&par->open_lock);
diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c
index 35bba3c2036d..58b01c7d9056 100644
--- a/drivers/video/fbdev/imsttfb.c
+++ b/drivers/video/fbdev/imsttfb.c
@@ -1477,11 +1477,8 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                printk(KERN_ERR "imsttfb: no OF node for pci device\n");
        info = framebuffer_alloc(sizeof(struct imstt_par), &pdev->dev);
+        if (!info)
-        if (!info) {
-                printk(KERN_ERR "imsttfb: Can't allocate memory\n");
                return -ENOMEM;
-        }
        par = info->par;
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index c4eb8661f751..b3286d1fa543 100644
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -974,10 +974,9 @@ static int imxfb_probe(struct platform_device *pdev)
        }
        fbi->map_size = PAGE_ALIGN(info->fix.smem_len);
-        info->screen_base = dma_alloc_wc(&pdev->dev, fbi->map_size,
+        info->screen_buffer = dma_alloc_wc(&pdev->dev, fbi->map_size,
-                                         &fbi->map_dma, GFP_KERNEL);
+                                           &fbi->map_dma, GFP_KERNEL);
+        if (!info->screen_buffer) {
-        if (!info->screen_base) {
                dev_err(&pdev->dev, "Failed to allocate video RAM: %d\n", ret);
                ret = -ENOMEM;
                goto failed_map;
@@ -1046,7 +1045,7 @@ failed_cmap:
        if (pdata && pdata->exit)
                pdata->exit(fbi->pdev);
 failed_platform_init:
-        dma_free_wc(&pdev->dev, fbi->map_size, info->screen_base,
+        dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
                    fbi->map_dma);
 failed_map:
        iounmap(fbi->regs);
@@ -1077,7 +1076,7 @@ static int imxfb_remove(struct platform_device *pdev)
        pdata = dev_get_platdata(&pdev->dev);
        if (pdata && pdata->exit)
                pdata->exit(fbi->pdev);
-        dma_free_wc(&pdev->dev, fbi->map_size, info->screen_base,
+        dma_free_wc(&pdev->dev, fbi->map_size, info->screen_buffer,
                    fbi->map_dma);
        iounmap(fbi->regs);
        release_mem_region(res->start, resource_size(res));
diff --git a/drivers/video/fbdev/intelfb/intelfbdrv.c b/drivers/video/fbdev/intelfb/intelfbdrv.c
index d7463a2a5d83..a76c61512c60 100644
--- a/drivers/video/fbdev/intelfb/intelfbdrv.c
+++ b/drivers/video/fbdev/intelfb/intelfbdrv.c
@@ -491,10 +491,9 @@ static int intelfb_pci_register(struct pci_dev *pdev,
        }
        info = framebuffer_alloc(sizeof(struct intelfb_info), &pdev->dev);
-        if (!info) {
+        if (!info)
-                ERR_MSG("Could not allocate memory for intelfb_info.\n");
+                return -ENOMEM;
-                return -ENODEV;
-        }
        if (fb_alloc_cmap(&info->cmap, 256, 1) < 0) {
                ERR_MSG("Could not allocate cmap for intelfb_info.\n");
                goto err_out_cmap;
diff --git a/drivers/video/fbdev/jz4740_fb.c b/drivers/video/fbdev/jz4740_fb.c
index 145095655cc2..0b6fa25f6924 100644
--- a/drivers/video/fbdev/jz4740_fb.c
+++ b/drivers/video/fbdev/jz4740_fb.c
@@ -457,7 +457,6 @@ static int jzfb_alloc_devmem(struct jzfb *jzfb)
 {
        int max_videosize = 0;
        struct fb_videomode *mode = jzfb->pdata->modes;
-        void *page;
        int i;
        for (i = 0; i < jzfb->pdata->num_modes; ++mode, ++i) {
@@ -482,12 +481,6 @@ static int jzfb_alloc_devmem(struct jzfb *jzfb)
        if (!jzfb->vidmem)
                goto err_free_framedesc;
-        for (page = jzfb->vidmem;
-                 page < jzfb->vidmem + PAGE_ALIGN(jzfb->vidmem_size);
-                 page += PAGE_SIZE) {
-                SetPageReserved(virt_to_page(page));
-        }
        jzfb->framedesc->next = jzfb->framedesc_phys;
        jzfb->framedesc->addr = jzfb->vidmem_phys;
        jzfb->framedesc->id = 0xdeafbead;
@@ -535,10 +528,8 @@ static int jzfb_probe(struct platform_device *pdev)
        }
        fb = framebuffer_alloc(sizeof(struct jzfb), &pdev->dev);
-        if (!fb) {
+        if (!fb)
-                dev_err(&pdev->dev, "Failed to allocate framebuffer device\n");
                return -ENOMEM;
-        }
        fb->fbops = &jzfb_ops;
        fb->flags = FBINFO_DEFAULT;
diff --git a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
index c0c2600c2167..962c0171d271 100644
--- a/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/fbdev/mb862xx/mb862xxfbdrv.c
@@ -680,10 +680,8 @@ static int of_platform_mb862xx_probe(struct platform_device *ofdev)
        }
        info = framebuffer_alloc(sizeof(struct mb862xxfb_par), dev);
-        if (info == NULL) {
+        if (!info)
-                dev_err(dev, "cannot allocate framebuffer\n");
                return -ENOMEM;
-        }
        par = info->par;
        par->info = info;
@@ -1005,7 +1003,6 @@ static int mb862xx_pci_probe(struct pci_dev *pdev,
        info = framebuffer_alloc(sizeof(struct mb862xxfb_par), dev);
        if (!info) {
-                dev_err(dev, "framebuffer alloc failed\n");
                ret = -ENOMEM;
                goto dis_dev;
        }
diff --git a/drivers/video/fbdev/mbx/mbxfb.c b/drivers/video/fbdev/mbx/mbxfb.c
index 6ded480a69b4..50935252b50b 100644
--- a/drivers/video/fbdev/mbx/mbxfb.c
+++ b/drivers/video/fbdev/mbx/mbxfb.c
@@ -899,10 +899,8 @@ static int mbxfb_probe(struct platform_device *dev)
        }
        fbi = framebuffer_alloc(sizeof(struct mbxfb_info), &dev->dev);
-        if (fbi == NULL) {
+        if (!fbi)
-                dev_err(&dev->dev, "framebuffer_alloc failed\n");
                return -ENOMEM;
-        }
        mfbi = fbi->par;
        fbi->pseudo_palette = mfbi->pseudo_palette;
diff --git a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
index 87d943f15a12..17174cd7a5bb 100644
--- a/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
+++ b/drivers/video/fbdev/mmp/hw/mmp_ctrl.c
@@ -433,7 +433,7 @@ static int mmphw_probe(struct platform_device *pdev)
 {
        struct mmp_mach_plat_info *mi;
        struct resource *res;
-        int ret, i, size, irq;
+        int ret, i, irq;
        struct mmphw_path_plat *path_plat;
        struct mmphw_ctrl *ctrl = NULL;
@@ -461,9 +461,9 @@ static int mmphw_probe(struct platform_device *pdev)
        }
        /* allocate */
-        size = sizeof(struct mmphw_ctrl) + sizeof(struct mmphw_path_plat) *
+        ctrl = devm_kzalloc(&pdev->dev,
-               mi->path_num;
+                            struct_size(ctrl, path_plats, mi->path_num),
-        ctrl = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
+                            GFP_KERNEL);
        if (!ctrl) {
                ret = -ENOMEM;
                goto failed;
diff --git a/drivers/video/fbdev/mxsfb.c b/drivers/video/fbdev/mxsfb.c
deleted file mode 100644
index d8bebe35b410..000000000000
--- a/drivers/video/fbdev/mxsfb.c
+++ /dev/null
@@ -1,1028 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (C) 2010 Juergen Beisert, Pengutronix
- *
- * This code is based on:
- * Author: Vitaly Wool <vital@embeddedalley.com>
- *
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved.
- */
-#define DRIVER_NAME "mxsfb"
-/**
- * @file
- * @brief LCDIF driver for i.MX23 and i.MX28
- *
- * The LCDIF support four modes of operation
- * - MPU interface (to drive smart displays) -> not supported yet
- * - VSYNC interface (like MPU interface plus Vsync) -> not supported yet
- * - Dotclock interface (to drive LC displays with RGB data and sync signals)
- * - DVI (to drive ITU-R BT656)  -> not supported yet
- *
- * This driver depends on a correct setup of the pins used for this purpose
- * (platform specific).
- *
- * For the developer: Don't forget to set the data bus width to the display
- * in the imx_fb_videomode structure. You will else end up with ugly colours.
- * If you fight against jitter you can vary the clock delay. This is a feature
- * of the i.MX28 and you can vary it between 2 ns ... 8 ns in 2 ns steps. Give
- * the required value in the imx_fb_videomode structure.
- */
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/of_device.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/dma-mapping.h>
-#include <linux/io.h>
-#include <linux/fb.h>
-#include <linux/regulator/consumer.h>
-#include <video/of_display_timing.h>
-#include <video/of_videomode.h>
-#include <video/videomode.h>
-#define REG_SET 4
-#define REG_CLR 8
-#define LCDC_CTRL                       0x00
-#define LCDC_CTRL1                      0x10
-#define LCDC_V4_CTRL2                   0x20
-#define LCDC_V3_TRANSFER_COUNT          0x20
-#define LCDC_V4_TRANSFER_COUNT          0x30
-#define LCDC_V4_CUR_BUF                 0x40
-#define LCDC_V4_NEXT_BUF                0x50
-#define LCDC_V3_CUR_BUF                 0x30
-#define LCDC_V3_NEXT_BUF                0x40
-#define LCDC_TIMING                     0x60
-#define LCDC_VDCTRL0                    0x70
-#define LCDC_VDCTRL1                    0x80
-#define LCDC_VDCTRL2                    0x90
-#define LCDC_VDCTRL3                    0xa0
-#define LCDC_VDCTRL4                    0xb0
-#define LCDC_DVICTRL0                   0xc0
-#define LCDC_DVICTRL1                   0xd0
-#define LCDC_DVICTRL2                   0xe0
-#define LCDC_DVICTRL3                   0xf0
-#define LCDC_DVICTRL4                   0x100
-#define LCDC_V4_DATA                    0x180
-#define LCDC_V3_DATA                    0x1b0
-#define LCDC_V4_DEBUG0                  0x1d0
-#define LCDC_V3_DEBUG0                  0x1f0
-#define CTRL_SFTRST                     (1 << 31)
-#define CTRL_CLKGATE                    (1 << 30)
-#define CTRL_BYPASS_COUNT               (1 << 19)
-#define CTRL_VSYNC_MODE                 (1 << 18)
-#define CTRL_DOTCLK_MODE                (1 << 17)
-#define CTRL_DATA_SELECT                (1 << 16)
-#define CTRL_SET_BUS_WIDTH(x)           (((x) & 0x3) << 10)
-#define CTRL_GET_BUS_WIDTH(x)           (((x) >> 10) & 0x3)
-#define CTRL_SET_WORD_LENGTH(x)         (((x) & 0x3) << 8)
-#define CTRL_GET_WORD_LENGTH(x)         (((x) >> 8) & 0x3)
-#define CTRL_MASTER                     (1 << 5)
-#define CTRL_DF16                       (1 << 3)
-#define CTRL_DF18                       (1 << 2)
-#define CTRL_DF24                       (1 << 1)
-#define CTRL_RUN                        (1 << 0)
-#define CTRL1_FIFO_CLEAR                (1 << 21)
-#define CTRL1_SET_BYTE_PACKAGING(x)     (((x) & 0xf) << 16)
-#define CTRL1_GET_BYTE_PACKAGING(x)     (((x) >> 16) & 0xf)
-#define TRANSFER_COUNT_SET_VCOUNT(x)    (((x) & 0xffff) << 16)
-#define TRANSFER_COUNT_GET_VCOUNT(x)    (((x) >> 16) & 0xffff)
-#define TRANSFER_COUNT_SET_HCOUNT(x)    ((x) & 0xffff)
-#define TRANSFER_COUNT_GET_HCOUNT(x)    ((x) & 0xffff)
-#define VDCTRL0_ENABLE_PRESENT          (1 << 28)
-#define VDCTRL0_VSYNC_ACT_HIGH          (1 << 27)
-#define VDCTRL0_HSYNC_ACT_HIGH          (1 << 26)
-#define VDCTRL0_DOTCLK_ACT_FALLING      (1 << 25)
-#define VDCTRL0_ENABLE_ACT_HIGH         (1 << 24)
-#define VDCTRL0_VSYNC_PERIOD_UNIT       (1 << 21)
-#define VDCTRL0_VSYNC_PULSE_WIDTH_UNIT  (1 << 20)
-#define VDCTRL0_HALF_LINE               (1 << 19)
-#define VDCTRL0_HALF_LINE_MODE          (1 << 18)
-#define VDCTRL0_SET_VSYNC_PULSE_WIDTH(x) ((x) & 0x3ffff)
-#define VDCTRL0_GET_VSYNC_PULSE_WIDTH(x) ((x) & 0x3ffff)
-#define VDCTRL2_SET_HSYNC_PERIOD(x)     ((x) & 0x3ffff)
-#define VDCTRL2_GET_HSYNC_PERIOD(x)     ((x) & 0x3ffff)
-#define VDCTRL3_MUX_SYNC_SIGNALS        (1 << 29)
-#define VDCTRL3_VSYNC_ONLY              (1 << 28)
-#define SET_HOR_WAIT_CNT(x)             (((x) & 0xfff) << 16)
-#define GET_HOR_WAIT_CNT(x)             (((x) >> 16) & 0xfff)
-#define SET_VERT_WAIT_CNT(x)            ((x) & 0xffff)
-#define GET_VERT_WAIT_CNT(x)            ((x) & 0xffff)
-#define VDCTRL4_SET_DOTCLK_DLY(x)       (((x) & 0x7) << 29) /* v4 only */
-#define VDCTRL4_GET_DOTCLK_DLY(x)       (((x) >> 29) & 0x7) /* v4 only */
-#define VDCTRL4_SYNC_SIGNALS_ON         (1 << 18)
-#define SET_DOTCLK_H_VALID_DATA_CNT(x)  ((x) & 0x3ffff)
-#define DEBUG0_HSYNC                    (1 < 26)
-#define DEBUG0_VSYNC                    (1 < 25)
-#define MIN_XRES                        120
-#define MIN_YRES                        120
-#define RED 0
-#define GREEN 1
-#define BLUE 2
-#define TRANSP 3
-#define STMLCDIF_8BIT  1 /** pixel data bus to the display is of 8 bit width */
-#define STMLCDIF_16BIT 0 /** pixel data bus to the display is of 16 bit width */
-#define STMLCDIF_18BIT 2 /** pixel data bus to the display is of 18 bit width */
-#define STMLCDIF_24BIT 3 /** pixel data bus to the display is of 24 bit width */
-#define MXSFB_SYNC_DATA_ENABLE_HIGH_ACT (1 << 6)
-#define MXSFB_SYNC_DOTCLK_FALLING_ACT   (1 << 7) /* negative edge sampling */
-enum mxsfb_devtype {
-        MXSFB_V3,
-        MXSFB_V4,
-};
-/* CPU dependent register offsets */
-struct mxsfb_devdata {
-        unsigned transfer_count;
-        unsigned cur_buf;
-        unsigned next_buf;
-        unsigned debug0;
-        unsigned hs_wdth_mask;
-        unsigned hs_wdth_shift;
-        unsigned ipversion;
-};
-struct mxsfb_info {
-        struct platform_device *pdev;
-        struct clk *clk;
-        struct clk *clk_axi;
-        struct clk *clk_disp_axi;
-        void __iomem *base;     /* registers */
-        unsigned allocated_size;
-        int enabled;
-        unsigned ld_intf_width;
-        unsigned dotclk_delay;
-        const struct mxsfb_devdata *devdata;
-        u32 sync;
-        struct regulator *reg_lcd;
-        int pre_init;
-};
-#define mxsfb_is_v3(host) (host->devdata->ipversion == 3)
-#define mxsfb_is_v4(host) (host->devdata->ipversion == 4)
-static const struct mxsfb_devdata mxsfb_devdata[] = {
-        [MXSFB_V3] = {
-                .transfer_count = LCDC_V3_TRANSFER_COUNT,
-                .cur_buf = LCDC_V3_CUR_BUF,
-                .next_buf = LCDC_V3_NEXT_BUF,
-                .debug0 = LCDC_V3_DEBUG0,
-                .hs_wdth_mask = 0xff,
-                .hs_wdth_shift = 24,
-                .ipversion = 3,
-        },
-        [MXSFB_V4] = {
-                .transfer_count = LCDC_V4_TRANSFER_COUNT,
-                .cur_buf = LCDC_V4_CUR_BUF,
-                .next_buf = LCDC_V4_NEXT_BUF,
-                .debug0 = LCDC_V4_DEBUG0,
-                .hs_wdth_mask = 0x3fff,
-                .hs_wdth_shift = 18,
-                .ipversion = 4,
-        },
-};
-/* mask and shift depends on architecture */
-static inline u32 set_hsync_pulse_width(struct mxsfb_info *host, unsigned val)
-{
-        return (val & host->devdata->hs_wdth_mask) <<
-                host->devdata->hs_wdth_shift;
-}
-static inline u32 get_hsync_pulse_width(struct mxsfb_info *host, unsigned val)
-{
-        return (val >> host->devdata->hs_wdth_shift) &
-                host->devdata->hs_wdth_mask;
-}
-static const struct fb_bitfield def_rgb565[] = {
-        [RED] = {
-                .offset = 11,
-                .length = 5,
-        },
-        [GREEN] = {
-                .offset = 5,
-                .length = 6,
-        },
-        [BLUE] = {
-                .offset = 0,
-                .length = 5,
-        },
-        [TRANSP] = {    /* no support for transparency */
-                .length = 0,
-        }
-};
-static const struct fb_bitfield def_rgb888[] = {
-        [RED] = {
-                .offset = 16,
-                .length = 8,
-        },
-        [GREEN] = {
-                .offset = 8,
-                .length = 8,
-        },
-        [BLUE] = {
-                .offset = 0,
-                .length = 8,
-        },
-        [TRANSP] = {    /* no support for transparency */
-                .length = 0,
-        }
-};
-static inline unsigned chan_to_field(unsigned chan, struct fb_bitfield *bf)
-{
-        chan &= 0xffff;
-        chan >>= 16 - bf->length;
-        return chan << bf->offset;
-}
-static int mxsfb_check_var(struct fb_var_screeninfo *var,
-                struct fb_info *fb_info)
-{
-        struct mxsfb_info *host = fb_info->par;
-        const struct fb_bitfield *rgb = NULL;
-        if (var->xres < MIN_XRES)
-                var->xres = MIN_XRES;
-        if (var->yres < MIN_YRES)
-                var->yres = MIN_YRES;
-        var->xres_virtual = var->xres;
-        var->yres_virtual = var->yres;
-        switch (var->bits_per_pixel) {
-        case 16:
-                /* always expect RGB 565 */
-                rgb = def_rgb565;
-                break;
-        case 32:
-                switch (host->ld_intf_width) {
-                case STMLCDIF_8BIT:
-                        pr_debug("Unsupported LCD bus width mapping\n");
-                        break;
-                case STMLCDIF_16BIT:
-                case STMLCDIF_18BIT:
-                case STMLCDIF_24BIT:
-                        /* real 24 bit */
-                        rgb = def_rgb888;
-                        break;
-                }
-                break;
-        default:
-                pr_err("Unsupported colour depth: %u\n", var->bits_per_pixel);
-                return -EINVAL;
-        }
-        /*
-         * Copy the RGB parameters for this display
-         * from the machine specific parameters.
-         */
-        var->red    = rgb[RED];
-        var->green  = rgb[GREEN];
-        var->blue   = rgb[BLUE];
-        var->transp = rgb[TRANSP];
-        return 0;
-}
-static inline void mxsfb_enable_axi_clk(struct mxsfb_info *host)
-{
-        if (host->clk_axi)
-                clk_prepare_enable(host->clk_axi);
-}
-static inline void mxsfb_disable_axi_clk(struct mxsfb_info *host)
-{
-        if (host->clk_axi)
-                clk_disable_unprepare(host->clk_axi);
-}
-static void mxsfb_enable_controller(struct fb_info *fb_info)
-{
-        struct mxsfb_info *host = fb_info->par;
-        u32 reg;
-        int ret;
-        dev_dbg(&host->pdev->dev, "%s\n", __func__);
-        if (host->reg_lcd) {
-                ret = regulator_enable(host->reg_lcd);
-                if (ret) {
-                        dev_err(&host->pdev->dev,
-                                "lcd regulator enable failed:   %d\n", ret);
-                        return;
-                }
-        }
-        if (host->clk_disp_axi)
-                clk_prepare_enable(host->clk_disp_axi);
-        clk_prepare_enable(host->clk);
-        clk_set_rate(host->clk, PICOS2KHZ(fb_info->var.pixclock) * 1000U);
-        mxsfb_enable_axi_clk(host);
-        /* if it was disabled, re-enable the mode again */
-        writel(CTRL_DOTCLK_MODE, host->base + LCDC_CTRL + REG_SET);
-        /* enable the SYNC signals first, then the DMA engine */
-        reg = readl(host->base + LCDC_VDCTRL4);
-        reg |= VDCTRL4_SYNC_SIGNALS_ON;
-        writel(reg, host->base + LCDC_VDCTRL4);
-        writel(CTRL_RUN, host->base + LCDC_CTRL + REG_SET);
-        host->enabled = 1;
-}
-static void mxsfb_disable_controller(struct fb_info *fb_info)
-{
-        struct mxsfb_info *host = fb_info->par;
-        unsigned loop;
-        u32 reg;
-        int ret;
-        dev_dbg(&host->pdev->dev, "%s\n", __func__);
-        /*
-         * Even if we disable the controller here, it will still continue
-         * until its FIFOs are running out of data
-         */
-        writel(CTRL_DOTCLK_MODE, host->base + LCDC_CTRL + REG_CLR);
-        loop = 1000;
-        while (loop) {
-                reg = readl(host->base + LCDC_CTRL);
-                if (!(reg & CTRL_RUN))
-                        break;
-                loop--;
-        }
-        reg = readl(host->base + LCDC_VDCTRL4);
-        writel(reg & ~VDCTRL4_SYNC_SIGNALS_ON, host->base + LCDC_VDCTRL4);
-        mxsfb_disable_axi_clk(host);
-        clk_disable_unprepare(host->clk);
-        if (host->clk_disp_axi)
-                clk_disable_unprepare(host->clk_disp_axi);
-        host->enabled = 0;
-        if (host->reg_lcd) {
-                ret = regulator_disable(host->reg_lcd);
-                if (ret)
-                        dev_err(&host->pdev->dev,
-                                "lcd regulator disable failed: %d\n", ret);
-        }
-}
-static int mxsfb_set_par(struct fb_info *fb_info)
-{
-        struct mxsfb_info *host = fb_info->par;
-        u32 ctrl, vdctrl0, vdctrl4;
-        int line_size, fb_size;
-        int reenable = 0;
-        line_size =  fb_info->var.xres * (fb_info->var.bits_per_pixel >> 3);
-        fb_size = fb_info->var.yres_virtual * line_size;
-        if (fb_size > fb_info->fix.smem_len)
-                return -ENOMEM;
-        fb_info->fix.line_length = line_size;
-        if (host->pre_init) {
-                mxsfb_enable_controller(fb_info);
-                host->pre_init = 0;
-                return 0;
-        }
-        /*
-         * It seems, you can't re-program the controller if it is still running.
-         * This may lead into shifted pictures (FIFO issue?).
-         * So, first stop the controller and drain its FIFOs
-         */
-        if (host->enabled) {
-                reenable = 1;
-                mxsfb_disable_controller(fb_info);
-        }
-        mxsfb_enable_axi_clk(host);
-        /* clear the FIFOs */
-        writel(CTRL1_FIFO_CLEAR, host->base + LCDC_CTRL1 + REG_SET);
-        ctrl = CTRL_BYPASS_COUNT | CTRL_MASTER |
-                CTRL_SET_BUS_WIDTH(host->ld_intf_width);
-        switch (fb_info->var.bits_per_pixel) {
-        case 16:
-                dev_dbg(&host->pdev->dev, "Setting up RGB565 mode\n");
-                ctrl |= CTRL_SET_WORD_LENGTH(0);
-                writel(CTRL1_SET_BYTE_PACKAGING(0xf), host->base + LCDC_CTRL1);
-                break;
-        case 32:
-                dev_dbg(&host->pdev->dev, "Setting up RGB888/666 mode\n");
-                ctrl |= CTRL_SET_WORD_LENGTH(3);
-                switch (host->ld_intf_width) {
-                case STMLCDIF_8BIT:
-                        mxsfb_disable_axi_clk(host);
-                        dev_err(&host->pdev->dev,
-                                        "Unsupported LCD bus width mapping\n");
-                        return -EINVAL;
-                case STMLCDIF_16BIT:
-                case STMLCDIF_18BIT:
-                case STMLCDIF_24BIT:
-                        /* real 24 bit */
-                        break;
-                }
-                /* do not use packed pixels = one pixel per word instead */
-                writel(CTRL1_SET_BYTE_PACKAGING(0x7), host->base + LCDC_CTRL1);
-                break;
-        default:
-                mxsfb_disable_axi_clk(host);
-                dev_err(&host->pdev->dev, "Unhandled color depth of %u\n",
-                                fb_info->var.bits_per_pixel);
-                return -EINVAL;
-        }
-        writel(ctrl, host->base + LCDC_CTRL);
-        writel(TRANSFER_COUNT_SET_VCOUNT(fb_info->var.yres) |
-                        TRANSFER_COUNT_SET_HCOUNT(fb_info->var.xres),
-                        host->base + host->devdata->transfer_count);
-        vdctrl0 = VDCTRL0_ENABLE_PRESENT |      /* always in DOTCLOCK mode */
-                VDCTRL0_VSYNC_PERIOD_UNIT |
-                VDCTRL0_VSYNC_PULSE_WIDTH_UNIT |
-                VDCTRL0_SET_VSYNC_PULSE_WIDTH(fb_info->var.vsync_len);
-        if (fb_info->var.sync & FB_SYNC_HOR_HIGH_ACT)
-                vdctrl0 |= VDCTRL0_HSYNC_ACT_HIGH;
-        if (fb_info->var.sync & FB_SYNC_VERT_HIGH_ACT)
-                vdctrl0 |= VDCTRL0_VSYNC_ACT_HIGH;
-        if (host->sync & MXSFB_SYNC_DATA_ENABLE_HIGH_ACT)
-                vdctrl0 |= VDCTRL0_ENABLE_ACT_HIGH;
-        if (host->sync & MXSFB_SYNC_DOTCLK_FALLING_ACT)
-                vdctrl0 |= VDCTRL0_DOTCLK_ACT_FALLING;
-        writel(vdctrl0, host->base + LCDC_VDCTRL0);
-        /* frame length in lines */
-        writel(fb_info->var.upper_margin + fb_info->var.vsync_len +
-                fb_info->var.lower_margin + fb_info->var.yres,
-                host->base + LCDC_VDCTRL1);
-        /* line length in units of clocks or pixels */
-        writel(set_hsync_pulse_width(host, fb_info->var.hsync_len) |
-                VDCTRL2_SET_HSYNC_PERIOD(fb_info->var.left_margin +
-                fb_info->var.hsync_len + fb_info->var.right_margin +
-                fb_info->var.xres),
-                host->base + LCDC_VDCTRL2);
-        writel(SET_HOR_WAIT_CNT(fb_info->var.left_margin +
-                fb_info->var.hsync_len) |
-                SET_VERT_WAIT_CNT(fb_info->var.upper_margin +
-                        fb_info->var.vsync_len),
-                host->base + LCDC_VDCTRL3);
-        vdctrl4 = SET_DOTCLK_H_VALID_DATA_CNT(fb_info->var.xres);
-        if (mxsfb_is_v4(host))
-                vdctrl4 |= VDCTRL4_SET_DOTCLK_DLY(host->dotclk_delay);
-        writel(vdctrl4, host->base + LCDC_VDCTRL4);
-        writel(fb_info->fix.smem_start +
-                        fb_info->fix.line_length * fb_info->var.yoffset,
-                        host->base + host->devdata->next_buf);
-        mxsfb_disable_axi_clk(host);
-        if (reenable)
-                mxsfb_enable_controller(fb_info);
-        return 0;
-}
-static int mxsfb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
-                u_int transp, struct fb_info *fb_info)
-{
-        unsigned int val;
-        int ret = -EINVAL;
-        /*
-         * If greyscale is true, then we convert the RGB value
-         * to greyscale no matter what visual we are using.
-         */
-        if (fb_info->var.grayscale)
-                red = green = blue = (19595 * red + 38470 * green +
-                                        7471 * blue) >> 16;
-        switch (fb_info->fix.visual) {
-        case FB_VISUAL_TRUECOLOR:
-                /*
-                 * 12 or 16-bit True Colour.  We encode the RGB value
-                 * according to the RGB bitfield information.
-                 */
-                if (regno < 16) {
-                        u32 *pal = fb_info->pseudo_palette;
-                        val  = chan_to_field(red, &fb_info->var.red);
-                        val |= chan_to_field(green, &fb_info->var.green);
-                        val |= chan_to_field(blue, &fb_info->var.blue);
-                        pal[regno] = val;
-                        ret = 0;
-                }
-                break;
-        case FB_VISUAL_STATIC_PSEUDOCOLOR:
-        case FB_VISUAL_PSEUDOCOLOR:
-                break;
-        }
-        return ret;
-}
-static int mxsfb_blank(int blank, struct fb_info *fb_info)
-{
-        struct mxsfb_info *host = fb_info->par;
-        switch (blank) {
-        case FB_BLANK_POWERDOWN:
-        case FB_BLANK_VSYNC_SUSPEND:
-        case FB_BLANK_HSYNC_SUSPEND:
-        case FB_BLANK_NORMAL:
-                if (host->enabled)
-                        mxsfb_disable_controller(fb_info);
-                break;
-        case FB_BLANK_UNBLANK:
-                if (!host->enabled)
-                        mxsfb_enable_controller(fb_info);
-                break;
-        }
-        return 0;
-}
-static int mxsfb_pan_display(struct fb_var_screeninfo *var,
-                struct fb_info *fb_info)
-{
-        struct mxsfb_info *host = fb_info->par;
-        unsigned offset;
-        if (var->xoffset != 0)
-                return -EINVAL;
-        offset = fb_info->fix.line_length * var->yoffset;
-        mxsfb_enable_axi_clk(host);
-        /* update on next VSYNC */
-        writel(fb_info->fix.smem_start + offset,
-                        host->base + host->devdata->next_buf);
-        mxsfb_disable_axi_clk(host);
-        return 0;
-}
-static struct fb_ops mxsfb_ops = {
-        .owner = THIS_MODULE,
-        .fb_check_var = mxsfb_check_var,
-        .fb_set_par = mxsfb_set_par,
-        .fb_setcolreg = mxsfb_setcolreg,
-        .fb_blank = mxsfb_blank,
-        .fb_pan_display = mxsfb_pan_display,
-        .fb_fillrect = cfb_fillrect,
-        .fb_copyarea = cfb_copyarea,
-        .fb_imageblit = cfb_imageblit,
-};
-static int mxsfb_restore_mode(struct fb_info *fb_info,
-                        struct fb_videomode *vmode)
-{
-        struct mxsfb_info *host = fb_info->par;
-        unsigned period;
-        unsigned long pa, fbsize;
-        int bits_per_pixel, ofs, ret = 0;
-        u32 transfer_count, vdctrl0, vdctrl2, vdctrl3, vdctrl4, ctrl;
-        mxsfb_enable_axi_clk(host);
-        /* Only restore the mode when the controller is running */
-        ctrl = readl(host->base + LCDC_CTRL);
-        if (!(ctrl & CTRL_RUN)) {
-                ret = -EINVAL;
-                goto err;
-        }
-        vdctrl0 = readl(host->base + LCDC_VDCTRL0);
-        vdctrl2 = readl(host->base + LCDC_VDCTRL2);
-        vdctrl3 = readl(host->base + LCDC_VDCTRL3);
-        vdctrl4 = readl(host->base + LCDC_VDCTRL4);
-        transfer_count = readl(host->base + host->devdata->transfer_count);
-        vmode->xres = TRANSFER_COUNT_GET_HCOUNT(transfer_count);
-        vmode->yres = TRANSFER_COUNT_GET_VCOUNT(transfer_count);
-        switch (CTRL_GET_WORD_LENGTH(ctrl)) {
-        case 0:
-                bits_per_pixel = 16;
-                break;
-        case 3:
-                bits_per_pixel = 32;
-                break;
-        case 1:
-        default:
-                ret = -EINVAL;
-                goto err;
-        }
-        fb_info->var.bits_per_pixel = bits_per_pixel;
-        vmode->pixclock = KHZ2PICOS(clk_get_rate(host->clk) / 1000U);
-        vmode->hsync_len = get_hsync_pulse_width(host, vdctrl2);
-        vmode->left_margin = GET_HOR_WAIT_CNT(vdctrl3) - vmode->hsync_len;
-        vmode->right_margin = VDCTRL2_GET_HSYNC_PERIOD(vdctrl2) -
-                vmode->hsync_len - vmode->left_margin - vmode->xres;
-        vmode->vsync_len = VDCTRL0_GET_VSYNC_PULSE_WIDTH(vdctrl0);
-        period = readl(host->base + LCDC_VDCTRL1);
-        vmode->upper_margin = GET_VERT_WAIT_CNT(vdctrl3) - vmode->vsync_len;
-        vmode->lower_margin = period - vmode->vsync_len -
-                vmode->upper_margin - vmode->yres;
-        vmode->vmode = FB_VMODE_NONINTERLACED;
-        vmode->sync = 0;
-        if (vdctrl0 & VDCTRL0_HSYNC_ACT_HIGH)
-                vmode->sync |= FB_SYNC_HOR_HIGH_ACT;
-        if (vdctrl0 & VDCTRL0_VSYNC_ACT_HIGH)
-                vmode->sync |= FB_SYNC_VERT_HIGH_ACT;
-        pr_debug("Reconstructed video mode:\n");
-        pr_debug("%dx%d, hsync: %u left: %u, right: %u, vsync: %u, upper: %u, lower: %u\n",
-                vmode->xres, vmode->yres, vmode->hsync_len, vmode->left_margin,
-                vmode->right_margin, vmode->vsync_len, vmode->upper_margin,
-                vmode->lower_margin);
-        pr_debug("pixclk: %ldkHz\n", PICOS2KHZ(vmode->pixclock));
-        host->ld_intf_width = CTRL_GET_BUS_WIDTH(ctrl);
-        host->dotclk_delay = VDCTRL4_GET_DOTCLK_DLY(vdctrl4);
-        fb_info->fix.line_length = vmode->xres * (bits_per_pixel >> 3);
-        pa = readl(host->base + host->devdata->cur_buf);
-        fbsize = fb_info->fix.line_length * vmode->yres;
-        if (pa < fb_info->fix.smem_start) {
-                ret = -EINVAL;
-                goto err;
-        }
-        if (pa + fbsize > fb_info->fix.smem_start + fb_info->fix.smem_len) {
-                ret = -EINVAL;
-                goto err;
-        }
-        ofs = pa - fb_info->fix.smem_start;
-        if (ofs) {
-                memmove(fb_info->screen_base, fb_info->screen_base + ofs, fbsize);
-                writel(fb_info->fix.smem_start, host->base + host->devdata->next_buf);
-        }
-        fb_info->fix.ypanstep = 1;
-        clk_prepare_enable(host->clk);
-        host->enabled = 1;
-err:
-        if (ret)
-                mxsfb_disable_axi_clk(host);
-        return ret;
-}
-static int mxsfb_init_fbinfo_dt(struct fb_info *fb_info,
-                                struct fb_videomode *vmode)
-{
-        struct mxsfb_info *host = fb_info->par;
-        struct fb_var_screeninfo *var = &fb_info->var;
-        struct device *dev = &host->pdev->dev;
-        struct device_node *np = host->pdev->dev.of_node;
-        struct device_node *display_np;
-        struct videomode vm;
-        u32 width;
-        int ret;
-        display_np = of_parse_phandle(np, "display", 0);
-        if (!display_np) {
-                dev_err(dev, "failed to find display phandle\n");
-                return -ENOENT;
-        }
-        ret = of_property_read_u32(display_np, "bus-width", &width);
-        if (ret < 0) {
-                dev_err(dev, "failed to get property bus-width\n");
-                goto put_display_node;
-        }
-        switch (width) {
-        case 8:
-                host->ld_intf_width = STMLCDIF_8BIT;
-                break;
-        case 16:
-                host->ld_intf_width = STMLCDIF_16BIT;
-                break;
-        case 18:
-                host->ld_intf_width = STMLCDIF_18BIT;
-                break;
-        case 24:
-                host->ld_intf_width = STMLCDIF_24BIT;
-                break;
-        default:
-                dev_err(dev, "invalid bus-width value\n");
-                ret = -EINVAL;
-                goto put_display_node;
-        }
-        ret = of_property_read_u32(display_np, "bits-per-pixel",
-                                   &var->bits_per_pixel);
-        if (ret < 0) {
-                dev_err(dev, "failed to get property bits-per-pixel\n");
-                goto put_display_node;
-        }
-        ret = of_get_videomode(display_np, &vm, OF_USE_NATIVE_MODE);
-        if (ret) {
-                dev_err(dev, "failed to get videomode from DT\n");
-                goto put_display_node;
-        }
-        ret = fb_videomode_from_videomode(&vm, vmode);
-        if (ret < 0)
-                goto put_display_node;
-        if (vm.flags & DISPLAY_FLAGS_DE_HIGH)
-                host->sync |= MXSFB_SYNC_DATA_ENABLE_HIGH_ACT;
-        /*
-         * The PIXDATA flags of the display_flags enum are controller
-         * centric, e.g. NEGEDGE means drive data on negative edge.
-         * However, the drivers flag is display centric: Sample the
-         * data on negative (falling) edge. Therefore, check for the
-         * POSEDGE flag:
-         * drive on positive edge => sample on negative edge
-         */
-        if (vm.flags & DISPLAY_FLAGS_PIXDATA_POSEDGE)
-                host->sync |= MXSFB_SYNC_DOTCLK_FALLING_ACT;
-put_display_node:
-        of_node_put(display_np);
-        return ret;
-}
-static int mxsfb_init_fbinfo(struct fb_info *fb_info,
-                        struct fb_videomode *vmode)
-{
-        int ret;
-        struct mxsfb_info *host = fb_info->par;
-        struct device *dev = &host->pdev->dev;
-        struct fb_var_screeninfo *var = &fb_info->var;
-        dma_addr_t fb_phys;
-        void *fb_virt;
-        unsigned fb_size;
-        fb_info->fbops = &mxsfb_ops;
-        fb_info->flags = FBINFO_FLAG_DEFAULT | FBINFO_READS_FAST;
-        strlcpy(fb_info->fix.id, "mxs", sizeof(fb_info->fix.id));
-        fb_info->fix.type = FB_TYPE_PACKED_PIXELS;
-        fb_info->fix.ypanstep = 1;
-        fb_info->fix.visual = FB_VISUAL_TRUECOLOR,
-        fb_info->fix.accel = FB_ACCEL_NONE;
-        ret = mxsfb_init_fbinfo_dt(fb_info, vmode);
-        if (ret)
-                return ret;
-        var->nonstd = 0;
-        var->activate = FB_ACTIVATE_NOW;
-        var->accel_flags = 0;
-        var->vmode = FB_VMODE_NONINTERLACED;
-        /* Memory allocation for framebuffer */
-        fb_size = SZ_2M;
-        fb_virt = dma_alloc_wc(dev, PAGE_ALIGN(fb_size), &fb_phys, GFP_KERNEL);
-        if (!fb_virt)
-                return -ENOMEM;
-        fb_info->fix.smem_start = fb_phys;
-        fb_info->screen_base = fb_virt;
-        fb_info->screen_size = fb_info->fix.smem_len = fb_size;
-        if (mxsfb_restore_mode(fb_info, vmode))
-                memset(fb_virt, 0, fb_size);
-        return 0;
-}
-static void mxsfb_free_videomem(struct fb_info *fb_info)
-{
-        struct mxsfb_info *host = fb_info->par;
-        struct device *dev = &host->pdev->dev;
-        dma_free_wc(dev, fb_info->screen_size, fb_info->screen_base,
-                    fb_info->fix.smem_start);
-}
-static const struct platform_device_id mxsfb_devtype[] = {
-        {
-                .name = "imx23-fb",
-                .driver_data = MXSFB_V3,
-        }, {
-                .name = "imx28-fb",
-                .driver_data = MXSFB_V4,
-        }, {
-                /* sentinel */
-        }
-};
-MODULE_DEVICE_TABLE(platform, mxsfb_devtype);
-static const struct of_device_id mxsfb_dt_ids[] = {
-        { .compatible = "fsl,imx23-lcdif", .data = &mxsfb_devtype[0], },
-        { .compatible = "fsl,imx28-lcdif", .data = &mxsfb_devtype[1], },
-        { /* sentinel */ }
-};
-MODULE_DEVICE_TABLE(of, mxsfb_dt_ids);
-static int mxsfb_probe(struct platform_device *pdev)
-{
-        const struct of_device_id *of_id =
-                        of_match_device(mxsfb_dt_ids, &pdev->dev);
-        struct resource *res;
-        struct mxsfb_info *host;
-        struct fb_info *fb_info;
-        struct fb_videomode *mode;
-        int ret;
-        if (of_id)
-                pdev->id_entry = of_id->data;
-        fb_info = framebuffer_alloc(sizeof(struct mxsfb_info), &pdev->dev);
-        if (!fb_info) {
-                dev_err(&pdev->dev, "Failed to allocate fbdev\n");
-                return -ENOMEM;
-        }
-        mode = devm_kzalloc(&pdev->dev, sizeof(struct fb_videomode),
-                        GFP_KERNEL);
-        if (mode == NULL)
-                return -ENOMEM;
-        host = fb_info->par;
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        host->base = devm_ioremap_resource(&pdev->dev, res);
-        if (IS_ERR(host->base)) {
-                ret = PTR_ERR(host->base);
-                goto fb_release;
-        }
-        host->pdev = pdev;
-        platform_set_drvdata(pdev, host);
-        host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data];
-        host->clk = devm_clk_get(&host->pdev->dev, NULL);
-        if (IS_ERR(host->clk)) {
-                ret = PTR_ERR(host->clk);
-                goto fb_release;
-        }
-        host->clk_axi = devm_clk_get(&host->pdev->dev, "axi");
-        if (IS_ERR(host->clk_axi))
-                host->clk_axi = NULL;
-        host->clk_disp_axi = devm_clk_get(&host->pdev->dev, "disp_axi");
-        if (IS_ERR(host->clk_disp_axi))
-                host->clk_disp_axi = NULL;
-        host->reg_lcd = devm_regulator_get(&pdev->dev, "lcd");
-        if (IS_ERR(host->reg_lcd))
-                host->reg_lcd = NULL;
-#if defined(CONFIG_FB_PRE_INIT_FB)
-        host->pre_init = 1;
-#endif
-        fb_info->pseudo_palette = devm_kcalloc(&pdev->dev, 16, sizeof(u32),
-                                               GFP_KERNEL);
-        if (!fb_info->pseudo_palette) {
-                ret = -ENOMEM;
-                goto fb_release;
-        }
-        ret = mxsfb_init_fbinfo(fb_info, mode);
-        if (ret != 0)
-                goto fb_release;
-        fb_videomode_to_var(&fb_info->var, mode);
-        /* init the color fields */
-        mxsfb_check_var(&fb_info->var, fb_info);
-        platform_set_drvdata(pdev, fb_info);
-        ret = register_framebuffer(fb_info);
-        if (ret != 0) {
-                dev_err(&pdev->dev,"Failed to register framebuffer\n");
-                goto fb_destroy;
-        }
-        if (!host->enabled) {
-                mxsfb_enable_axi_clk(host);
-                writel(0, host->base + LCDC_CTRL);
-                mxsfb_disable_axi_clk(host);
-                mxsfb_set_par(fb_info);
-                mxsfb_enable_controller(fb_info);
-        }
-        host->pre_init = 0;
-        dev_info(&pdev->dev, "initialized\n");
-        return 0;
-fb_destroy:
-        if (host->enabled)
-                clk_disable_unprepare(host->clk);
-fb_release:
-        framebuffer_release(fb_info);
-        return ret;
-}
-static int mxsfb_remove(struct platform_device *pdev)
-{
-        struct fb_info *fb_info = platform_get_drvdata(pdev);
-        struct mxsfb_info *host = fb_info->par;
-        if (host->enabled)
-                mxsfb_disable_controller(fb_info);
-        unregister_framebuffer(fb_info);
-        mxsfb_free_videomem(fb_info);
-        framebuffer_release(fb_info);
-        return 0;
-}
-static void mxsfb_shutdown(struct platform_device *pdev)
-{
-        struct fb_info *fb_info = platform_get_drvdata(pdev);
-        struct mxsfb_info *host = fb_info->par;
-        mxsfb_enable_axi_clk(host);
-        /*
-         * Force stop the LCD controller as keeping it running during reboot
-         * might interfere with the BootROM's boot mode pads sampling.
-         */
-        writel(CTRL_RUN, host->base + LCDC_CTRL + REG_CLR);
-        mxsfb_disable_axi_clk(host);
-}
-static struct platform_driver mxsfb_driver = {
-        .probe = mxsfb_probe,
-        .remove = mxsfb_remove,
-        .shutdown = mxsfb_shutdown,
-        .id_table = mxsfb_devtype,
-        .driver = {
-                   .name = DRIVER_NAME,
-                   .of_match_table = mxsfb_dt_ids,
-        },
-};
-module_platform_driver(mxsfb_driver);
-MODULE_DESCRIPTION("Freescale mxs framebuffer driver");
-MODULE_AUTHOR("Sascha Hauer, Pengutronix");
-MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbdev/neofb.c b/drivers/video/fbdev/neofb.c
index 5d3a444083f7..b770946a0920 100644
--- a/drivers/video/fbdev/neofb.c
+++ b/drivers/video/fbdev/neofb.c
@@ -2122,14 +2122,7 @@ static void neofb_remove(struct pci_dev *dev)
        DBG("neofb_remove");
        if (info) {
-                /*
+                unregister_framebuffer(info);
-                 * If unregister_framebuffer fails, then
-                 * we will be leaving hooks that could cause
-                 * oopsen laying around.
-                 */
-                if (unregister_framebuffer(info))
-                        printk(KERN_WARNING
-                               "neofb: danger danger!  Oopsen imminent!\n");
                neo_unmap_video(info);
                fb_destroy_modedb(info->monspecs.modedb);
diff --git a/drivers/video/fbdev/omap/omapfb_main.c b/drivers/video/fbdev/omap/omapfb_main.c
index 406f972d2e42..90eca64e3144 100644
--- a/drivers/video/fbdev/omap/omapfb_main.c
+++ b/drivers/video/fbdev/omap/omapfb_main.c
@@ -1502,8 +1502,6 @@ static int planes_init(struct omapfb_device *fbdev)
                fbi = framebuffer_alloc(sizeof(struct omapfb_plane_struct),
                                        fbdev->dev);
                if (fbi == NULL) {
-                        dev_err(fbdev->dev,
-                                "unable to allocate memory for plane info\n");
                        planes_cleanup(fbdev);
                        return -ENOMEM;
                }
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
index a34820e8ab97..36b97fee2d57 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
+++ b/drivers/video/fbdev/omap2/omapfb/dss/Kconfig
@@ -39,18 +39,6 @@ config FB_OMAP2_DSS_DPI
        help
          DPI Interface. This is the Parallel Display Interface.
-config FB_OMAP2_DSS_RFBI
-        bool "RFBI support"
-        depends on BROKEN
-        help
-          MIPI DBI support (RFBI, Remote Framebuffer Interface, in Texas
-          Instrument's terminology).
-          DBI is a bus between the host processor and a peripheral,
-          such as a display or a framebuffer chip.
-          See http://www.mipi.org/ for DBI specifications.
 config FB_OMAP2_DSS_VENC
        bool "VENC support"
        default y
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/Makefile b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
index 7318d5260e8d..eb3689ae8d87 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/Makefile
+++ b/drivers/video/fbdev/omap2/omapfb/dss/Makefile
@@ -8,7 +8,6 @@ omapdss-y := core.o dss.o dss_features.o dispc.o dispc_coefs.o display.o \
 omapdss-y += manager.o manager-sysfs.o overlay.o overlay-sysfs.o apply.o \
        dispc-compat.o display-sysfs.o
 omapdss-$(CONFIG_FB_OMAP2_DSS_DPI) += dpi.o
-omapdss-$(CONFIG_FB_OMAP2_DSS_RFBI) += rfbi.o
 omapdss-$(CONFIG_FB_OMAP2_DSS_VENC) += venc.o
 omapdss-$(CONFIG_FB_OMAP2_DSS_SDI) += sdi.o
 omapdss-$(CONFIG_FB_OMAP2_DSS_DSI) += dsi.o
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/core.c b/drivers/video/fbdev/omap2/omapfb/dss/core.c
index f3ac5103b44a..37858be8be83 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/core.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/core.c
@@ -207,9 +207,6 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = {
 #ifdef CONFIG_FB_OMAP2_DSS_SDI
        sdi_init_platform_driver,
 #endif
-#ifdef CONFIG_FB_OMAP2_DSS_RFBI
-        rfbi_init_platform_driver,
-#endif
 #ifdef CONFIG_FB_OMAP2_DSS_VENC
        venc_init_platform_driver,
 #endif
@@ -231,9 +228,6 @@ static void (*dss_output_drv_unreg_funcs[])(void) = {
 #ifdef CONFIG_FB_OMAP2_DSS_VENC
        venc_uninit_platform_driver,
 #endif
-#ifdef CONFIG_FB_OMAP2_DSS_RFBI
-        rfbi_uninit_platform_driver,
-#endif
 #ifdef CONFIG_FB_OMAP2_DSS_SDI
        sdi_uninit_platform_driver,
 #endif
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.h b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
index 99bebc1983dc..a2269008590f 100644
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.h
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.h
@@ -461,10 +461,6 @@ void hdmi4_uninit_platform_driver(void);
 int hdmi5_init_platform_driver(void) __init;
 void hdmi5_uninit_platform_driver(void);
-/* RFBI */
-int rfbi_init_platform_driver(void) __init;
-void rfbi_uninit_platform_driver(void);
 #ifdef CONFIG_FB_OMAP2_DSS_COLLECT_IRQ_STATS
 static inline void dss_collect_irq_stats(u32 irqstatus, unsigned *irq_arr)
diff --git a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c b/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
deleted file mode 100644
index c6813b9b8a8d..000000000000
--- a/drivers/video/fbdev/omap2/omapfb/dss/rfbi.c
+++ /dev/null
@@ -1,1067 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- * linux/drivers/video/omap2/dss/rfbi.c
- *
- * Copyright (C) 2009 Nokia Corporation
- * Author: Tomi Valkeinen <tomi.valkeinen@nokia.com>
- *
- * Some code and ideas taken from drivers/video/omap/ driver
- * by Imre Deak.
- */
-#define DSS_SUBSYS_NAME "RFBI"
-#include <linux/kernel.h>
-#include <linux/dma-mapping.h>
-#include <linux/export.h>
-#include <linux/vmalloc.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-#include <linux/kfifo.h>
-#include <linux/ktime.h>
-#include <linux/hrtimer.h>
-#include <linux/seq_file.h>
-#include <linux/semaphore.h>
-#include <linux/platform_device.h>
-#include <linux/pm_runtime.h>
-#include <linux/component.h>
-#include <video/omapfb_dss.h>
-#include "dss.h"
-struct rfbi_reg { u16 idx; };
-#define RFBI_REG(idx)           ((const struct rfbi_reg) { idx })
-#define RFBI_REVISION           RFBI_REG(0x0000)
-#define RFBI_SYSCONFIG          RFBI_REG(0x0010)
-#define RFBI_SYSSTATUS          RFBI_REG(0x0014)
-#define RFBI_CONTROL            RFBI_REG(0x0040)
-#define RFBI_PIXEL_CNT          RFBI_REG(0x0044)
-#define RFBI_LINE_NUMBER        RFBI_REG(0x0048)
-#define RFBI_CMD                RFBI_REG(0x004c)
-#define RFBI_PARAM              RFBI_REG(0x0050)
-#define RFBI_DATA               RFBI_REG(0x0054)
-#define RFBI_READ               RFBI_REG(0x0058)
-#define RFBI_STATUS             RFBI_REG(0x005c)
-#define RFBI_CONFIG(n)          RFBI_REG(0x0060 + (n)*0x18)
-#define RFBI_ONOFF_TIME(n)      RFBI_REG(0x0064 + (n)*0x18)
-#define RFBI_CYCLE_TIME(n)      RFBI_REG(0x0068 + (n)*0x18)
-#define RFBI_DATA_CYCLE1(n)     RFBI_REG(0x006c + (n)*0x18)
-#define RFBI_DATA_CYCLE2(n)     RFBI_REG(0x0070 + (n)*0x18)
-#define RFBI_DATA_CYCLE3(n)     RFBI_REG(0x0074 + (n)*0x18)
-#define RFBI_VSYNC_WIDTH        RFBI_REG(0x0090)
-#define RFBI_HSYNC_WIDTH        RFBI_REG(0x0094)
-#define REG_FLD_MOD(idx, val, start, end) \
-        rfbi_write_reg(idx, FLD_MOD(rfbi_read_reg(idx), val, start, end))
-enum omap_rfbi_cycleformat {
-        OMAP_DSS_RFBI_CYCLEFORMAT_1_1 = 0,
-        OMAP_DSS_RFBI_CYCLEFORMAT_2_1 = 1,
-        OMAP_DSS_RFBI_CYCLEFORMAT_3_1 = 2,
-        OMAP_DSS_RFBI_CYCLEFORMAT_3_2 = 3,
-};
-enum omap_rfbi_datatype {
-        OMAP_DSS_RFBI_DATATYPE_12 = 0,
-        OMAP_DSS_RFBI_DATATYPE_16 = 1,
-        OMAP_DSS_RFBI_DATATYPE_18 = 2,
-        OMAP_DSS_RFBI_DATATYPE_24 = 3,
-};
-enum omap_rfbi_parallelmode {
-        OMAP_DSS_RFBI_PARALLELMODE_8 = 0,
-        OMAP_DSS_RFBI_PARALLELMODE_9 = 1,
-        OMAP_DSS_RFBI_PARALLELMODE_12 = 2,
-        OMAP_DSS_RFBI_PARALLELMODE_16 = 3,
-};
-static int rfbi_convert_timings(struct rfbi_timings *t);
-static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div);
-static struct {
-        struct platform_device *pdev;
-        void __iomem    *base;
-        unsigned long   l4_khz;
-        enum omap_rfbi_datatype datatype;
-        enum omap_rfbi_parallelmode parallelmode;
-        enum omap_rfbi_te_mode te_mode;
-        int te_enabled;
-        void (*framedone_callback)(void *data);
-        void *framedone_callback_data;
-        struct omap_dss_device *dssdev[2];
-        struct semaphore bus_lock;
-        struct omap_video_timings timings;
-        int pixel_size;
-        int data_lines;
-        struct rfbi_timings intf_timings;
-        struct omap_dss_device output;
-} rfbi;
-static inline void rfbi_write_reg(const struct rfbi_reg idx, u32 val)
-{
-        __raw_writel(val, rfbi.base + idx.idx);
-}
-static inline u32 rfbi_read_reg(const struct rfbi_reg idx)
-{
-        return __raw_readl(rfbi.base + idx.idx);
-}
-static int rfbi_runtime_get(void)
-{
-        int r;
-        DSSDBG("rfbi_runtime_get\n");
-        r = pm_runtime_get_sync(&rfbi.pdev->dev);
-        WARN_ON(r < 0);
-        return r < 0 ? r : 0;
-}
-static void rfbi_runtime_put(void)
-{
-        int r;
-        DSSDBG("rfbi_runtime_put\n");
-        r = pm_runtime_put_sync(&rfbi.pdev->dev);
-        WARN_ON(r < 0 && r != -ENOSYS);
-}
-static void rfbi_bus_lock(void)
-{
-        down(&rfbi.bus_lock);
-}
-static void rfbi_bus_unlock(void)
-{
-        up(&rfbi.bus_lock);
-}
-static void rfbi_write_command(const void *buf, u32 len)
-{
-        switch (rfbi.parallelmode) {
-        case OMAP_DSS_RFBI_PARALLELMODE_8:
-        {
-                const u8 *b = buf;
-                for (; len; len--)
-                        rfbi_write_reg(RFBI_CMD, *b++);
-                break;
-        }
-        case OMAP_DSS_RFBI_PARALLELMODE_16:
-        {
-                const u16 *w = buf;
-                BUG_ON(len & 1);
-                for (; len; len -= 2)
-                        rfbi_write_reg(RFBI_CMD, *w++);
-                break;
-        }
-        case OMAP_DSS_RFBI_PARALLELMODE_9:
-        case OMAP_DSS_RFBI_PARALLELMODE_12:
-        default:
-                BUG();
-        }
-}
-static void rfbi_read_data(void *buf, u32 len)
-{
-        switch (rfbi.parallelmode) {
-        case OMAP_DSS_RFBI_PARALLELMODE_8:
-        {
-                u8 *b = buf;
-                for (; len; len--) {
-                        rfbi_write_reg(RFBI_READ, 0);
-                        *b++ = rfbi_read_reg(RFBI_READ);
-                }
-                break;
-        }
-        case OMAP_DSS_RFBI_PARALLELMODE_16:
-        {
-                u16 *w = buf;
-                BUG_ON(len & ~1);
-                for (; len; len -= 2) {
-                        rfbi_write_reg(RFBI_READ, 0);
-                        *w++ = rfbi_read_reg(RFBI_READ);
-                }
-                break;
-        }
-        case OMAP_DSS_RFBI_PARALLELMODE_9:
-        case OMAP_DSS_RFBI_PARALLELMODE_12:
-        default:
-                BUG();
-        }
-}
-static void rfbi_write_data(const void *buf, u32 len)
-{
-        switch (rfbi.parallelmode) {
-        case OMAP_DSS_RFBI_PARALLELMODE_8:
-        {
-                const u8 *b = buf;
-                for (; len; len--)
-                        rfbi_write_reg(RFBI_PARAM, *b++);
-                break;
-        }
-        case OMAP_DSS_RFBI_PARALLELMODE_16:
-        {
-                const u16 *w = buf;
-                BUG_ON(len & 1);
-                for (; len; len -= 2)
-                        rfbi_write_reg(RFBI_PARAM, *w++);
-                break;
-        }
-        case OMAP_DSS_RFBI_PARALLELMODE_9:
-        case OMAP_DSS_RFBI_PARALLELMODE_12:
-        default:
-                BUG();
-        }
-}
-static void rfbi_write_pixels(const void __iomem *buf, int scr_width,
-                u16 x, u16 y,
-                u16 w, u16 h)
-{
-        int start_offset = scr_width * y + x;
-        int horiz_offset = scr_width - w;
-        int i;
-        if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
-           rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
-                const u16 __iomem *pd = buf;
-                pd += start_offset;
-                for (; h; --h) {
-                        for (i = 0; i < w; ++i) {
-                                const u8 __iomem *b = (const u8 __iomem *)pd;
-                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+1));
-                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+0));
-                                ++pd;
-                        }
-                        pd += horiz_offset;
-                }
-        } else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_24 &&
-           rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_8) {
-                const u32 __iomem *pd = buf;
-                pd += start_offset;
-                for (; h; --h) {
-                        for (i = 0; i < w; ++i) {
-                                const u8 __iomem *b = (const u8 __iomem *)pd;
-                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+2));
-                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+1));
-                                rfbi_write_reg(RFBI_PARAM, __raw_readb(b+0));
-                                ++pd;
-                        }
-                        pd += horiz_offset;
-                }
-        } else if (rfbi.datatype == OMAP_DSS_RFBI_DATATYPE_16 &&
-           rfbi.parallelmode == OMAP_DSS_RFBI_PARALLELMODE_16) {
-                const u16 __iomem *pd = buf;
-                pd += start_offset;
-                for (; h; --h) {
-                        for (i = 0; i < w; ++i) {
-                                rfbi_write_reg(RFBI_PARAM, __raw_readw(pd));
-                                ++pd;
-                        }
-                        pd += horiz_offset;
-                }
-        } else {
-                BUG();
-        }
-}
-static int rfbi_transfer_area(struct omap_dss_device *dssdev,
-                void (*callback)(void *data), void *data)
-{
-        u32 l;
-        int r;
-        struct omap_overlay_manager *mgr = rfbi.output.manager;
-        u16 width = rfbi.timings.x_res;
-        u16 height = rfbi.timings.y_res;
-        /*BUG_ON(callback == 0);*/
-        BUG_ON(rfbi.framedone_callback != NULL);
-        DSSDBG("rfbi_transfer_area %dx%d\n", width, height);
-        dss_mgr_set_timings(mgr, &rfbi.timings);
-        r = dss_mgr_enable(mgr);
-        if (r)
-                return r;
-        rfbi.framedone_callback = callback;
-        rfbi.framedone_callback_data = data;
-        rfbi_write_reg(RFBI_PIXEL_CNT, width * height);
-        l = rfbi_read_reg(RFBI_CONTROL);
-        l = FLD_MOD(l, 1, 0, 0); /* enable */
-        if (!rfbi.te_enabled)
-                l = FLD_MOD(l, 1, 4, 4); /* ITE */
-        rfbi_write_reg(RFBI_CONTROL, l);
-        return 0;
-}
-static void framedone_callback(void *data)
-{
-        void (*callback)(void *data);
-        DSSDBG("FRAMEDONE\n");
-        REG_FLD_MOD(RFBI_CONTROL, 0, 0, 0);
-        callback = rfbi.framedone_callback;
-        rfbi.framedone_callback = NULL;
-        if (callback != NULL)
-                callback(rfbi.framedone_callback_data);
-}
-#if 1 /* VERBOSE */
-static void rfbi_print_timings(void)
-{
-        u32 l;
-        u32 time;
-        l = rfbi_read_reg(RFBI_CONFIG(0));
-        time = 1000000000 / rfbi.l4_khz;
-        if (l & (1 << 4))
-                time *= 2;
-        DSSDBG("Tick time %u ps\n", time);
-        l = rfbi_read_reg(RFBI_ONOFF_TIME(0));
-        DSSDBG("CSONTIME %d, CSOFFTIME %d, WEONTIME %d, WEOFFTIME %d, "
-                "REONTIME %d, REOFFTIME %d\n",
-                l & 0x0f, (l >> 4) & 0x3f, (l >> 10) & 0x0f, (l >> 14) & 0x3f,
-                (l >> 20) & 0x0f, (l >> 24) & 0x3f);
-        l = rfbi_read_reg(RFBI_CYCLE_TIME(0));
-        DSSDBG("WECYCLETIME %d, RECYCLETIME %d, CSPULSEWIDTH %d, "
-                "ACCESSTIME %d\n",
-                (l & 0x3f), (l >> 6) & 0x3f, (l >> 12) & 0x3f,
-                (l >> 22) & 0x3f);
-}
-#else
-static void rfbi_print_timings(void) {}
-#endif
-static u32 extif_clk_period;
-static inline unsigned long round_to_extif_ticks(unsigned long ps, int div)
-{
-        int bus_tick = extif_clk_period * div;
-        return (ps + bus_tick - 1) / bus_tick * bus_tick;
-}
-static int calc_reg_timing(struct rfbi_timings *t, int div)
-{
-        t->clk_div = div;
-        t->cs_on_time = round_to_extif_ticks(t->cs_on_time, div);
-        t->we_on_time = round_to_extif_ticks(t->we_on_time, div);
-        t->we_off_time = round_to_extif_ticks(t->we_off_time, div);
-        t->we_cycle_time = round_to_extif_ticks(t->we_cycle_time, div);
-        t->re_on_time = round_to_extif_ticks(t->re_on_time, div);
-        t->re_off_time = round_to_extif_ticks(t->re_off_time, div);
-        t->re_cycle_time = round_to_extif_ticks(t->re_cycle_time, div);
-        t->access_time = round_to_extif_ticks(t->access_time, div);
-        t->cs_off_time = round_to_extif_ticks(t->cs_off_time, div);
-        t->cs_pulse_width = round_to_extif_ticks(t->cs_pulse_width, div);
-        DSSDBG("[reg]cson %d csoff %d reon %d reoff %d\n",
-               t->cs_on_time, t->cs_off_time, t->re_on_time, t->re_off_time);
-        DSSDBG("[reg]weon %d weoff %d recyc %d wecyc %d\n",
-               t->we_on_time, t->we_off_time, t->re_cycle_time,
-               t->we_cycle_time);
-        DSSDBG("[reg]rdaccess %d cspulse %d\n",
-               t->access_time, t->cs_pulse_width);
-        return rfbi_convert_timings(t);
-}
-static int calc_extif_timings(struct rfbi_timings *t)
-{
-        u32 max_clk_div;
-        int div;
-        rfbi_get_clk_info(&extif_clk_period, &max_clk_div);
-        for (div = 1; div <= max_clk_div; div++) {
-                if (calc_reg_timing(t, div) == 0)
-                        break;
-        }
-        if (div <= max_clk_div)
-                return 0;
-        DSSERR("can't setup timings\n");
-        return -1;
-}
-static void rfbi_set_timings(int rfbi_module, struct rfbi_timings *t)
-{
-        int r;
-        if (!t->converted) {
-                r = calc_extif_timings(t);
-                if (r < 0)
-                        DSSERR("Failed to calc timings\n");
-        }
-        BUG_ON(!t->converted);
-        rfbi_write_reg(RFBI_ONOFF_TIME(rfbi_module), t->tim[0]);
-        rfbi_write_reg(RFBI_CYCLE_TIME(rfbi_module), t->tim[1]);
-        /* TIMEGRANULARITY */
-        REG_FLD_MOD(RFBI_CONFIG(rfbi_module),
-                    (t->tim[2] ? 1 : 0), 4, 4);
-        rfbi_print_timings();
-}
-static int ps_to_rfbi_ticks(int time, int div)
-{
-        unsigned long tick_ps;
-        int ret;
-        /* Calculate in picosecs to yield more exact results */
-        tick_ps = 1000000000 / (rfbi.l4_khz) * div;
-        ret = (time + tick_ps - 1) / tick_ps;
-        return ret;
-}
-static void rfbi_get_clk_info(u32 *clk_period, u32 *max_clk_div)
-{
-        *clk_period = 1000000000 / rfbi.l4_khz;
-        *max_clk_div = 2;
-}
-static int rfbi_convert_timings(struct rfbi_timings *t)
-{
-        u32 l;
-        int reon, reoff, weon, weoff, cson, csoff, cs_pulse;
-        int actim, recyc, wecyc;
-        int div = t->clk_div;
-        if (div <= 0 || div > 2)
-                return -1;
-        /* Make sure that after conversion it still holds that:
-         * weoff > weon, reoff > reon, recyc >= reoff, wecyc >= weoff,
-         * csoff > cson, csoff >= max(weoff, reoff), actim > reon
-         */
-        weon = ps_to_rfbi_ticks(t->we_on_time, div);
-        weoff = ps_to_rfbi_ticks(t->we_off_time, div);
-        if (weoff <= weon)
-                weoff = weon + 1;
-        if (weon > 0x0f)
-                return -1;
-        if (weoff > 0x3f)
-                return -1;
-        reon = ps_to_rfbi_ticks(t->re_on_time, div);
-        reoff = ps_to_rfbi_ticks(t->re_off_time, div);
-        if (reoff <= reon)
-                reoff = reon + 1;
-        if (reon > 0x0f)
-                return -1;
-        if (reoff > 0x3f)
-                return -1;
-        cson = ps_to_rfbi_ticks(t->cs_on_time, div);
-        csoff = ps_to_rfbi_ticks(t->cs_off_time, div);
-        if (csoff <= cson)
-                csoff = cson + 1;
-        if (csoff < max(weoff, reoff))
-                csoff = max(weoff, reoff);
-        if (cson > 0x0f)
-                return -1;
-        if (csoff > 0x3f)
-                return -1;
-        l =  cson;
-        l |= csoff << 4;
-        l |= weon  << 10;
-        l |= weoff << 14;
-        l |= reon  << 20;
-        l |= reoff << 24;
-        t->tim[0] = l;
-        actim = ps_to_rfbi_ticks(t->access_time, div);
-        if (actim <= reon)
-                actim = reon + 1;
-        if (actim > 0x3f)
-                return -1;
-        wecyc = ps_to_rfbi_ticks(t->we_cycle_time, div);
-        if (wecyc < weoff)
-                wecyc = weoff;
-        if (wecyc > 0x3f)
-                return -1;
-        recyc = ps_to_rfbi_ticks(t->re_cycle_time, div);
-        if (recyc < reoff)
-                recyc = reoff;
-        if (recyc > 0x3f)
-                return -1;
-        cs_pulse = ps_to_rfbi_ticks(t->cs_pulse_width, div);
-        if (cs_pulse > 0x3f)
-                return -1;
-        l =  wecyc;
-        l |= recyc    << 6;
-        l |= cs_pulse << 12;
-        l |= actim    << 22;
-        t->tim[1] = l;
-        t->tim[2] = div - 1;
-        t->converted = 1;
-        return 0;
-}
-/* xxx FIX module selection missing */
-static int rfbi_setup_te(enum omap_rfbi_te_mode mode,
-                             unsigned hs_pulse_time, unsigned vs_pulse_time,
-                             int hs_pol_inv, int vs_pol_inv, int extif_div)
-{
-        int hs, vs;
-        int min;
-        u32 l;
-        hs = ps_to_rfbi_ticks(hs_pulse_time, 1);
-        vs = ps_to_rfbi_ticks(vs_pulse_time, 1);
-        if (hs < 2)
-                return -EDOM;
-        if (mode == OMAP_DSS_RFBI_TE_MODE_2)
-                min = 2;
-        else /* OMAP_DSS_RFBI_TE_MODE_1 */
-                min = 4;
-        if (vs < min)
-                return -EDOM;
-        if (vs == hs)
-                return -EINVAL;
-        rfbi.te_mode = mode;
-        DSSDBG("setup_te: mode %d hs %d vs %d hs_inv %d vs_inv %d\n",
-                mode, hs, vs, hs_pol_inv, vs_pol_inv);
-        rfbi_write_reg(RFBI_HSYNC_WIDTH, hs);
-        rfbi_write_reg(RFBI_VSYNC_WIDTH, vs);
-        l = rfbi_read_reg(RFBI_CONFIG(0));
-        if (hs_pol_inv)
-                l &= ~(1 << 21);
-        else
-                l |= 1 << 21;
-        if (vs_pol_inv)
-                l &= ~(1 << 20);
-        else
-                l |= 1 << 20;
-        return 0;
-}
-/* xxx FIX module selection missing */
-static int rfbi_enable_te(bool enable, unsigned line)
-{
-        u32 l;
-        DSSDBG("te %d line %d mode %d\n", enable, line, rfbi.te_mode);
-        if (line > (1 << 11) - 1)
-                return -EINVAL;
-        l = rfbi_read_reg(RFBI_CONFIG(0));
-        l &= ~(0x3 << 2);
-        if (enable) {
-                rfbi.te_enabled = 1;
-                l |= rfbi.te_mode << 2;
-        } else
-                rfbi.te_enabled = 0;
-        rfbi_write_reg(RFBI_CONFIG(0), l);
-        rfbi_write_reg(RFBI_LINE_NUMBER, line);
-        return 0;
-}
-static int rfbi_configure_bus(int rfbi_module, int bpp, int lines)
-{
-        u32 l;
-        int cycle1 = 0, cycle2 = 0, cycle3 = 0;
-        enum omap_rfbi_cycleformat cycleformat;
-        enum omap_rfbi_datatype datatype;
-        enum omap_rfbi_parallelmode parallelmode;
-        switch (bpp) {
-        case 12:
-                datatype = OMAP_DSS_RFBI_DATATYPE_12;
-                break;
-        case 16:
-                datatype = OMAP_DSS_RFBI_DATATYPE_16;
-                break;
-        case 18:
-                datatype = OMAP_DSS_RFBI_DATATYPE_18;
-                break;
-        case 24:
-                datatype = OMAP_DSS_RFBI_DATATYPE_24;
-                break;
-        default:
-                BUG();
-                return 1;
-        }
-        rfbi.datatype = datatype;
-        switch (lines) {
-        case 8:
-                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_8;
-                break;
-        case 9:
-                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_9;
-                break;
-        case 12:
-                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_12;
-                break;
-        case 16:
-                parallelmode = OMAP_DSS_RFBI_PARALLELMODE_16;
-                break;
-        default:
-                BUG();
-                return 1;
-        }
-        rfbi.parallelmode = parallelmode;
-        if ((bpp % lines) == 0) {
-                switch (bpp / lines) {
-                case 1:
-                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_1_1;
-                        break;
-                case 2:
-                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_2_1;
-                        break;
-                case 3:
-                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_1;
-                        break;
-                default:
-                        BUG();
-                        return 1;
-                }
-        } else if ((2 * bpp % lines) == 0) {
-                if ((2 * bpp / lines) == 3)
-                        cycleformat = OMAP_DSS_RFBI_CYCLEFORMAT_3_2;
-                else {
-                        BUG();
-                        return 1;
-                }
-        } else {
-                BUG();
-                return 1;
-        }
-        switch (cycleformat) {
-        case OMAP_DSS_RFBI_CYCLEFORMAT_1_1:
-                cycle1 = lines;
-                break;
-        case OMAP_DSS_RFBI_CYCLEFORMAT_2_1:
-                cycle1 = lines;
-                cycle2 = lines;
-                break;
-        case OMAP_DSS_RFBI_CYCLEFORMAT_3_1:
-                cycle1 = lines;
-                cycle2 = lines;
-                cycle3 = lines;
-                break;
-        case OMAP_DSS_RFBI_CYCLEFORMAT_3_2:
-                cycle1 = lines;
-                cycle2 = (lines / 2) | ((lines / 2) << 16);
-                cycle3 = (lines << 16);
-                break;
-        }
-        REG_FLD_MOD(RFBI_CONTROL, 0, 3, 2); /* clear CS */
-        l = 0;
-        l |= FLD_VAL(parallelmode, 1, 0);
-        l |= FLD_VAL(0, 3, 2);          /* TRIGGERMODE: ITE */
-        l |= FLD_VAL(0, 4, 4);          /* TIMEGRANULARITY */
-        l |= FLD_VAL(datatype, 6, 5);
-        /* l |= FLD_VAL(2, 8, 7); */    /* L4FORMAT, 2pix/L4 */
-        l |= FLD_VAL(0, 8, 7);  /* L4FORMAT, 1pix/L4 */
-        l |= FLD_VAL(cycleformat, 10, 9);
-        l |= FLD_VAL(0, 12, 11);        /* UNUSEDBITS */
-        l |= FLD_VAL(0, 16, 16);        /* A0POLARITY */
-        l |= FLD_VAL(0, 17, 17);        /* REPOLARITY */
-        l |= FLD_VAL(0, 18, 18);        /* WEPOLARITY */
-        l |= FLD_VAL(0, 19, 19);        /* CSPOLARITY */
-        l |= FLD_VAL(1, 20, 20);        /* TE_VSYNC_POLARITY */
-        l |= FLD_VAL(1, 21, 21);        /* HSYNCPOLARITY */
-        rfbi_write_reg(RFBI_CONFIG(rfbi_module), l);
-        rfbi_write_reg(RFBI_DATA_CYCLE1(rfbi_module), cycle1);
-        rfbi_write_reg(RFBI_DATA_CYCLE2(rfbi_module), cycle2);
-        rfbi_write_reg(RFBI_DATA_CYCLE3(rfbi_module), cycle3);
-        l = rfbi_read_reg(RFBI_CONTROL);
-        l = FLD_MOD(l, rfbi_module+1, 3, 2); /* Select CSx */
-        l = FLD_MOD(l, 0, 1, 1); /* clear bypass */
-        rfbi_write_reg(RFBI_CONTROL, l);
-        DSSDBG("RFBI config: bpp %d, lines %d, cycles: 0x%x 0x%x 0x%x\n",
-               bpp, lines, cycle1, cycle2, cycle3);
-        return 0;
-}
-static int rfbi_configure(struct omap_dss_device *dssdev)
-{
-        return rfbi_configure_bus(dssdev->phy.rfbi.channel, rfbi.pixel_size,
-                        rfbi.data_lines);
-}
-static int rfbi_update(struct omap_dss_device *dssdev, void (*callback)(void *),
-                void *data)
-{
-        return rfbi_transfer_area(dssdev, callback, data);
-}
-static void rfbi_set_size(struct omap_dss_device *dssdev, u16 w, u16 h)
-{
-        rfbi.timings.x_res = w;
-        rfbi.timings.y_res = h;
-}
-static void rfbi_set_pixel_size(struct omap_dss_device *dssdev, int pixel_size)
-{
-        rfbi.pixel_size = pixel_size;
-}
-static void rfbi_set_data_lines(struct omap_dss_device *dssdev, int data_lines)
-{
-        rfbi.data_lines = data_lines;
-}
-static void rfbi_set_interface_timings(struct omap_dss_device *dssdev,
-                struct rfbi_timings *timings)
-{
-        rfbi.intf_timings = *timings;
-}
-static void rfbi_dump_regs(struct seq_file *s)
-{
-#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, rfbi_read_reg(r))
-        if (rfbi_runtime_get())
-                return;
-        DUMPREG(RFBI_REVISION);
-        DUMPREG(RFBI_SYSCONFIG);
-        DUMPREG(RFBI_SYSSTATUS);
-        DUMPREG(RFBI_CONTROL);
-        DUMPREG(RFBI_PIXEL_CNT);
-        DUMPREG(RFBI_LINE_NUMBER);
-        DUMPREG(RFBI_CMD);
-        DUMPREG(RFBI_PARAM);
-        DUMPREG(RFBI_DATA);
-        DUMPREG(RFBI_READ);
-        DUMPREG(RFBI_STATUS);
-        DUMPREG(RFBI_CONFIG(0));
-        DUMPREG(RFBI_ONOFF_TIME(0));
-        DUMPREG(RFBI_CYCLE_TIME(0));
-        DUMPREG(RFBI_DATA_CYCLE1(0));
-        DUMPREG(RFBI_DATA_CYCLE2(0));
-        DUMPREG(RFBI_DATA_CYCLE3(0));
-        DUMPREG(RFBI_CONFIG(1));
-        DUMPREG(RFBI_ONOFF_TIME(1));
-        DUMPREG(RFBI_CYCLE_TIME(1));
-        DUMPREG(RFBI_DATA_CYCLE1(1));
-        DUMPREG(RFBI_DATA_CYCLE2(1));
-        DUMPREG(RFBI_DATA_CYCLE3(1));
-        DUMPREG(RFBI_VSYNC_WIDTH);
-        DUMPREG(RFBI_HSYNC_WIDTH);
-        rfbi_runtime_put();
-#undef DUMPREG
-}
-static void rfbi_config_lcd_manager(struct omap_dss_device *dssdev)
-{
-        struct omap_overlay_manager *mgr = rfbi.output.manager;
-        struct dss_lcd_mgr_config mgr_config;
-        mgr_config.io_pad_mode = DSS_IO_PAD_MODE_RFBI;
-        mgr_config.stallmode = true;
-        /* Do we need fifohandcheck for RFBI? */
-        mgr_config.fifohandcheck = false;
-        mgr_config.video_port_width = rfbi.pixel_size;
-        mgr_config.lcden_sig_polarity = 0;
-        dss_mgr_set_lcd_config(mgr, &mgr_config);
-        /*
-         * Set rfbi.timings with default values, the x_res and y_res fields
-         * are expected to be already configured by the panel driver via
-         * omapdss_rfbi_set_size()
-         */
-        rfbi.timings.hsw = 1;
-        rfbi.timings.hfp = 1;
-        rfbi.timings.hbp = 1;
-        rfbi.timings.vsw = 1;
-        rfbi.timings.vfp = 0;
-        rfbi.timings.vbp = 0;
-        rfbi.timings.interlace = false;
-        rfbi.timings.hsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
-        rfbi.timings.vsync_level = OMAPDSS_SIG_ACTIVE_HIGH;
-        rfbi.timings.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
-        rfbi.timings.de_level = OMAPDSS_SIG_ACTIVE_HIGH;
-        rfbi.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_FALLING_EDGE;
-        dss_mgr_set_timings(mgr, &rfbi.timings);
-}
-static int rfbi_display_enable(struct omap_dss_device *dssdev)
-{
-        struct omap_dss_device *out = &rfbi.output;
-        int r;
-        if (out->manager == NULL) {
-                DSSERR("failed to enable display: no output/manager\n");
-                return -ENODEV;
-        }
-        r = rfbi_runtime_get();
-        if (r)
-                return r;
-        r = dss_mgr_register_framedone_handler(out->manager,
-                        framedone_callback, NULL);
-        if (r) {
-                DSSERR("can't get FRAMEDONE irq\n");
-                goto err1;
-        }
-        rfbi_config_lcd_manager(dssdev);
-        rfbi_configure_bus(dssdev->phy.rfbi.channel, rfbi.pixel_size,
-                        rfbi.data_lines);
-        rfbi_set_timings(dssdev->phy.rfbi.channel, &rfbi.intf_timings);
-        return 0;
-err1:
-        rfbi_runtime_put();
-        return r;
-}
-static void rfbi_display_disable(struct omap_dss_device *dssdev)
-{
-        struct omap_dss_device *out = &rfbi.output;
-        dss_mgr_unregister_framedone_handler(out->manager,
-                        framedone_callback, NULL);
-        rfbi_runtime_put();
-}
-static int rfbi_init_display(struct omap_dss_device *dssdev)
-{
-        rfbi.dssdev[dssdev->phy.rfbi.channel] = dssdev;
-        return 0;
-}
-static void rfbi_init_output(struct platform_device *pdev)
-{
-        struct omap_dss_device *out = &rfbi.output;
-        out->dev = &pdev->dev;
-        out->id = OMAP_DSS_OUTPUT_DBI;
-        out->output_type = OMAP_DISPLAY_TYPE_DBI;
-        out->name = "rfbi.0";
-        out->dispc_channel = OMAP_DSS_CHANNEL_LCD;
-        out->owner = THIS_MODULE;
-        omapdss_register_output(out);
-}
-static void rfbi_uninit_output(struct platform_device *pdev)
-{
-        struct omap_dss_device *out = &rfbi.output;
-        omapdss_unregister_output(out);
-}
-/* RFBI HW IP initialisation */
-static int rfbi_bind(struct device *dev, struct device *master, void *data)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        u32 rev;
-        struct resource *rfbi_mem;
-        struct clk *clk;
-        int r;
-        rfbi.pdev = pdev;
-        sema_init(&rfbi.bus_lock, 1);
-        rfbi_mem = platform_get_resource(rfbi.pdev, IORESOURCE_MEM, 0);
-        if (!rfbi_mem) {
-                DSSERR("can't get IORESOURCE_MEM RFBI\n");
-                return -EINVAL;
-        }
-        rfbi.base = devm_ioremap(&pdev->dev, rfbi_mem->start,
-                                 resource_size(rfbi_mem));
-        if (!rfbi.base) {
-                DSSERR("can't ioremap RFBI\n");
-                return -ENOMEM;
-        }
-        clk = clk_get(&pdev->dev, "ick");
-        if (IS_ERR(clk)) {
-                DSSERR("can't get ick\n");
-                return PTR_ERR(clk);
-        }
-        rfbi.l4_khz = clk_get_rate(clk) / 1000;
-        clk_put(clk);
-        pm_runtime_enable(&pdev->dev);
-        r = rfbi_runtime_get();
-        if (r)
-                goto err_runtime_get;
-        msleep(10);
-        rev = rfbi_read_reg(RFBI_REVISION);
-        dev_dbg(&pdev->dev, "OMAP RFBI rev %d.%d\n",
-               FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));
-        rfbi_runtime_put();
-        dss_debugfs_create_file("rfbi", rfbi_dump_regs);
-        rfbi_init_output(pdev);
-        return 0;
-err_runtime_get:
-        pm_runtime_disable(&pdev->dev);
-        return r;
-}
-static void rfbi_unbind(struct device *dev, struct device *master, void *data)
-{
-        struct platform_device *pdev = to_platform_device(dev);
-        rfbi_uninit_output(pdev);
-        pm_runtime_disable(&pdev->dev);
-        return 0;
-}
-static const struct component_ops rfbi_component_ops = {
-        .bind   = rfbi_bind,
-        .unbind = rfbi_unbind,
-};
-static int rfbi_probe(struct platform_device *pdev)
-{
-        return component_add(&pdev->dev, &rfbi_component_ops);
-}
-static int rfbi_remove(struct platform_device *pdev)
-{
-        component_del(&pdev->dev, &rfbi_component_ops);
-        return 0;
-}
-static int rfbi_runtime_suspend(struct device *dev)
-{
-        dispc_runtime_put();
-        return 0;
-}
-static int rfbi_runtime_resume(struct device *dev)
-{
-        int r;
-        r = dispc_runtime_get();
-        if (r < 0)
-                return r;
-        return 0;
-}
-static const struct dev_pm_ops rfbi_pm_ops = {
-        .runtime_suspend = rfbi_runtime_suspend,
-        .runtime_resume = rfbi_runtime_resume,
-};
-static struct platform_driver omap_rfbihw_driver = {
-        .probe          = rfbi_probe,
-        .remove         = rfbi_remove,
-        .driver         = {
-                .name   = "omapdss_rfbi",
-                .pm     = &rfbi_pm_ops,
-                .suppress_bind_attrs = true,
-        },
-};
-int __init rfbi_init_platform_driver(void)
-{
-        return platform_driver_register(&omap_rfbihw_driver);
-}
-void rfbi_uninit_platform_driver(void)
-{
-        platform_driver_unregister(&omap_rfbihw_driver);
-}
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
index c7d936f9d383..858c2c011d19 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-main.c
@@ -1881,12 +1881,8 @@ static int omapfb_create_framebuffers(struct omapfb2_device *fbdev)
                fbi = framebuffer_alloc(sizeof(struct omapfb_info),
                                fbdev->dev);
+                if (!fbi)
-                if (fbi == NULL) {
-                        dev_err(fbdev->dev,
-                                "unable to allocate memory for plane info\n");
                        return -ENOMEM;
-                }
                clear_fb_info(fbi);
diff --git a/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c b/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
index e1f8b5ae75b8..4a5db170ef59 100644
--- a/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
+++ b/drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c
@@ -49,8 +49,7 @@ static ssize_t store_rotate_type(struct device *dev,
        if (rot_type != OMAP_DSS_ROT_DMA && rot_type != OMAP_DSS_ROT_VRFB)
                return -EINVAL;
-        if (!lock_fb_info(fbi))
+        lock_fb_info(fbi);
-                return -ENODEV;
        r = 0;
        if (rot_type == ofbi->rotation_type)
@@ -101,8 +100,7 @@ static ssize_t store_mirror(struct device *dev,
        if (r)
                return r;
-        if (!lock_fb_info(fbi))
+        lock_fb_info(fbi);
-                return -ENODEV;
        ofbi->mirror = mirror;
@@ -138,8 +136,7 @@ static ssize_t show_overlays(struct device *dev,
        ssize_t l = 0;
        int t;
-        if (!lock_fb_info(fbi))
+        lock_fb_info(fbi);
-                return -ENODEV;
        omapfb_lock(fbdev);
        for (t = 0; t < ofbi->num_overlays; t++) {
@@ -197,8 +194,7 @@ static ssize_t store_overlays(struct device *dev, struct device_attribute *attr,
        if (buf[len - 1] == '\n')
                len = len - 1;
-        if (!lock_fb_info(fbi))
+        lock_fb_info(fbi);
-                return -ENODEV;
        omapfb_lock(fbdev);
        if (len > 0) {
@@ -329,8 +325,7 @@ static ssize_t show_overlays_rotate(struct device *dev,
        ssize_t l = 0;
        int t;
-        if (!lock_fb_info(fbi))
+        lock_fb_info(fbi);
-                return -ENODEV;
        for (t = 0; t < ofbi->num_overlays; t++) {
                l += snprintf(buf + l, PAGE_SIZE - l, "%s%d",
@@ -358,8 +353,7 @@ static ssize_t store_overlays_rotate(struct device *dev,
        if (buf[len - 1] == '\n')
                len = len - 1;
-        if (!lock_fb_info(fbi))
+        lock_fb_info(fbi);
-                return -ENODEV;
        if (len > 0) {
                char *p = (char *)buf;
@@ -442,8 +436,7 @@ static ssize_t store_size(struct device *dev, struct device_attribute *attr,
        size = PAGE_ALIGN(size);
-        if (!lock_fb_info(fbi))
+        lock_fb_info(fbi);
-                return -ENODEV;
        if (display && display->driver->sync)
                display->driver->sync(display);
diff --git a/drivers/video/fbdev/platinumfb.c b/drivers/video/fbdev/platinumfb.c
index 76f299375a00..632b246ca35f 100644
--- a/drivers/video/fbdev/platinumfb.c
+++ b/drivers/video/fbdev/platinumfb.c
@@ -538,10 +538,9 @@ static int platinumfb_probe(struct platform_device* odev)
        dev_info(&odev->dev, "Found Apple Platinum video hardware\n");
        info = framebuffer_alloc(sizeof(*pinfo), &odev->dev);
-        if (info == NULL) {
+        if (!info)
-                dev_err(&odev->dev, "Failed to allocate fbdev !\n");
                return -ENOMEM;
-        }
        pinfo = info->par;
        if (of_address_to_resource(dp, 0, &pinfo->rsrc_reg) ||
diff --git a/drivers/video/fbdev/pmag-aa-fb.c b/drivers/video/fbdev/pmag-aa-fb.c
index ca7e9390d1e7..d1e78ce3a9c2 100644
--- a/drivers/video/fbdev/pmag-aa-fb.c
+++ b/drivers/video/fbdev/pmag-aa-fb.c
@@ -165,10 +165,8 @@ static int pmagaafb_probe(struct device *dev)
        int err;
        info = framebuffer_alloc(sizeof(struct aafb_par), dev);
-        if (!info) {
+        if (!info)
-                printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev));
                return -ENOMEM;
-        }
        par = info->par;
        dev_set_drvdata(dev, info);
diff --git a/drivers/video/fbdev/pmag-ba-fb.c b/drivers/video/fbdev/pmag-ba-fb.c
index 3b9249449ea6..56b912bb28de 100644
--- a/drivers/video/fbdev/pmag-ba-fb.c
+++ b/drivers/video/fbdev/pmag-ba-fb.c
@@ -150,10 +150,8 @@ static int pmagbafb_probe(struct device *dev)
        int err;
        info = framebuffer_alloc(sizeof(struct pmagbafb_par), dev);
-        if (!info) {
+        if (!info)
-                printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev));
                return -ENOMEM;
-        }
        par = info->par;
        dev_set_drvdata(dev, info);
diff --git a/drivers/video/fbdev/pmagb-b-fb.c b/drivers/video/fbdev/pmagb-b-fb.c
index e58df36233c4..2822b2225924 100644
--- a/drivers/video/fbdev/pmagb-b-fb.c
+++ b/drivers/video/fbdev/pmagb-b-fb.c
@@ -257,10 +257,8 @@ static int pmagbbfb_probe(struct device *dev)
        int err;
        info = framebuffer_alloc(sizeof(struct pmagbbfb_par), dev);
-        if (!info) {
+        if (!info)
-                printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev));
                return -ENOMEM;
-        }
        par = info->par;
        dev_set_drvdata(dev, info);
diff --git a/drivers/video/fbdev/pvr2fb.c b/drivers/video/fbdev/pvr2fb.c
index 73d92d8a85cc..7ff4b6b84282 100644
--- a/drivers/video/fbdev/pvr2fb.c
+++ b/drivers/video/fbdev/pvr2fb.c
@@ -140,7 +140,7 @@ static struct pvr2fb_par {
        unsigned char is_doublescan;    /* Are scanlines output twice? (doublescan) */
        unsigned char is_lowres;        /* Is horizontal pixel-doubling enabled? */
-        unsigned long mmio_base;        /* MMIO base */
+        void __iomem *mmio_base;        /* MMIO base */
        u32 palette[16];
 } *currentpar;
@@ -194,39 +194,6 @@ static unsigned int shdma = PVR2_CASCADE_CHAN;
 static unsigned int pvr2dma = ONCHIP_NR_DMA_CHANNELS;
 #endif
-static int pvr2fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green, unsigned int blue,
-                            unsigned int transp, struct fb_info *info);
-static int pvr2fb_blank(int blank, struct fb_info *info);
-static unsigned long get_line_length(int xres_virtual, int bpp);
-static void set_color_bitfields(struct fb_var_screeninfo *var);
-static int pvr2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info);
-static int pvr2fb_set_par(struct fb_info *info);
-static void pvr2_update_display(struct fb_info *info);
-static void pvr2_init_display(struct fb_info *info);
-static void pvr2_do_blank(void);
-static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id);
-static int pvr2_init_cable(void);
-static int pvr2_get_param(const struct pvr2_params *p, const char *s,
-                            int val, int size);
-#ifdef CONFIG_PVR2_DMA
-static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
-                            size_t count, loff_t *ppos);
-#endif
-static struct fb_ops pvr2fb_ops = {
-        .owner          = THIS_MODULE,
-        .fb_setcolreg   = pvr2fb_setcolreg,
-        .fb_blank       = pvr2fb_blank,
-        .fb_check_var   = pvr2fb_check_var,
-        .fb_set_par     = pvr2fb_set_par,
-#ifdef CONFIG_PVR2_DMA
-        .fb_write       = pvr2fb_write,
-#endif
-        .fb_fillrect    = cfb_fillrect,
-        .fb_copyarea    = cfb_copyarea,
-        .fb_imageblit   = cfb_imageblit,
-};
 static struct fb_videomode pvr2_modedb[] = {
    /*
     * Broadcast video modes (PAL and NTSC).  I'm unfamiliar with
@@ -354,6 +321,36 @@ static int pvr2fb_setcolreg(unsigned int regno, unsigned int red,
        return 0;
 }
+/*
+ * Determine the cable type and initialize the cable output format.  Don't do
+ * anything if the cable type has been overidden (via "cable:XX").
+ */
+#define PCTRA ((void __iomem *)0xff80002c)
+#define PDTRA ((void __iomem *)0xff800030)
+#define VOUTC ((void __iomem *)0xa0702c00)
+static int pvr2_init_cable(void)
+{
+        if (cable_type < 0) {
+                fb_writel((fb_readl(PCTRA) & 0xfff0ffff) | 0x000a0000,
+                          PCTRA);
+                cable_type = (fb_readw(PDTRA) >> 8) & 3;
+        }
+        /* Now select the output format (either composite or other) */
+        /* XXX: Save the previous val first, as this reg is also AICA
+          related */
+        if (cable_type == CT_COMPOSITE)
+                fb_writel(3 << 8, VOUTC);
+        else if (cable_type == CT_RGB)
+                fb_writel(1 << 9, VOUTC);
+        else
+                fb_writel(0, VOUTC);
+        return cable_type;
+}
 static int pvr2fb_set_par(struct fb_info *info)
 {
        struct pvr2fb_par *par = (struct pvr2fb_par *)info->par;
@@ -623,7 +620,7 @@ static void pvr2_do_blank(void)
        is_blanked = do_blank > 0 ? do_blank : 0;
 }
-static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id)
+static irqreturn_t __maybe_unused pvr2fb_interrupt(int irq, void *dev_id)
 {
        struct fb_info *info = dev_id;
@@ -642,36 +639,6 @@ static irqreturn_t pvr2fb_interrupt(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
-/*
- * Determine the cable type and initialize the cable output format.  Don't do
- * anything if the cable type has been overidden (via "cable:XX").
- */
-#define PCTRA 0xff80002c
-#define PDTRA 0xff800030
-#define VOUTC 0xa0702c00
-static int pvr2_init_cable(void)
-{
-        if (cable_type < 0) {
-                fb_writel((fb_readl(PCTRA) & 0xfff0ffff) | 0x000a0000,
-                          PCTRA);
-                cable_type = (fb_readw(PDTRA) >> 8) & 3;
-        }
-        /* Now select the output format (either composite or other) */
-        /* XXX: Save the previous val first, as this reg is also AICA
-          related */
-        if (cable_type == CT_COMPOSITE)
-                fb_writel(3 << 8, VOUTC);
-        else if (cable_type == CT_RGB)
-                fb_writel(1 << 9, VOUTC);
-        else
-                fb_writel(0, VOUTC);
-        return cable_type;
-}
 #ifdef CONFIG_PVR2_DMA
 static ssize_t pvr2fb_write(struct fb_info *info, const char *buf,
                            size_t count, loff_t *ppos)
@@ -742,6 +709,46 @@ out_unmap:
 }
 #endif /* CONFIG_PVR2_DMA */
+static struct fb_ops pvr2fb_ops = {
+        .owner          = THIS_MODULE,
+        .fb_setcolreg   = pvr2fb_setcolreg,
+        .fb_blank       = pvr2fb_blank,
+        .fb_check_var   = pvr2fb_check_var,
+        .fb_set_par     = pvr2fb_set_par,
+#ifdef CONFIG_PVR2_DMA
+        .fb_write       = pvr2fb_write,
+#endif
+        .fb_fillrect    = cfb_fillrect,
+        .fb_copyarea    = cfb_copyarea,
+        .fb_imageblit   = cfb_imageblit,
+};
+#ifndef MODULE
+static int pvr2_get_param_val(const struct pvr2_params *p, const char *s,
+                              int size)
+{
+        int i;
+        for (i = 0; i < size; i++) {
+                if (!strncasecmp(p[i].name, s, strlen(s)))
+                        return p[i].val;
+        }
+        return -1;
+}
+#endif
+static char *pvr2_get_param_name(const struct pvr2_params *p, int val,
+                          int size)
+{
+        int i;
+        for (i = 0; i < size; i++) {
+                if (p[i].val == val)
+                        return p[i].name;
+        }
+        return NULL;
+}
 /**
 * pvr2fb_common_init
 *
@@ -760,7 +767,7 @@ out_unmap:
 * in for flexibility anyways. Who knows, maybe someone has tv-out on a
 * PCI-based version of these things ;-)
 */
-static int pvr2fb_common_init(void)
+static int __maybe_unused pvr2fb_common_init(void)
 {
        struct pvr2fb_par *par = currentpar;
        unsigned long modememused, rev;
@@ -773,8 +780,8 @@ static int pvr2fb_common_init(void)
                goto out_err;
        }
-        par->mmio_base = (unsigned long)ioremap_nocache(pvr2_fix.mmio_start,
+        par->mmio_base = ioremap_nocache(pvr2_fix.mmio_start,
-                                                        pvr2_fix.mmio_len);
+                                         pvr2_fix.mmio_len);
        if (!par->mmio_base) {
                printk(KERN_ERR "pvr2fb: Failed to remap mmio space\n");
                goto out_err;
@@ -822,8 +829,8 @@ static int pvr2fb_common_init(void)
                fb_info->var.xres, fb_info->var.yres,
                fb_info->var.bits_per_pixel,
                get_line_length(fb_info->var.xres, fb_info->var.bits_per_pixel),
-                (char *)pvr2_get_param(cables, NULL, cable_type, 3),
+                pvr2_get_param_name(cables, cable_type, 3),
-                (char *)pvr2_get_param(outputs, NULL, video_output, 3));
+                pvr2_get_param_name(outputs, video_output, 3));
 #ifdef CONFIG_SH_STORE_QUEUES
        fb_notice(fb_info, "registering with SQ API\n");
@@ -841,7 +848,7 @@ out_err:
        if (fb_info->screen_base)
                iounmap(fb_info->screen_base);
        if (par->mmio_base)
-                iounmap((void *)par->mmio_base);
+                iounmap(par->mmio_base);
        return -ENXIO;
 }
@@ -901,15 +908,15 @@ static int __init pvr2fb_dc_init(void)
        return pvr2fb_common_init();
 }
-static void __exit pvr2fb_dc_exit(void)
+static void pvr2fb_dc_exit(void)
 {
        if (fb_info->screen_base) {
                iounmap(fb_info->screen_base);
                fb_info->screen_base = NULL;
        }
        if (currentpar->mmio_base) {
-                iounmap((void *)currentpar->mmio_base);
+                iounmap(currentpar->mmio_base);
-                currentpar->mmio_base = 0;
+                currentpar->mmio_base = NULL;
        }
        free_irq(HW_EVENT_VSYNC, fb_info);
@@ -958,8 +965,8 @@ static void pvr2fb_pci_remove(struct pci_dev *pdev)
                fb_info->screen_base = NULL;
        }
        if (currentpar->mmio_base) {
-                iounmap((void *)currentpar->mmio_base);
+                iounmap(currentpar->mmio_base);
-                currentpar->mmio_base = 0;
+                currentpar->mmio_base = NULL;
        }
        pci_release_regions(pdev);
@@ -985,29 +992,12 @@ static int __init pvr2fb_pci_init(void)
        return pci_register_driver(&pvr2fb_pci_driver);
 }
-static void __exit pvr2fb_pci_exit(void)
+static void pvr2fb_pci_exit(void)
 {
        pci_unregister_driver(&pvr2fb_pci_driver);
 }
 #endif /* CONFIG_PCI */
-static int pvr2_get_param(const struct pvr2_params *p, const char *s, int val,
-                          int size)
-{
-        int i;
-        for (i = 0 ; i < size ; i++ ) {
-                if (s != NULL) {
-                        if (!strncasecmp(p[i].name, s, strlen(s)))
-                                return p[i].val;
-                } else {
-                        if (p[i].val == val)
-                                return (int)p[i].name;
-                }
-        }
-        return -1;
-}
 /*
 * Parse command arguments.  Supported arguments are:
 *    inverse                             Use inverse color maps
@@ -1047,9 +1037,9 @@ static int __init pvr2fb_setup(char *options)
        }
        if (*cable_arg)
-                cable_type = pvr2_get_param(cables, cable_arg, 0, 3);
+                cable_type = pvr2_get_param_val(cables, cable_arg, 3);
        if (*output_arg)
-                video_output = pvr2_get_param(outputs, output_arg, 0, 3);
+                video_output = pvr2_get_param_val(outputs, output_arg, 3);
        return 0;
 }
@@ -1082,12 +1072,8 @@ static int __init pvr2fb_init(void)
 #endif
        fb_info = framebuffer_alloc(sizeof(struct pvr2fb_par), NULL);
+        if (!fb_info)
-        if (!fb_info) {
-                printk(KERN_ERR "Failed to allocate memory for fb_info\n");
                return -ENOMEM;
-        }
        currentpar = fb_info->par;
diff --git a/drivers/video/fbdev/riva/fbdev.c b/drivers/video/fbdev/riva/fbdev.c
index cc242ba057d3..ca593a3e41d7 100644
--- a/drivers/video/fbdev/riva/fbdev.c
+++ b/drivers/video/fbdev/riva/fbdev.c
@@ -1902,7 +1902,6 @@ static int rivafb_probe(struct pci_dev *pd, const struct pci_device_id *ent)
        info = framebuffer_alloc(sizeof(struct riva_par), &pd->dev);
        if (!info) {
-                printk (KERN_ERR PFX "could not allocate memory\n");
                ret = -ENOMEM;
                goto err_ret;
        }
diff --git a/drivers/video/fbdev/s3c-fb.c b/drivers/video/fbdev/s3c-fb.c
index 288300035164..ba04d7a67829 100644
--- a/drivers/video/fbdev/s3c-fb.c
+++ b/drivers/video/fbdev/s3c-fb.c
@@ -284,7 +284,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
                /* 666 with one bit alpha/transparency */
                var->transp.offset      = 18;
                var->transp.length      = 1;
-                /* drop through */
+                /* fall through */
        case 18:
                var->bits_per_pixel     = 32;
@@ -312,7 +312,7 @@ static int s3c_fb_check_var(struct fb_var_screeninfo *var,
        case 25:
                var->transp.length      = var->bits_per_pixel - 24;
                var->transp.offset      = 24;
-                /* drop through */
+                /* fall through */
        case 24:
                /* our 24bpp is unpacked, so 32bpp */
                var->bits_per_pixel     = 32;
@@ -809,7 +809,7 @@ static int s3c_fb_blank(int blank_mode, struct fb_info *info)
        case FB_BLANK_POWERDOWN:
                wincon &= ~WINCONx_ENWIN;
                sfb->enabled &= ~(1 << index);
-                /* fall through to FB_BLANK_NORMAL */
+                /* fall through - to FB_BLANK_NORMAL */
        case FB_BLANK_NORMAL:
                /* disable the DMA and display 0x0 (black) */
@@ -1102,14 +1102,14 @@ static int s3c_fb_alloc_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)
        dev_dbg(sfb->dev, "want %u bytes for window\n", size);
-        fbi->screen_base = dma_alloc_wc(sfb->dev, size, &map_dma, GFP_KERNEL);
+        fbi->screen_buffer = dma_alloc_wc(sfb->dev, size, &map_dma, GFP_KERNEL);
-        if (!fbi->screen_base)
+        if (!fbi->screen_buffer)
                return -ENOMEM;
        dev_dbg(sfb->dev, "mapped %x to %p\n",
-                (unsigned int)map_dma, fbi->screen_base);
+                (unsigned int)map_dma, fbi->screen_buffer);
-        memset(fbi->screen_base, 0x0, size);
+        memset(fbi->screen_buffer, 0x0, size);
        fbi->fix.smem_start = map_dma;
        return 0;
@@ -1126,9 +1126,9 @@ static void s3c_fb_free_memory(struct s3c_fb *sfb, struct s3c_fb_win *win)
 {
        struct fb_info *fbi = win->fbinfo;
-        if (fbi->screen_base)
+        if (fbi->screen_buffer)
                dma_free_wc(sfb->dev, PAGE_ALIGN(fbi->fix.smem_len),
-                            fbi->screen_base, fbi->fix.smem_start);
+                            fbi->screen_buffer, fbi->fix.smem_start);
 }
 /**
@@ -1186,10 +1186,8 @@ static int s3c_fb_probe_win(struct s3c_fb *sfb, unsigned int win_no,
        fbinfo = framebuffer_alloc(sizeof(struct s3c_fb_win) +
                                   palette_size * sizeof(u32), sfb->dev);
-        if (!fbinfo) {
+        if (!fbinfo)
-                dev_err(sfb->dev, "failed to allocate framebuffer\n");
+                return -ENOMEM;
-                return -ENOENT;
-        }
        windata = sfb->pdata->win[win_no];
        initmode = *sfb->pdata->vtiming;
diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c
index d63f23e26f7d..be16c349c10f 100644
--- a/drivers/video/fbdev/s3fb.c
+++ b/drivers/video/fbdev/s3fb.c
@@ -1128,10 +1128,8 @@ static int s3_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        /* Allocate and fill driver data structure */
        info = framebuffer_alloc(sizeof(struct s3fb_info), &(dev->dev));
-        if (!info) {
+        if (!info)
-                dev_err(&(dev->dev), "cannot allocate memory\n");
                return -ENOMEM;
-        }
        par = info->par;
        mutex_init(&par->open_lock);
diff --git a/drivers/video/fbdev/sa1100fb.c b/drivers/video/fbdev/sa1100fb.c
index 15ae50063296..f7f8dee044b1 100644
--- a/drivers/video/fbdev/sa1100fb.c
+++ b/drivers/video/fbdev/sa1100fb.c
@@ -974,35 +974,10 @@ static void sa1100fb_task(struct work_struct *w)
 */
 static unsigned int sa1100fb_min_dma_period(struct sa1100fb_info *fbi)
 {
-#if 0
-        unsigned int min_period = (unsigned int)-1;
-        int i;
-        for (i = 0; i < MAX_NR_CONSOLES; i++) {
-                struct display *disp = &fb_display[i];
-                unsigned int period;
-                /*
-                 * Do we own this display?
-                 */
-                if (disp->fb_info != &fbi->fb)
-                        continue;
-                /*
-                 * Ok, calculate its DMA period
-                 */
-                period = sa1100fb_display_dma_period(&disp->var);
-                if (period < min_period)
-                        min_period = period;
-        }
-        return min_period;
-#else
        /*
         * FIXME: we need to verify _all_ consoles.
         */
        return sa1100fb_display_dma_period(&fbi->fb.var);
-#endif
 }
 /*
diff --git a/drivers/video/fbdev/savage/savagefb_driver.c b/drivers/video/fbdev/savage/savagefb_driver.c
index 47b78f0138c3..512789f5f884 100644
--- a/drivers/video/fbdev/savage/savagefb_driver.c
+++ b/drivers/video/fbdev/savage/savagefb_driver.c
@@ -2333,14 +2333,7 @@ static void savagefb_remove(struct pci_dev *dev)
        DBG("savagefb_remove");
        if (info) {
-                /*
+                unregister_framebuffer(info);
-                 * If unregister_framebuffer fails, then
-                 * we will be leaving hooks that could cause
-                 * oopsen laying around.
-                 */
-                if (unregister_framebuffer(info))
-                        printk(KERN_WARNING "savagefb: danger danger! "
-                               "Oopsen imminent!\n");
 #ifdef CONFIG_FB_SAVAGE_I2C
                savagefb_delete_i2c_busses(info);
diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
index dc46be38c970..ac0bcac9a865 100644
--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
@@ -15,6 +15,7 @@
 #include <linux/ctype.h>
 #include <linux/dma-mapping.h>
 #include <linux/delay.h>
+#include <linux/fbcon.h>
 #include <linux/gpio.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -213,7 +214,6 @@ struct sh_mobile_lcdc_priv {
        struct sh_mobile_lcdc_chan ch[2];
        struct sh_mobile_lcdc_overlay overlays[4];
-        struct notifier_block notifier;
        int started;
        int forced_fourcc; /* 2 channel LCDC must share fourcc setting */
 };
@@ -534,89 +534,9 @@ static void sh_mobile_lcdc_display_off(struct sh_mobile_lcdc_chan *ch)
                ch->tx_dev->ops->display_off(ch->tx_dev);
 }
-static bool
-sh_mobile_lcdc_must_reconfigure(struct sh_mobile_lcdc_chan *ch,
-                                const struct fb_videomode *new_mode)
-{
-        dev_dbg(ch->info->dev, "Old %ux%u, new %ux%u\n",
-                ch->display.mode.xres, ch->display.mode.yres,
-                new_mode->xres, new_mode->yres);
-        /* It can be a different monitor with an equal video-mode */
-        if (fb_mode_is_equal(&ch->display.mode, new_mode))
-                return false;
-        dev_dbg(ch->info->dev, "Switching %u -> %u lines\n",
-                ch->display.mode.yres, new_mode->yres);
-        ch->display.mode = *new_mode;
-        return true;
-}
 static int sh_mobile_lcdc_check_var(struct fb_var_screeninfo *var,
                                    struct fb_info *info);
-static int sh_mobile_lcdc_display_notify(struct sh_mobile_lcdc_chan *ch,
-                                         enum sh_mobile_lcdc_entity_event event,
-                                         const struct fb_videomode *mode,
-                                         const struct fb_monspecs *monspec)
-{
-        struct fb_info *info = ch->info;
-        struct fb_var_screeninfo var;
-        int ret = 0;
-        switch (event) {
-        case SH_MOBILE_LCDC_EVENT_DISPLAY_CONNECT:
-                /* HDMI plug in */
-                console_lock();
-                if (lock_fb_info(info)) {
-                        ch->display.width = monspec->max_x * 10;
-                        ch->display.height = monspec->max_y * 10;
-                        if (!sh_mobile_lcdc_must_reconfigure(ch, mode) &&
-                            info->state == FBINFO_STATE_RUNNING) {
-                                /* First activation with the default monitor.
-                                 * Just turn on, if we run a resume here, the
-                                 * logo disappears.
-                                 */
-                                info->var.width = ch->display.width;
-                                info->var.height = ch->display.height;
-                                sh_mobile_lcdc_display_on(ch);
-                        } else {
-                                /* New monitor or have to wake up */
-                                fb_set_suspend(info, 0);
-                        }
-                        unlock_fb_info(info);
-                }
-                console_unlock();
-                break;
-        case SH_MOBILE_LCDC_EVENT_DISPLAY_DISCONNECT:
-                /* HDMI disconnect */
-                console_lock();
-                if (lock_fb_info(info)) {
-                        fb_set_suspend(info, 1);
-                        unlock_fb_info(info);
-                }
-                console_unlock();
-                break;
-        case SH_MOBILE_LCDC_EVENT_DISPLAY_MODE:
-                /* Validate a proposed new mode */
-                fb_videomode_to_var(&var, mode);
-                var.bits_per_pixel = info->var.bits_per_pixel;
-                var.grayscale = info->var.grayscale;
-                ret = sh_mobile_lcdc_check_var(&var, info);
-                break;
-        }
-        return ret;
-}
 /* -----------------------------------------------------------------------------
 * Format helpers
 */
@@ -1644,10 +1564,8 @@ sh_mobile_lcdc_overlay_fb_init(struct sh_mobile_lcdc_overlay *ovl)
        /* Allocate and initialize the frame buffer device. */
        info = framebuffer_alloc(0, priv->dev);
-        if (info == NULL) {
+        if (!info)
-                dev_err(priv->dev, "unable to allocate fb_info\n");
                return -ENOMEM;
-        }
        ovl->info = info;
@@ -1838,8 +1756,6 @@ static void sh_mobile_fb_reconfig(struct fb_info *info)
        struct sh_mobile_lcdc_chan *ch = info->par;
        struct fb_var_screeninfo var;
        struct fb_videomode mode;
-        struct fb_event event;
-        int evnt = FB_EVENT_MODE_CHANGE_ALL;
        if (ch->use_count > 1 || (ch->use_count == 1 && !info->fbcon_par))
                /* More framebuffer users are active */
@@ -1861,14 +1777,7 @@ static void sh_mobile_fb_reconfig(struct fb_info *info)
                /* Couldn't reconfigure, hopefully, can continue as before */
                return;
-        /*
+        fbcon_update_vcs(info, true);
-         * fb_set_var() calls the notifier change internally, only if
-         * FBINFO_MISC_USEREVENT flag is set. Since we do not want to fake a
-         * user event, we have to call the chain ourselves.
-         */
-        event.info = info;
-        event.data = &ch->display.mode;
-        fb_notifier_call_chain(evnt, &event);
 }
 /*
@@ -2138,10 +2047,8 @@ sh_mobile_lcdc_channel_fb_init(struct sh_mobile_lcdc_chan *ch,
         * list and allocate the color map.
         */
        info = framebuffer_alloc(0, priv->dev);
-        if (info == NULL) {
+        if (!info)
-                dev_err(priv->dev, "unable to allocate fb_info\n");
                return -ENOMEM;
-        }
        ch->info = info;
@@ -2319,37 +2226,6 @@ static const struct dev_pm_ops sh_mobile_lcdc_dev_pm_ops = {
 * Framebuffer notifier
 */
-/* locking: called with info->lock held */
-static int sh_mobile_lcdc_notify(struct notifier_block *nb,
-                                 unsigned long action, void *data)
-{
-        struct fb_event *event = data;
-        struct fb_info *info = event->info;
-        struct sh_mobile_lcdc_chan *ch = info->par;
-        if (&ch->lcdc->notifier != nb)
-                return NOTIFY_DONE;
-        dev_dbg(info->dev, "%s(): action = %lu, data = %p\n",
-                __func__, action, event->data);
-        switch(action) {
-        case FB_EVENT_SUSPEND:
-                sh_mobile_lcdc_display_off(ch);
-                sh_mobile_lcdc_stop(ch->lcdc);
-                break;
-        case FB_EVENT_RESUME:
-                mutex_lock(&ch->open_lock);
-                sh_mobile_fb_reconfig(info);
-                mutex_unlock(&ch->open_lock);
-                sh_mobile_lcdc_display_on(ch);
-                sh_mobile_lcdc_start(ch->lcdc);
-        }
-        return NOTIFY_OK;
-}
 /* -----------------------------------------------------------------------------
 * Probe/remove and driver init/exit
 */
@@ -2377,8 +2253,6 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
        struct sh_mobile_lcdc_priv *priv = platform_get_drvdata(pdev);
        unsigned int i;
-        fb_unregister_client(&priv->notifier);
        for (i = 0; i < ARRAY_SIZE(priv->overlays); i++)
                sh_mobile_lcdc_overlay_fb_unregister(&priv->overlays[i]);
        for (i = 0; i < ARRAY_SIZE(priv->ch); i++)
@@ -2540,8 +2414,6 @@ sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch)
        unsigned int max_size;
        unsigned int i;
-        ch->notify = sh_mobile_lcdc_display_notify;
        /* Validate the format. */
        format = sh_mobile_format_info(cfg->fourcc);
        if (format == NULL) {
@@ -2770,10 +2642,6 @@ static int sh_mobile_lcdc_probe(struct platform_device *pdev)
                        goto err1;
        }
-        /* Failure ignored */
-        priv->notifier.notifier_call = sh_mobile_lcdc_notify;
-        fb_register_client(&priv->notifier);
        return 0;
 err1:
        sh_mobile_lcdc_remove(pdev);
diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.h b/drivers/video/fbdev/sh_mobile_lcdcfb.h
index b8e47a8bd8ab..589400372098 100644
--- a/drivers/video/fbdev/sh_mobile_lcdcfb.h
+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.h
@@ -87,11 +87,6 @@ struct sh_mobile_lcdc_chan {
        unsigned long base_addr_c;
        unsigned int line_size;
-        int (*notify)(struct sh_mobile_lcdc_chan *ch,
-                      enum sh_mobile_lcdc_entity_event event,
-                      const struct fb_videomode *mode,
-                      const struct fb_monspecs *monspec);
        /* Backlight */
        struct backlight_device *bl;
        unsigned int bl_brightness;
diff --git a/drivers/video/fbdev/sm501fb.c b/drivers/video/fbdev/sm501fb.c
index 5a326163847b..6edb4492e675 100644
--- a/drivers/video/fbdev/sm501fb.c
+++ b/drivers/video/fbdev/sm501fb.c
@@ -1865,10 +1865,8 @@ static int sm501fb_probe_one(struct sm501fb_info *info,
        }
        fbi = framebuffer_alloc(sizeof(struct sm501fb_par), info->dev);
-        if (fbi == NULL) {
+        if (!fbi)
-                dev_err(info->dev, "cannot allocate %s framebuffer\n", name);
                return -ENOMEM;
-        }
        par = fbi->par;
        par->info = info;
diff --git a/drivers/video/fbdev/sm712fb.c b/drivers/video/fbdev/sm712fb.c
index f1dcc6766d1e..7b1b0d8d27a7 100644
--- a/drivers/video/fbdev/sm712fb.c
+++ b/drivers/video/fbdev/sm712fb.c
@@ -1538,7 +1538,6 @@ static int smtcfb_pci_probe(struct pci_dev *pdev,
        info = framebuffer_alloc(sizeof(*sfb), &pdev->dev);
        if (!info) {
-                dev_err(&pdev->dev, "framebuffer_alloc failed\n");
                err = -ENOMEM;
                goto failed_free;
        }
diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
index 8cd7892a0b0d..0e0f5bbfc5ef 100644
--- a/drivers/video/fbdev/smscufx.c
+++ b/drivers/video/fbdev/smscufx.c
@@ -1650,10 +1650,8 @@ static int ufx_usb_probe(struct usb_interface *interface,
        /* allocates framebuffer driver structure, not framebuffer memory */
        info = framebuffer_alloc(0, &usbdev->dev);
-        if (!info) {
+        if (!info)
-                dev_err(dev->gdev, "framebuffer_alloc failed\n");
                goto e_nomem;
-        }
        dev->info = info;
        info->par = dev;
diff --git a/drivers/video/fbdev/ssd1307fb.c b/drivers/video/fbdev/ssd1307fb.c
index 021b727e8b5c..b674948e3bb8 100644
--- a/drivers/video/fbdev/ssd1307fb.c
+++ b/drivers/video/fbdev/ssd1307fb.c
@@ -555,10 +555,8 @@ static int ssd1307fb_probe(struct i2c_client *client,
        }
        info = framebuffer_alloc(sizeof(struct ssd1307fb_par), &client->dev);
-        if (!info) {
+        if (!info)
-                dev_err(&client->dev, "Couldn't allocate framebuffer.\n");
                return -ENOMEM;
-        }
        par = info->par;
        par->info = info;
diff --git a/drivers/video/fbdev/sunxvr1000.c b/drivers/video/fbdev/sunxvr1000.c
index 8fe37c0ef2f5..784c9bd5d502 100644
--- a/drivers/video/fbdev/sunxvr1000.c
+++ b/drivers/video/fbdev/sunxvr1000.c
@@ -121,7 +121,6 @@ static int gfb_probe(struct platform_device *op)
        info = framebuffer_alloc(sizeof(struct gfb_info), &op->dev);
        if (!info) {
-                printk(KERN_ERR "gfb: Cannot allocate fb_info\n");
                err = -ENOMEM;
                goto err_out;
        }
diff --git a/drivers/video/fbdev/sunxvr2500.c b/drivers/video/fbdev/sunxvr2500.c
index 544465ba1dc0..31683e5a8b79 100644
--- a/drivers/video/fbdev/sunxvr2500.c
+++ b/drivers/video/fbdev/sunxvr2500.c
@@ -132,7 +132,6 @@ static int s3d_pci_register(struct pci_dev *pdev,
        info = framebuffer_alloc(sizeof(struct s3d_info), &pdev->dev);
        if (!info) {
-                printk(KERN_ERR "s3d: Cannot allocate fb_info\n");
                err = -ENOMEM;
                goto err_disable;
        }
diff --git a/drivers/video/fbdev/sunxvr500.c b/drivers/video/fbdev/sunxvr500.c
index bc595937df08..d392976126a6 100644
--- a/drivers/video/fbdev/sunxvr500.c
+++ b/drivers/video/fbdev/sunxvr500.c
@@ -272,7 +272,6 @@ static int e3d_pci_register(struct pci_dev *pdev,
        info = framebuffer_alloc(sizeof(struct e3d_info), &pdev->dev);
        if (!info) {
-                printk(KERN_ERR "e3d: Cannot allocate fb_info\n");
                err = -ENOMEM;
                goto err_disable;
        }
diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c
index 65ba9921506e..286b2371c7dd 100644
--- a/drivers/video/fbdev/tgafb.c
+++ b/drivers/video/fbdev/tgafb.c
@@ -1416,10 +1416,8 @@ static int tgafb_register(struct device *dev)
        /* Allocate the fb and par structures.  */
        info = framebuffer_alloc(sizeof(struct tga_par), dev);
-        if (!info) {
+        if (!info)
-                printk(KERN_ERR "tgafb: Cannot allocate memory\n");
                return -ENOMEM;
-        }
        par = info->par;
        dev_set_drvdata(dev, info);
diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
index 00b99363e528..c328e8265cb1 100644
--- a/drivers/video/fbdev/udlfb.c
+++ b/drivers/video/fbdev/udlfb.c
@@ -1686,10 +1686,8 @@ static int dlfb_usb_probe(struct usb_interface *intf,
        /* allocates framebuffer driver structure, not framebuffer memory */
        info = framebuffer_alloc(0, &dlfb->udev->dev);
-        if (!info) {
+        if (!info)
-                dev_err(&dlfb->udev->dev, "framebuffer_alloc failed\n");
                goto error;
-        }
        dlfb->info = info;
        info->par = dlfb;
diff --git a/drivers/video/fbdev/via/viafbdev.c b/drivers/video/fbdev/via/viafbdev.c
index 8db5de13e2b7..f815f98190bc 100644
--- a/drivers/video/fbdev/via/viafbdev.c
+++ b/drivers/video/fbdev/via/viafbdev.c
@@ -1742,10 +1742,8 @@ int via_fb_pci_probe(struct viafb_dev *vdev)
        viafbinfo = framebuffer_alloc(viafb_par_length +
                ALIGN(sizeof(struct viafb_shared), BITS_PER_LONG/8),
                &vdev->pdev->dev);
-        if (!viafbinfo) {
+        if (!viafbinfo)
-                printk(KERN_ERR"Could not allocate memory for viafb_info.\n");
                return -ENOMEM;
-        }
        viaparinfo = (struct viafb_par *)viafbinfo->par;
        viaparinfo->shared = viafbinfo->par + viafb_par_length;
@@ -1820,8 +1818,6 @@ int via_fb_pci_probe(struct viafb_dev *vdev)
                viafbinfo1 = framebuffer_alloc(viafb_par_length,
                                &vdev->pdev->dev);
                if (!viafbinfo1) {
-                        printk(KERN_ERR
-                        "allocate the second framebuffer struct error\n");
                        rc = -ENOMEM;
                        goto out_fb_release;
                }
diff --git a/drivers/video/fbdev/vt8623fb.c b/drivers/video/fbdev/vt8623fb.c
index 5cac871db3ee..c339a8fbad81 100644
--- a/drivers/video/fbdev/vt8623fb.c
+++ b/drivers/video/fbdev/vt8623fb.c
@@ -669,10 +669,8 @@ static int vt8623_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        /* Allocate and fill driver data structure */
        info = framebuffer_alloc(sizeof(struct vt8623fb_info), &(dev->dev));
-        if (! info) {
+        if (!info)
-                dev_err(&(dev->dev), "cannot allocate memory\n");
                return -ENOMEM;
-        }
        par = info->par;
        mutex_init(&par->open_lock);
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index ed798e114663..24d4c16e3ae0 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -168,9 +168,6 @@ extern void vc_SAK(struct work_struct *work);
 #define CUR_DEFAULT CUR_UNDERLINE
-static inline bool con_is_visible(const struct vc_data *vc)
+bool con_is_visible(const struct vc_data *vc);
-{
-        return *vc->vc_display_fg == vc;
-}
 #endif /* _LINUX_CONSOLE_STRUCT_H */
diff --git a/include/linux/fb.h b/include/linux/fb.h
index f52ef0ad6781..303771264644 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -126,39 +126,15 @@ struct fb_cursor_user {
 /*      The resolution of the passed in fb_info about to change */ 
 #define FB_EVENT_MODE_CHANGE            0x01
-/*      The display on this fb_info is being suspended, no access to the
- *      framebuffer is allowed any more after that call returns
+#ifdef CONFIG_GUMSTIX_AM200EPD
- */
+/* only used by mach-pxa/am200epd.c */
-#define FB_EVENT_SUSPEND                0x02
-/*      The display on this fb_info was resumed, you can restore the display
- *      if you own it
- */
-#define FB_EVENT_RESUME                 0x03
-/*      An entry from the modelist was removed */
-#define FB_EVENT_MODE_DELETE            0x04
-/*      A driver registered itself */
 #define FB_EVENT_FB_REGISTERED          0x05
-/*      A driver unregistered itself */
 #define FB_EVENT_FB_UNREGISTERED        0x06
-/*      CONSOLE-SPECIFIC: get console to framebuffer mapping */
+#endif
-#define FB_EVENT_GET_CONSOLE_MAP        0x07
-/*      CONSOLE-SPECIFIC: set console to framebuffer mapping */
+/*      A display blank is requested       */
-#define FB_EVENT_SET_CONSOLE_MAP        0x08
-/*      A hardware display blank change occurred */
 #define FB_EVENT_BLANK                  0x09
-/*      Private modelist is to be replaced */
-#define FB_EVENT_NEW_MODELIST           0x0A
-/*      The resolution of the passed in fb_info about to change and
-        all vc's should be changed         */
-#define FB_EVENT_MODE_CHANGE_ALL        0x0B
-/*      A software display blank change occurred */
-#define FB_EVENT_CONBLANK               0x0C
-/*      Get drawing requirements        */
-#define FB_EVENT_GET_REQ                0x0D
-/*      Unbind from the console if possible */
-#define FB_EVENT_FB_UNBIND              0x0E
-/*      CONSOLE-SPECIFIC: remap all consoles to new fb - for vga_switcheroo */
-#define FB_EVENT_REMAP_ALL_CONSOLE      0x0F
 /*      A hardware display blank early change occurred */
 #define FB_EARLY_EVENT_BLANK            0x10
 /*      A hardware display blank revert early change occurred */
@@ -633,8 +609,8 @@ extern ssize_t fb_sys_write(struct fb_info *info, const char __user *buf,
 /* drivers/video/fbmem.c */
 extern int register_framebuffer(struct fb_info *fb_info);
-extern int unregister_framebuffer(struct fb_info *fb_info);
+extern void unregister_framebuffer(struct fb_info *fb_info);
-extern int unlink_framebuffer(struct fb_info *fb_info);
+extern void unlink_framebuffer(struct fb_info *fb_info);
 extern int remove_conflicting_pci_framebuffers(struct pci_dev *pdev, int res_id,
                                               const char *name);
 extern int remove_conflicting_framebuffers(struct apertures_struct *a,
@@ -660,7 +636,10 @@ extern struct class *fb_class;
        for (i = 0; i < FB_MAX; i++)            \
                if (!registered_fb[i]) {} else
-extern int lock_fb_info(struct fb_info *info);
+static inline void lock_fb_info(struct fb_info *info)
+{
+        mutex_lock(&info->lock);
+}
 static inline void unlock_fb_info(struct fb_info *info)
 {
diff --git a/include/linux/fbcon.h b/include/linux/fbcon.h
index f68a7db14165..ff5596dd30f8 100644
--- a/include/linux/fbcon.h
+++ b/include/linux/fbcon.h
@@ -4,9 +4,39 @@
 #ifdef CONFIG_FRAMEBUFFER_CONSOLE
 void __init fb_console_init(void);
 void __exit fb_console_exit(void);
+int fbcon_fb_registered(struct fb_info *info);
+void fbcon_fb_unregistered(struct fb_info *info);
+void fbcon_fb_unbind(struct fb_info *info);
+void fbcon_suspended(struct fb_info *info);
+void fbcon_resumed(struct fb_info *info);
+int fbcon_mode_deleted(struct fb_info *info,
+                       struct fb_videomode *mode);
+void fbcon_new_modelist(struct fb_info *info);
+void fbcon_get_requirement(struct fb_info *info,
+                           struct fb_blit_caps *caps);
+void fbcon_fb_blanked(struct fb_info *info, int blank);
+void fbcon_update_vcs(struct fb_info *info, bool all);
+void fbcon_remap_all(struct fb_info *info);
+int fbcon_set_con2fb_map_ioctl(void __user *argp);
+int fbcon_get_con2fb_map_ioctl(void __user *argp);
 #else
 static inline void fb_console_init(void) {}
 static inline void fb_console_exit(void) {}
+static inline int fbcon_fb_registered(struct fb_info *info) { return 0; }
+static inline void fbcon_fb_unregistered(struct fb_info *info) {}
+static inline void fbcon_fb_unbind(struct fb_info *info) {}
+static inline void fbcon_suspended(struct fb_info *info) {}
+static inline void fbcon_resumed(struct fb_info *info) {}
+static inline int fbcon_mode_deleted(struct fb_info *info,
+                                     struct fb_videomode *mode) { return 0; }
+static inline void fbcon_new_modelist(struct fb_info *info) {}
+static inline void fbcon_get_requirement(struct fb_info *info,
+                                         struct fb_blit_caps *caps) {}
+static inline void fbcon_fb_blanked(struct fb_info *info, int blank) {}
+static inline void fbcon_update_vcs(struct fb_info *info, bool all) {}
+static inline void fbcon_remap_all(struct fb_info *info) {}
+static inline int fbcon_set_con2fb_map_ioctl(void __user *argp) { return 0; }
+static inline int fbcon_get_con2fb_map_ioctl(void __user *argp) { return 0; }
 #endif
 #endif /* _LINUX_FBCON_H */
diff --git a/include/video/omapfb_dss.h b/include/video/omapfb_dss.h
index a167b839eccb..e8eaac2cb7b8 100644
--- a/include/video/omapfb_dss.h
+++ b/include/video/omapfb_dss.h
@@ -114,11 +114,6 @@ enum omap_dss_trans_key_type {
        OMAP_DSS_COLOR_KEY_VID_SRC = 1,
 };
-enum omap_rfbi_te_mode {
-        OMAP_DSS_RFBI_TE_MODE_1 = 1,
-        OMAP_DSS_RFBI_TE_MODE_2 = 2,
-};
 enum omap_dss_signal_level {
        OMAPDSS_SIG_ACTIVE_LOW,
        OMAPDSS_SIG_ACTIVE_HIGH,
@@ -189,27 +184,6 @@ enum omap_dss_output_id {
        OMAP_DSS_OUTPUT_HDMI    = 1 << 6,
 };
-/* RFBI */
-struct rfbi_timings {
-        int cs_on_time;
-        int cs_off_time;
-        int we_on_time;
-        int we_off_time;
-        int re_on_time;
-        int re_off_time;
-        int we_cycle_time;
-        int re_cycle_time;
-        int cs_pulse_width;
-        int access_time;
-        int clk_div;
-        u32 tim[5];             /* set by rfbi_convert_timings() */
-        int converted;
-};
 /* DSI */
 enum omap_dss_dsi_trans_mode {
@@ -641,11 +615,6 @@ struct omap_dss_device {
                } dpi;
                struct {
-                        u8 channel;
-                        u8 data_lines;
-                } rfbi;
-                struct {
                        u8 datapairs;
                } sdi;
@@ -668,7 +637,6 @@ struct omap_dss_device {
        struct {
                u8 pixel_size;
-                struct rfbi_timings rfbi_timings;
        } ctrl;
        const char *name;
author	Linus Torvalds <torvalds@linux-foundation.org>	2019-07-09 12:55:45 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2019-07-09 12:55:45 -0400
commit	2d41ef5432b76ae90dc0db93026f1d981f874ec4 (patch)
tree	dc97253d9328e8652614bfe8026748dd53c6561a
parent	ed63b9c873601ca113da5c7b1745e3946493e9f3 (diff)
parent	732146a3f1dc78ebb0d3c4b1f4dc6ea33cc2c58f (diff)