From e92e739514baed2be83cfb269db003c73dd885c2 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Tue, 16 Oct 2007 01:29:01 -0700 Subject: s3c2410fb: remove lcdcon2 and lcdcon3 register fields This patch removes unused lcdcon2 and lcdcon3 register value from the s3c2410fb_display structure. Signed-off-by: Krzysztof Helt Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/video/s3c2410fb.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'drivers/video/s3c2410fb.c') diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index 43749bd1fd6..e850f11488e 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c @@ -341,8 +341,7 @@ static void s3c2410fb_calculate_stn_lcd_regs(const struct fb_info *info, S3C2410_LCDCON3_LINEBLANK(var->right_margin / 8) | S3C2410_LCDCON3_HOZVAL(hs - 1); - regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff); - regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(wlh); + regs->lcdcon4 = S3C2410_LCDCON4_WLH(wlh); } /* s3c2410fb_calculate_tft_lcd_regs @@ -399,8 +398,7 @@ static void s3c2410fb_calculate_tft_lcd_regs(const struct fb_info *info, S3C2410_LCDCON3_HFPD(var->left_margin - 1) | S3C2410_LCDCON3_HOZVAL(var->xres - 1); - regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff); - regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(var->hsync_len - 1); + regs->lcdcon4 = S3C2410_LCDCON4_HSPW(var->hsync_len - 1); } /* s3c2410fb_activate_var @@ -850,8 +848,6 @@ static int __init s3c2410fb_probe(struct platform_device *pdev) strcpy(fbinfo->fix.id, driver_name); info->regs.lcdcon1 = display->lcdcon1; - info->regs.lcdcon2 = display->lcdcon2; - info->regs.lcdcon4 = display->lcdcon4; info->regs.lcdcon5 = display->lcdcon5; /* Stop the video and unset ENVID if set */ -- cgit v1.2.3-70-g09d2