aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorarun c <arunedarath@mistralsolutions.com>2009-09-22 19:46:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-23 10:39:50 -0400
commit5910d35cd6c0122a490000a6de0774ac7ebcc2de (patch)
tree7c9a99ca946b94323fd864a79a48ff4d51d90ef6 /drivers
parentb6c2b66d353dba229ce167acef49639b9ddf90d9 (diff)
omapfb: fix coding style / remove dead line
- use __iomem type attribute where appropriate - expand (a ? : b) to (a ? a : b) As suggested by Russel King <linux@arm.linux.org.uk> - remove a dead line from omapfb_main.c Signed-off-by: Arun C <arunedarath@mistralsolutions.com> Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Imre Deak <imre.deak@nokia.com> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/omap/omapfb_main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c
index 7eab0f0b4ccf..125e605b8c68 100644
--- a/drivers/video/omap/omapfb_main.c
+++ b/drivers/video/omap/omapfb_main.c
@@ -564,7 +564,6 @@ static int set_fb_var(struct fb_info *fbi,
564 var->xoffset = var->xres_virtual - var->xres; 564 var->xoffset = var->xres_virtual - var->xres;
565 if (var->yres + var->yoffset > var->yres_virtual) 565 if (var->yres + var->yoffset > var->yres_virtual)
566 var->yoffset = var->yres_virtual - var->yres; 566 var->yoffset = var->yres_virtual - var->yres;
567 line_size = var->xres * bpp / 8;
568 567
569 if (plane->color_mode == OMAPFB_COLOR_RGB444) { 568 if (plane->color_mode == OMAPFB_COLOR_RGB444) {
570 var->red.offset = 8; var->red.length = 4; 569 var->red.offset = 8; var->red.length = 4;
@@ -1723,8 +1722,8 @@ static int omapfb_do_probe(struct platform_device *pdev,
1723 1722
1724 pr_info("omapfb: configured for panel %s\n", fbdev->panel->name); 1723 pr_info("omapfb: configured for panel %s\n", fbdev->panel->name);
1725 1724
1726 def_vxres = def_vxres ? : fbdev->panel->x_res; 1725 def_vxres = def_vxres ? def_vxres : fbdev->panel->x_res;
1727 def_vyres = def_vyres ? : fbdev->panel->y_res; 1726 def_vyres = def_vyres ? def_vyres : fbdev->panel->y_res;
1728 1727
1729 init_state++; 1728 init_state++;
1730 1729