aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/sh_mobile_lcdcfb.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2010-09-03 03:19:49 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-09-14 04:22:11 -0400
commit14177a5e56904a584f3777f36b50c8d7bfde5810 (patch)
tree7c004ed806e969affe698bc29f2de7fb7464915e /drivers/video/sh_mobile_lcdcfb.c
parent7923ac133b5dcdbb0cfff245d8045f1ff9694cba (diff)
fbdev: sh_mobile_lcdcfb: use fb_videomode_to_var() instead of open-coding
Use the standard fb_videomode_to_var() instead of filling fb_var_screeninfo fields manually in, also remove a redundant memset(0). Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.c')
-rw-r--r--drivers/video/sh_mobile_lcdcfb.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c
index d72075a9f01c..43132de38822 100644
--- a/drivers/video/sh_mobile_lcdcfb.c
+++ b/drivers/video/sh_mobile_lcdcfb.c
@@ -837,7 +837,6 @@ static int sh_mobile_ioctl(struct fb_info *info, unsigned int cmd,
837 return retval; 837 return retval;
838} 838}
839 839
840
841static struct fb_ops sh_mobile_lcdc_ops = { 840static struct fb_ops sh_mobile_lcdc_ops = {
842 .owner = THIS_MODULE, 841 .owner = THIS_MODULE,
843 .fb_setcolreg = sh_mobile_lcdc_setcolreg, 842 .fb_setcolreg = sh_mobile_lcdc_setcolreg,
@@ -1117,21 +1116,9 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
1117 var = &info->var; 1116 var = &info->var;
1118 lcd_cfg = &cfg->lcd_cfg; 1117 lcd_cfg = &cfg->lcd_cfg;
1119 info->fbops = &sh_mobile_lcdc_ops; 1118 info->fbops = &sh_mobile_lcdc_ops;
1120 var->xres = var->xres_virtual = lcd_cfg->xres; 1119 fb_videomode_to_var(var, lcd_cfg);
1121 var->yres = lcd_cfg->yres;
1122 /* Default Y virtual resolution is 2x panel size */ 1120 /* Default Y virtual resolution is 2x panel size */
1123 var->yres_virtual = var->yres * 2; 1121 var->yres_virtual = var->yres * 2;
1124 var->width = cfg->lcd_size_cfg.width;
1125 var->height = cfg->lcd_size_cfg.height;
1126 var->activate = FB_ACTIVATE_NOW;
1127 var->left_margin = lcd_cfg->left_margin;
1128 var->right_margin = lcd_cfg->right_margin;
1129 var->upper_margin = lcd_cfg->upper_margin;
1130 var->lower_margin = lcd_cfg->lower_margin;
1131 var->hsync_len = lcd_cfg->hsync_len;
1132 var->vsync_len = lcd_cfg->vsync_len;
1133 var->sync = lcd_cfg->sync;
1134 var->pixclock = lcd_cfg->pixclock;
1135 1122
1136 error = sh_mobile_lcdc_set_bpp(var, cfg->bpp); 1123 error = sh_mobile_lcdc_set_bpp(var, cfg->bpp);
1137 if (error) 1124 if (error)
@@ -1161,7 +1148,6 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev)
1161 break; 1148 break;
1162 } 1149 }
1163 1150
1164 memset(buf, 0, info->fix.smem_len);
1165 info->fix.smem_start = priv->ch[i].dma_handle; 1151 info->fix.smem_start = priv->ch[i].dma_handle;
1166 info->screen_base = buf; 1152 info->screen_base = buf;
1167 info->device = &pdev->dev; 1153 info->device = &pdev->dev;