From e1a75a1aa11a4f48668ef295368ae1b65bd960c7 Mon Sep 17 00:00:00 2001 From: Nicolas Kaiser Date: Tue, 5 Oct 2010 20:31:54 +0200 Subject: arm/omap: simplify conditional Simplify conditional: (a || (!a && !b)) => (a || !b) Signed-off-by: Nicolas Kaiser Signed-off-by: Tomi Valkeinen --- arch/arm/plat-omap/fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index fffc1a0b78a7..f2a1483bdad9 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -126,7 +126,7 @@ static int set_fbmem_region_type(struct omapfb_mem_region *rg, int mem_type, * type = 0 && paddr = 0, a default don't care case maps to * the SDRAM type. */ - if (rg->type || (!rg->type && !rg->paddr)) + if (rg->type || !rg->paddr) return 0; if (ranges_overlap(rg->paddr, rg->size, mem_start, mem_size)) { rg->type = mem_type; -- cgit v1.2.2