]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
omapfb: Remove casting and change coding style
authorarun c <arun.edarath@gmail.com>
Thu, 18 Sep 2008 12:49:31 +0000 (08:49 -0400)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Oct 2008 21:34:39 +0000 (14:34 -0700)
As sugested by RMK

Signed-off-by: Arun C <arunedarath@mistralsolutions.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/plat-omap/include/mach/omapfb.h
drivers/video/omap/omapfb_main.c

index a4a84f357f264ccf90ea93fe32826e6b3e5b1635..a3c44087c1d60a93c8bf171cee0928d8ded236a3 100644 (file)
@@ -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 */
index d176a2cf7aaf7c014b8597fb4593c7c014d6348d..3bb4247cc2e6441414aa53f73d5b29b290e3af5d 100644 (file)
@@ -402,7 +402,7 @@ static void set_fb_fix(struct fb_info *fbi)
        int bpp;
 
        rg = &plane->fbdev->mem_desc.region[plane->idx];
-       fbi->screen_base        = (char __iomem *)rg->vaddr;
+       fbi->screen_base        = rg->vaddr;
        fix->smem_start         = rg->paddr;
        fix->smem_len           = rg->size;
 
@@ -1718,8 +1718,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++;