| Message ID | 63e0213f6444a9d3c99c659dbef14207e8756b37.1244131952.git.imre.deak@nokia.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | Tomi Valkeinen |
| Headers | show |
On Thu, 4 Jun 2009 20:52:43 +0300 Imre Deak <imre.deak@nokia.com> wrote: > From: arun c <arunedarath@mistralsolutions.com> > > - use __iomem type attribute where appropriate > - expand (a ? : b) to (a ? a : b) > As suggested by Russell 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> > CC: linux-arm-kernel@lists.arm.linux.org.uk > Signed-off-by: Imre Deak <imre.deak@nokia.com> > --- > arch/arm/plat-omap/include/mach/omapfb.h | 4 ++-- > drivers/video/omap/omapfb_main.c | 5 ++--- > 2 files changed, 4 insertions(+), 5 deletions(-) > Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> ---------------------------------------------------------------------- Kup wlasne mieszkanie za 33 tys. zl. Sprawdz >>> http://link.interia.pl/f21eb -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/plat-omap/include/mach/omapfb.h b/arch/arm/plat-omap/include/mach/omapfb.h index 7b74d12..b226bdf 100644 --- a/arch/arm/plat-omap/include/mach/omapfb.h +++ b/arch/arm/plat-omap/include/mach/omapfb.h @@ -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 */ diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 098177b..0df4523 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c @@ -562,7 +562,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; @@ -1719,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++;