From: Nicolas Kaiser <nikai@nikai.net>
Date: Tue, 5 Oct 2010 18:31:54 +0000 (+0200)
Subject: arm/omap: simplify conditional
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e1a75a1aa11a4f48668ef295368ae1b65bd960c7;p=deliverable%2Flinux.git

arm/omap: simplify conditional

Simplify conditional: (a || (!a && !b)) => (a || !b)

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
---

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;