Commit 5910d35c authored by arun c's avatar arun c Committed by Linus Torvalds
Browse files

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: default avatarArun C <arunedarath@mistralsolutions.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarImre Deak <imre.deak@nokia.com>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b6c2b66d

arch/arm/plat-omap/include/mach/omapfb.h

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ typedef int (*omapfb_notifier_callback_t)(struct notifier_block *, 
					  void *fbi);



struct omapfb_mem_region {

	dma_addr_t	paddr;

	void		*vaddr;

	u32		paddr;

	void __iomem	*vaddr;

	unsigned long	size;

	u8		type;		/* OMAPFB_PLANE_MEM_* */

	unsigned	alloc:1;	/* allocated by the driver */

drivers/video/omap/omapfb_main.c

+2 −3
Original line number Diff line number Diff line
@@ -564,7 +564,6 @@ static int set_fb_var(struct fb_info *fbi, 
		var->xoffset = var->xres_virtual - var->xres;

	if (var->yres + var->yoffset > var->yres_virtual)

		var->yoffset = var->yres_virtual - var->yres;

	line_size = var->xres * bpp / 8;



	if (plane->color_mode == OMAPFB_COLOR_RGB444) {

		var->red.offset	  = 8; var->red.length	 = 4;
@@ -1723,8 +1722,8 @@ static int omapfb_do_probe(struct platform_device *pdev, 


	pr_info("omapfb: configured for panel %s\n", fbdev->panel->name);



	def_vxres = def_vxres ? : fbdev->panel->x_res;

	def_vyres = def_vyres ? : fbdev->panel->y_res;

	def_vxres = def_vxres ? def_vxres : fbdev->panel->x_res;

	def_vyres = def_vyres ? def_vyres : fbdev->panel->y_res;



	init_state++;

CRA Git | Maintained and supported by SUSTech CRA and CCSE