Merge branch 'linus' into x86/xen

14 files changed, 108 insertions, 167 deletions

diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index e4bcf5376a99..bd4ac0bafecb 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3356,7 +3356,7 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev, struct fb_info *i
 
         info->fix.mmio_start = raddr;
         par->ati_regbase = ioremap(info->fix.mmio_start, 0x1000);
-        if (par->ati_regbase == 0)
+        if (par->ati_regbase == NULL)
                 return -ENOMEM;
 
         info->fix.mmio_start += par->aux_start ? 0x400 : 0xc00;
diff --git a/drivers/video/aty/radeon_base.c b/drivers/video/aty/radeon_base.c
index 72cd0d2f14ec..400e9264e456 100644
--- a/drivers/video/aty/radeon_base.c
+++ b/drivers/video/aty/radeon_base.c
@@ -2277,8 +2277,8 @@ static int __devinit radeonfb_pci_register (struct pci_dev *pdev,
         do {
                 rinfo->fb_base = ioremap (rinfo->fb_base_phys,
                                           rinfo->mapped_vram);
-        } while (   rinfo->fb_base == 0 &&
-                  ((rinfo->mapped_vram /=2) >= MIN_MAPPED_VRAM) );
+        } while (rinfo->fb_base == NULL &&
+                 ((rinfo->mapped_vram /= 2) >= MIN_MAPPED_VRAM));
 
         if (rinfo->fb_base == NULL) {
                 printk (KERN_ERR "radeonfb (%s): cannot map FB\n",
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 35ac9d956b3d..c14b2435d23e 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -2432,9 +2432,9 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
         info->screen_size = board_size;
         cinfo->unmap = cirrusfb_pci_unmap;
 
-        printk(KERN_INFO " RAM (%lu kB) at 0xx%lx, ",
-                info->screen_size >> 10, board_addr);
-        printk(KERN_INFO "Cirrus Logic chipset on PCI bus\n");
+        printk(KERN_INFO "RAM (%lu kB) at 0x%lx, Cirrus "
+                        "Logic chipset on PCI bus\n",
+                        info->screen_size >> 10, board_addr);
         pci_set_drvdata(pdev, info);
 
         ret = cirrusfb_register(info);
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 5fa8b76673cb..97aff8db10bf 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -2275,9 +2275,7 @@ static int fbcon_switch(struct vc_data *vc)
          * in fb_set_var()
          */
         info->var.activate = var.activate;
-        var.yoffset = info->var.yoffset;
-        var.xoffset = info->var.xoffset;
-        var.vmode = info->var.vmode;
+        var.vmode |= info->var.vmode & ~FB_VMODE_MASK;
         fb_set_var(info, &var);
         ops->var = info->var;
 
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index b50bb03cb5ab..0a2785361ca3 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1320,7 +1320,7 @@ static void free_irq_local(int irq)
  * Power management hooks. Note that we won't be called from IRQ context,
  * unlike the blank functions above, so we may sleep.
  */
-static int fsl_diu_suspend(struct of_device *dev, pm_message_t state)
+static int fsl_diu_suspend(struct of_device *ofdev, pm_message_t state)
 {
         struct fsl_diu_data *machine_data;
 
@@ -1330,7 +1330,7 @@ static int fsl_diu_suspend(struct of_device *dev, pm_message_t state)
         return 0;
 }
 
-static int fsl_diu_resume(struct of_device *dev)
+static int fsl_diu_resume(struct of_device *ofdev)
 {
         struct fsl_diu_data *machine_data;
 
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c
index fb9e67228543..c18880d9db1f 100644
--- a/drivers/video/hgafb.c
+++ b/drivers/video/hgafb.c
@@ -279,7 +279,7 @@ static void hga_blank(int blank_mode)
 
 static int __init hga_card_detect(void)
 {
-        int count=0;
+        int count = 0;
         void __iomem *p, *q;
         unsigned short p_save, q_save;
 
@@ -303,20 +303,18 @@ static int __init hga_card_detect(void)
         writew(0x55aa, p); if (readw(p) == 0x55aa) count++;
         writew(p_save, p);
 
-        if (count != 2) {
-                return 0;
-        }
+        if (count != 2)
+                goto error;
 
         /* Ok, there is definitely a card registering at the correct
          * memory location, so now we do an I/O port test.
          */
         
-        if (!test_hga_b(0x66, 0x0f)) {      /* cursor low register */
-                return 0;
-        }
-        if (!test_hga_b(0x99, 0x0f)) {     /* cursor low register */
-                return 0;
-        }
+        if (!test_hga_b(0x66, 0x0f))        /* cursor low register */
+                goto error;
+
+        if (!test_hga_b(0x99, 0x0f))     /* cursor low register */
+                goto error;
 
         /* See if the card is a Hercules, by checking whether the vsync
          * bit of the status register is changing.  This test lasts for
@@ -331,7 +329,7 @@ static int __init hga_card_detect(void)
         }
 
         if (p_save == q_save) 
-                return 0;
+                goto error;
 
         switch (inb_p(HGA_STATUS_PORT) & 0x70) {
                 case 0x10:
@@ -348,6 +346,12 @@ static int __init hga_card_detect(void)
                         break;
         }
         return 1;
+error:
+        if (release_io_ports)
+                release_region(0x3b0, 12);
+        if (release_io_port)
+                release_region(0x3bf, 1);
+        return 0;
 }
 
 /**
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 8bc46e930340..13fea61d6ae4 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -17,8 +17,8 @@
 #include <linux/fb.h>
 #include <linux/mm.h>
 #include <linux/of_device.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/fbio.h>
 
 #include "sbuslib.h"
@@ -33,7 +33,6 @@ static int leo_blank(int, struct fb_info *);
 
 static int leo_mmap(struct fb_info *, struct vm_area_struct *);
 static int leo_ioctl(struct fb_info *, unsigned int, unsigned long);
-static int leo_pan_display(struct fb_var_screeninfo *, struct fb_info *);
 
 /*
  *  Frame buffer operations
@@ -43,7 +42,6 @@ static struct fb_ops leo_ops = {
         .owner                  = THIS_MODULE,
         .fb_setcolreg           = leo_setcolreg,
         .fb_blank               = leo_blank,
-        .fb_pan_display         = leo_pan_display,
         .fb_fillrect            = cfb_fillrect,
         .fb_copyarea            = cfb_copyarea,
         .fb_imageblit           = cfb_imageblit,
@@ -78,7 +76,7 @@ static struct fb_ops leo_ops = {
 #define LEO_CUR_TYPE_CMAP       0x00000050
 
 struct leo_cursor {
-        u8              xxx0[16];
+        u8      xxx0[16];
         u32     cur_type;
         u32     cur_misc;
         u32     cur_cursxy;
@@ -105,7 +103,7 @@ struct leo_lx_krn {
 
 struct leo_lc_ss0_krn {
         u32     misc;
-        u8              xxx0[0x800-4];
+        u8      xxx0[0x800-4];
         u32     rev;
 };
 
@@ -116,7 +114,7 @@ struct leo_lc_ss0_usr {
         u32     fontt;
         u32     extent;
         u32     src;
-        u32             dst;
+        u32     dst;
         u32     copy;
         u32     fill;
 };
@@ -129,8 +127,8 @@ struct leo_lc_ss1_usr {
         u8      unknown;
 };
 
-struct leo_ld {
-        u8              xxx0[0xe00];
+struct leo_ld_ss0 {
+        u8      xxx0[0xe00];
         u32     csr;
         u32     wid;
         u32     wmask;
@@ -144,13 +142,13 @@ struct leo_ld {
         u32     src;            /* Copy/Scroll (SS0 only) */
         u32     dst;            /* Copy/Scroll/Fill (SS0 only) */
         u32     extent;         /* Copy/Scroll/Fill size (SS0 only) */
-        u32             xxx1[3];
+        u32     xxx1[3];
         u32     setsem;         /* SS1 only */
         u32     clrsem;         /* SS1 only */
         u32     clrpick;        /* SS1 only */
         u32     clrdat;         /* SS1 only */
         u32     alpha;          /* SS1 only */
-        u8              xxx2[0x2c];
+        u8      xxx2[0x2c];
         u32     winbg;
         u32     planemask;
         u32     rop;
@@ -199,11 +197,12 @@ struct leo_par {
 static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
 {
         int i;
-        
+
         for (i = 0;
-             (sbus_readl(&lx_krn->krn_csr) & LEO_KRN_CSR_PROGRESS) && i < 300000;
+             (sbus_readl(&lx_krn->krn_csr) & LEO_KRN_CSR_PROGRESS) &&
+             i < 300000;
              i++)
-                udelay (1); /* Busy wait at most 0.3 sec */
+                udelay(1); /* Busy wait at most 0.3 sec */
         return;
 }
 
@@ -221,7 +220,7 @@ static int leo_setcolreg(unsigned regno,
                          unsigned transp, struct fb_info *info)
 {
         struct leo_par *par = (struct leo_par *) info->par;
-        struct leo_lx_krn __iomem *lx_krn = par->lx_krn;
+        struct leo_lx_krn __iomem *lx_krn = par->lx_krn;
         unsigned long flags;
         u32 val;
         int i;
@@ -408,7 +407,7 @@ static void leo_wid_put(struct fb_info *info, struct fb_wid_list *wl)
         leo_wait(lx_krn);
 
         for (i = 0, wi = wl->wl_list; i < wl->wl_count; i++, wi++) {
-                switch(wi->wi_type) {
+                switch (wi->wi_type) {
                 case FB_WID_DBL_8:
                         j = (wi->wi_index & 0xf) + 0x40;
                         break;
@@ -453,13 +452,12 @@ static void leo_init_wids(struct fb_info *info)
         wi.wi_index = 1;
         wi.wi_values [0] = 0x30;
         leo_wid_put(info, &wl);
-
 }
 
 static void leo_switch_from_graph(struct fb_info *info)
 {
         struct leo_par *par = (struct leo_par *) info->par;
-        struct leo_ld __iomem *ss = (struct leo_ld __iomem *) par->ld_ss0;
+        struct leo_ld_ss0 __iomem *ss = par->ld_ss0;
         unsigned long flags;
         u32 val;
 
@@ -485,19 +483,13 @@ static void leo_switch_from_graph(struct fb_info *info)
                 val = sbus_readl(&par->lc_ss0_usr->csr);
         } while (val & 0x20000000);
 
-        spin_unlock_irqrestore(&par->lock, flags);
-}
-
-static int leo_pan_display(struct fb_var_screeninfo *var, struct fb_info *info)
-{
-        /* We just use this to catch switches out of
-         * graphics mode.
-         */
-        leo_switch_from_graph(info);
+        /* setup screen buffer for cfb_* functions */
+        sbus_writel(1, &ss->wid);
+        sbus_writel(0x00ffffff, &ss->planemask);
+        sbus_writel(0x310b90, &ss->rop);
+        sbus_writel(0, &par->lc_ss0_usr->addrspace);
 
-        if (var->xoffset || var->yoffset || var->vmode)
-                return -EINVAL;
-        return 0;
+        spin_unlock_irqrestore(&par->lock, flags);
 }
 
 static void leo_init_hw(struct fb_info *info)
@@ -542,7 +534,8 @@ static void leo_unmap_regs(struct of_device *op, struct fb_info *info,
                 of_iounmap(&op->resource[0], info->screen_base, 0x800000);
 }
 
-static int __devinit leo_probe(struct of_device *op, const struct of_device_id *match)
+static int __devinit leo_probe(struct of_device *op,
+                               const struct of_device_id *match)
 {
         struct device_node *dp = op->node;
         struct fb_info *info;
@@ -594,8 +587,9 @@ static int __devinit leo_probe(struct of_device *op, const struct of_device_id *
             !info->screen_base)
                 goto out_unmap_regs;
 
-        info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN;
+        info->flags = FBINFO_DEFAULT;
         info->fbops = &leo_ops;
+        info->pseudo_palette = par->clut_data;
 
         leo_init_wids(info);
         leo_init_hw(info);
@@ -649,7 +643,7 @@ static int __devexit leo_remove(struct of_device *op)
 
 static struct of_device_id leo_match[] = {
         {
-                .name = "leo",
+                .name = "SUNW,leo",
         },
         {},
 };
diff --git a/drivers/video/matrox/matroxfb_base.h b/drivers/video/matrox/matroxfb_base.h
index f3107ad7e545..95883236c0cd 100644
--- a/drivers/video/matrox/matroxfb_base.h
+++ b/drivers/video/matrox/matroxfb_base.h
@@ -200,7 +200,7 @@ static inline int mga_ioremap(unsigned long phys, unsigned long size, int flags,
                 virt->vaddr = ioremap_nocache(phys, size);
         else
                 virt->vaddr = ioremap(phys, size);
-        return (virt->vaddr == 0); /* 0, !0... 0, error_code in future */
+        return (virt->vaddr == NULL); /* 0, !0... 0, error_code in future */
 }
 
 static inline void mga_iounmap(vaddr_t va) {
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c
index 473562191586..d3c3af53a290 100644
--- a/drivers/video/modedb.c
+++ b/drivers/video/modedb.c
@@ -28,6 +28,7 @@
 #endif
 
 const char *fb_mode_option;
+EXPORT_SYMBOL_GPL(fb_mode_option);
 
     /*
      *  Standard video mode definitions (taken from XFree86)
@@ -590,6 +591,7 @@ done:
                     "", (margins) ? " with margins" : "", (interlace) ?
                     " interlaced" : "");
 
+            memset(&cvt_mode, 0, sizeof(cvt_mode));
             cvt_mode.xres = xres;
             cvt_mode.yres = yres;
             cvt_mode.refresh = (refresh) ? refresh : 60;
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c
index 3ee314beacc1..7dcda187d9ba 100644
--- a/drivers/video/pxafb.c
+++ b/drivers/video/pxafb.c
@@ -573,8 +573,8 @@ static int setup_frame_dma(struct pxafb_info *fbi, int dma, int pal,
                 dma_desc->fdadr = fbi->dma_buff_phys + dma_desc_off;
                 fbi->fdadr[dma] = fbi->dma_buff_phys + dma_desc_off;
         } else {
-                pal_desc = &fbi->dma_buff->pal_desc[dma];
-                pal_desc_off = offsetof(struct pxafb_dma_buff, dma_desc[pal]);
+                pal_desc = &fbi->dma_buff->pal_desc[pal];
+                pal_desc_off = offsetof(struct pxafb_dma_buff, pal_desc[pal]);
 
                 pal_desc->fsadr = fbi->dma_buff_phys + pal * PALETTE_SIZE;
                 pal_desc->fidr  = 0;
@@ -1276,6 +1276,8 @@ static int __init pxafb_map_video_memory(struct pxafb_info *fbi)
                 fbi->dma_buff_phys = fbi->map_dma;
                 fbi->palette_cpu = (u16 *) fbi->dma_buff->palette;
 
+                pr_debug("pxafb: palette_mem_size = 0x%08lx\n", fbi->palette_size*sizeof(u16));
+
 #ifdef CONFIG_FB_PXA_SMARTPANEL
                 fbi->smart_cmds = (uint16_t *) fbi->dma_buff->cmd_buff;
                 fbi->n_smart_cmds = 0;
@@ -1351,7 +1353,6 @@ static struct pxafb_info * __init pxafb_init_fbinfo(struct device *dev)
         struct pxafb_info *fbi;
         void *addr;
         struct pxafb_mach_info *inf = dev->platform_data;
-        struct pxafb_mode_info *mode = inf->modes;
 
         /* Alloc the pxafb_info and pseudo_palette in one step */
         fbi = kmalloc(sizeof(struct pxafb_info) + sizeof(u32) * 16, GFP_KERNEL);
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 13b38cbbe4cf..f0598961c6b0 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -1,75 +1,15 @@
-/*
- * linux/drivers/video/s3c2410fb.c
- *      Copyright (c) Arnaud Patard, Ben Dooks
+/* linux/drivers/video/s3c2410fb.c
+ *      Copyright (c) 2004,2005 Arnaud Patard
+ *      Copyright (c) 2004-2008 Ben Dooks
+ *
+ * S3C2410 LCD Framebuffer Driver
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file COPYING in the main directory of this archive for
  * more details.
  *
- *          S3C2410 LCD Controller Frame Buffer Driver
- *          based on skeletonfb.c, sa1100fb.c and others
- *
- * ChangeLog
- * 2005-04-07: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - u32 state -> pm_message_t state
- *      - S3C2410_{VA,SZ}_LCD -> S3C24XX
- *
- * 2005-03-15: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Removed the ioctl
- *      - use readl/writel instead of __raw_writel/__raw_readl
- *
- * 2004-12-04: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Added the possibility to set on or off the
- *      debugging messages
- *      - Replaced 0 and 1 by on or off when reading the
- *      /sys files
- *
- * 2005-03-23: Ben Dooks <ben-linux@fluff.org>
- *      - added non 16bpp modes
- *      - updated platform information for range of x/y/bpp
- *      - add code to ensure palette is written correctly
- *      - add pixel clock divisor control
- *
- * 2004-11-11: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Removed the use of currcon as it no more exists
- *      - Added LCD power sysfs interface
- *
- * 2004-11-03: Ben Dooks <ben-linux@fluff.org>
- *      - minor cleanups
- *      - add suspend/resume support
- *      - s3c2410fb_setcolreg() not valid in >8bpp modes
- *      - removed last CONFIG_FB_S3C2410_FIXED
- *      - ensure lcd controller stopped before cleanup
- *      - added sysfs interface for backlight power
- *      - added mask for gpio configuration
- *      - ensured IRQs disabled during GPIO configuration
- *      - disable TPAL before enabling video
- *
- * 2004-09-20: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Suppress command line options
- *
- * 2004-09-15: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - code cleanup
- *
- * 2004-09-07: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Renamed from h1940fb.c to s3c2410fb.c
- *      - Add support for different devices
- *      - Backlight support
- *
- * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
- *      - added clock (de-)allocation code
- *      - added fixem fbmem option
- *
- * 2004-07-27: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - code cleanup
- *      - added a forgotten return in h1940fb_init
- *
- * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at>
- *      - code cleanup and extended debugging
- *
- * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - First version
- */
+ * Driver based on skeletonfb.c, sa1100fb.c and others.
+*/
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -580,6 +520,27 @@ static int s3c2410fb_setcolreg(unsigned regno,
         return 0;
 }
 
+/* s3c2410fb_lcd_enable
+ *
+ * shutdown the lcd controller
+ */
+static void s3c2410fb_lcd_enable(struct s3c2410fb_info *fbi, int enable)
+{
+        unsigned long flags;
+
+        local_irq_save(flags);
+
+        if (enable)
+                fbi->regs.lcdcon1 |= S3C2410_LCDCON1_ENVID;
+        else
+                fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
+
+        writel(fbi->regs.lcdcon1, fbi->io + S3C2410_LCDCON1);
+
+        local_irq_restore(flags);
+}
+
+
 /*
  *      s3c2410fb_blank
  *      @blank_mode: the blank mode we want.
@@ -589,9 +550,6 @@ static int s3c2410fb_setcolreg(unsigned regno,
  *      blanking succeeded, != 0 if un-/blanking failed due to e.g. a
  *      video mode which doesn't support it. Implements VESA suspend
  *      and powerdown modes on hardware that supports disabling hsync/vsync:
- *      blank_mode == 2: suspend vsync
- *      blank_mode == 3: suspend hsync
- *      blank_mode == 4: powerdown
  *
  *      Returns negative errno on error, or zero on success.
  *
@@ -605,6 +563,12 @@ static int s3c2410fb_blank(int blank_mode, struct fb_info *info)
 
         tpal_reg += is_s3c2412(fbi) ? S3C2412_TPAL : S3C2410_TPAL;
 
+        if (blank_mode == FB_BLANK_POWERDOWN) {
+                s3c2410fb_lcd_enable(fbi, 0);
+        } else {
+                s3c2410fb_lcd_enable(fbi, 1);
+        }
+
         if (blank_mode == FB_BLANK_UNBLANK)
                 writel(0x0, tpal_reg);
         else {
@@ -948,7 +912,10 @@ static int __init s3c24xxfb_probe(struct platform_device *pdev,
         }
 
         /* create device files */
-        device_create_file(&pdev->dev, &dev_attr_debug);
+        ret = device_create_file(&pdev->dev, &dev_attr_debug);
+        if (ret) {
+                printk(KERN_ERR "failed to add debug attribute\n");
+        }
 
         printk(KERN_INFO "fb%d: %s frame buffer device\n",
                 fbinfo->node, fbinfo->fix.id);
@@ -983,21 +950,6 @@ static int __init s3c2412fb_probe(struct platform_device *pdev)
         return s3c24xxfb_probe(pdev, DRV_S3C2412);
 }
 
-/* s3c2410fb_stop_lcd
- *
- * shutdown the lcd controller
- */
-static void s3c2410fb_stop_lcd(struct s3c2410fb_info *fbi)
-{
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        fbi->regs.lcdcon1 &= ~S3C2410_LCDCON1_ENVID;
-        writel(fbi->regs.lcdcon1, fbi->io + S3C2410_LCDCON1);
-
-        local_irq_restore(flags);
-}
 
 /*
  *  Cleanup
@@ -1010,7 +962,7 @@ static int s3c2410fb_remove(struct platform_device *pdev)
 
         unregister_framebuffer(fbinfo);
 
-        s3c2410fb_stop_lcd(info);
+        s3c2410fb_lcd_enable(info, 0);
         msleep(1);
 
         s3c2410fb_unmap_video_memory(fbinfo);
@@ -1043,7 +995,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state)
         struct fb_info     *fbinfo = platform_get_drvdata(dev);
         struct s3c2410fb_info *info = fbinfo->par;
 
-        s3c2410fb_stop_lcd(info);
+        s3c2410fb_lcd_enable(info, 0);
 
         /* sleep before disabling the clock, we need to ensure
          * the LCD DMA engine is not going to get back on the bus
@@ -1118,3 +1070,5 @@ MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>, "
               "Ben Dooks <ben-linux@fluff.org>");
 MODULE_DESCRIPTION("Framebuffer driver for the s3c2410");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:s3c2410-lcd");
+MODULE_ALIAS("platform:s3c2412-lcd");
diff --git a/drivers/video/s3c2410fb.h b/drivers/video/s3c2410fb.h
index dbb73b95e2ef..9a6ba3e9d1b8 100644
--- a/drivers/video/s3c2410fb.h
+++ b/drivers/video/s3c2410fb.h
@@ -1,26 +1,14 @@
 /*
  * linux/drivers/video/s3c2410fb.h
- * Copyright (c) Arnaud Patard
+ *      Copyright (c) 2004 Arnaud Patard
+ *
+ *  S3C2410 LCD Framebuffer Driver
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file COPYING in the main directory of this archive for
  * more details.
  *
- *          S3C2410 LCD Controller Frame Buffer Driver
- *          based on skeletonfb.c, sa1100fb.h
- *
- * ChangeLog
- *
- * 2004-12-04: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Moved dprintk to s3c2410fb.c
- *
- * 2004-09-07: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - Renamed from h1940fb.h to s3c2410fb.h
- *      - Changed h1940 to s3c2410
- *
- * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org>
- *      - First version
- */
+*/
 
 #ifndef __S3C2410FB_H
 #define __S3C2410FB_H
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 73803624c131..b9343844cd1f 100644
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -5787,7 +5787,7 @@ sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         } else {
                 struct sis_video_info *countvideo = card_list;
                 ivideo->cardnumber = 1;
-                while((countvideo = countvideo->next) != 0)
+                while((countvideo = countvideo->next) != NULL)
                         ivideo->cardnumber++;
         }
 
diff --git a/drivers/video/sm501fb.c b/drivers/video/sm501fb.c
index 742b5c656d66..15d4a768b1f6 100644
--- a/drivers/video/sm501fb.c
+++ b/drivers/video/sm501fb.c
@@ -663,14 +663,14 @@ static void sm501fb_panel_power(struct sm501fb_info *fbi, int to)
                 sm501fb_sync_regs(fbi);
                 mdelay(10);
 
-                if (pd->flags & SM501FB_FLAG_PANEL_USE_VBIASEN) {
+                if (!(pd->flags & SM501FB_FLAG_PANEL_NO_VBIASEN)) {
                         control |= SM501_DC_PANEL_CONTROL_BIAS; /* VBIASEN */
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);
                         mdelay(10);
                 }
 
-                if (pd->flags & SM501FB_FLAG_PANEL_USE_FPEN) {
+                if (!(pd->flags & SM501FB_FLAG_PANEL_NO_FPEN)) {
                         control |= SM501_DC_PANEL_CONTROL_FPEN;
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);
@@ -678,14 +678,14 @@ static void sm501fb_panel_power(struct sm501fb_info *fbi, int to)
                 }
         } else if (!to && (control & SM501_DC_PANEL_CONTROL_VDD) != 0) {
                 /* disable panel power */
-                if (pd->flags & SM501FB_FLAG_PANEL_USE_FPEN) {
+                if (!(pd->flags & SM501FB_FLAG_PANEL_NO_FPEN)) {
                         control &= ~SM501_DC_PANEL_CONTROL_FPEN;
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);
                         mdelay(10);
                 }
 
-                if (pd->flags & SM501FB_FLAG_PANEL_USE_VBIASEN) {
+                if (!(pd->flags & SM501FB_FLAG_PANEL_NO_VBIASEN)) {
                         control &= ~SM501_DC_PANEL_CONTROL_BIAS;
                         writel(control, ctrl_reg);
                         sm501fb_sync_regs(fbi);