aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/s3c2410fb.c
diff options
context:
space:
mode:
authorArnaud Patard <arnaud.patard@rtp-net.org>2006-01-09 23:53:41 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:51 -0500
commit740f14ba5335d1e25b9f3e80643be801f653cd32 (patch)
treee75417acfc017ac1a0dc1e73b6209758bb98c2e3 /drivers/video/s3c2410fb.c
parent918799ab6f278805d4811770e9b18ae36408c17f (diff)
[PATCH] s3c2410fb: cleanup and fix
Here are some cleanups for the s3c2410fb drivers. It : * Removes a buggy call to s3c2410fb_init_registers. There was two calls to this function but the first was done without all initialisations done. No oops but it may confuse some LCDs. * Makes two functions static. Signed-Off-By: Arnaud Patard <arnaud.patard@rtp-net.org> Signed-Off-By: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/s3c2410fb.c')
-rw-r--r--drivers/video/s3c2410fb.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index fe99d17a21d7..d574dd3c9c8a 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -552,7 +552,7 @@ static inline void modify_gpio(void __iomem *reg,
552 * s3c2410fb_init_registers - Initialise all LCD-related registers 552 * s3c2410fb_init_registers - Initialise all LCD-related registers
553 */ 553 */
554 554
555int s3c2410fb_init_registers(struct s3c2410fb_info *fbi) 555static int s3c2410fb_init_registers(struct s3c2410fb_info *fbi)
556{ 556{
557 unsigned long flags; 557 unsigned long flags;
558 558
@@ -634,7 +634,7 @@ static irqreturn_t s3c2410fb_irq(int irq, void *dev_id, struct pt_regs *r)
634 634
635static char driver_name[]="s3c2410fb"; 635static char driver_name[]="s3c2410fb";
636 636
637int __init s3c2410fb_probe(struct platform_device *pdev) 637static int __init s3c2410fb_probe(struct platform_device *pdev)
638{ 638{
639 struct s3c2410fb_info *info; 639 struct s3c2410fb_info *info;
640 struct fb_info *fbinfo; 640 struct fb_info *fbinfo;
@@ -667,8 +667,6 @@ int __init s3c2410fb_probe(struct platform_device *pdev)
667 info->fb = fbinfo; 667 info->fb = fbinfo;
668 platform_set_drvdata(pdev, fbinfo); 668 platform_set_drvdata(pdev, fbinfo);
669 669
670 s3c2410fb_init_registers(info);
671
672 dprintk("devinit\n"); 670 dprintk("devinit\n");
673 671
674 strcpy(fbinfo->fix.id, driver_name); 672 strcpy(fbinfo->fix.id, driver_name);
@@ -701,8 +699,8 @@ int __init s3c2410fb_probe(struct platform_device *pdev)
701 fbinfo->var.yres_virtual = mach_info->yres.defval; 699 fbinfo->var.yres_virtual = mach_info->yres.defval;
702 fbinfo->var.bits_per_pixel = mach_info->bpp.defval; 700 fbinfo->var.bits_per_pixel = mach_info->bpp.defval;
703 701
704 fbinfo->var.upper_margin = S3C2410_LCDCON2_GET_VBPD(mregs->lcdcon2) +1; 702 fbinfo->var.upper_margin = S3C2410_LCDCON2_GET_VBPD(mregs->lcdcon2) + 1;
705 fbinfo->var.lower_margin = S3C2410_LCDCON2_GET_VFPD(mregs->lcdcon2) +1; 703 fbinfo->var.lower_margin = S3C2410_LCDCON2_GET_VFPD(mregs->lcdcon2) + 1;
706 fbinfo->var.vsync_len = S3C2410_LCDCON2_GET_VSPW(mregs->lcdcon2) + 1; 704 fbinfo->var.vsync_len = S3C2410_LCDCON2_GET_VSPW(mregs->lcdcon2) + 1;
707 705
708 fbinfo->var.left_margin = S3C2410_LCDCON3_GET_HFPD(mregs->lcdcon3) + 1; 706 fbinfo->var.left_margin = S3C2410_LCDCON3_GET_HFPD(mregs->lcdcon3) + 1;