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>
This commit is contained in:
parent
b6c2b66d35
commit
5910d35cd6
|
@ -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 */
|
||||
|
|
|
@ -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++;
|
||||
|
||||
|
|
Loading…
Reference in New Issue