The patch titled
omapfb: fix coding style / remove dead line
has been added to the -mm tree. Its filename is
omapfb-fix-coding-style-remove-dead-line.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: omapfb: fix coding style / remove dead line
From: arun c <arunedarath@xxxxxxxxxxxxxxxxxxxx>
- use __iomem type attribute where appropriate
- expand (a ? : b) to (a ? a : b)
As suggested by Russel King <linux@xxxxxxxxxxxxxxxx>
- remove a dead line from omapfb_main.c
Signed-off-by: Arun C <arunedarath@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
Signed-off-by: Imre Deak <imre.deak@xxxxxxxxx>
Acked-by: Krzysztof Helt <krzysztof.h1@xxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/arm/plat-omap/include/mach/omapfb.h | 4 ++--
drivers/video/omap/omapfb_main.c | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff -puN arch/arm/plat-omap/include/mach/omapfb.h~omapfb-fix-coding-style-remove-dead-line arch/arm/plat-omap/include/mach/omapfb.h
--- a/arch/arm/plat-omap/include/mach/omapfb.h~omapfb-fix-coding-style-remove-dead-line
+++ a/arch/arm/plat-omap/include/mach/omapfb.h
@@ -276,8 +276,8 @@ typedef int (*omapfb_notifier_callback_t
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 -puN drivers/video/omap/omapfb_main.c~omapfb-fix-coding-style-remove-dead-line drivers/video/omap/omapfb_main.c
--- a/drivers/video/omap/omapfb_main.c~omapfb-fix-coding-style-remove-dead-line
+++ a/drivers/video/omap/omapfb_main.c
@@ -564,7 +564,6 @@ static int set_fb_var(struct fb_info *fb
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 platfo
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++;
_
Patches currently in -mm which might be from arunedarath@xxxxxxxxxxxxxxxxxxxx are
omapfb-add-support-for-the-omap2evm-lcd.patch
omapfb-add-support-for-the-omap3-evm-lcd.patch
omapfb-dispc-various-typo-fixes.patch
omapfb-fix-coding-style-remove-dead-line.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
