]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
arch/sh/mm: Move a dereference below a NULL test
authorJulia Lawall <julia@diku.dk>
Fri, 26 Dec 2008 07:27:24 +0000 (08:27 +0100)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 21 Jan 2009 08:41:14 +0000 (17:41 +0900)
If the NULL test is necessary, then the dereference should be moved below
the NULL test.

The semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/).

// <smpl>
@disable is_null@
identifier f;
expression E;
identifier fld;
statement S;
@@

+ if (E == NULL) S
  f(...,E->fld,...);
- if (E == NULL) S

@@
identifier f;
expression E;
identifier fld;
statement S;
@@

+ if (!E) S
  f(...,E->fld,...);
- if (!E) S
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/mm/ioremap_64.c

index 6e0be24d26e2c3cd9168ff3ac7203d4f0466b298..31e1bb5effbeb0af274a6d4b2f6f21c74ed005d8 100644 (file)
@@ -71,9 +71,9 @@ void *__ioremap(unsigned long phys_addr, unsigned long size,
         * Ok, go for it..
         */
        area = get_vm_area(size, VM_IOREMAP);
-       pr_debug("Get vm_area returns %p addr %p\n",area,area->addr);
        if (!area)
                return NULL;
+       pr_debug("Get vm_area returns %p addr %p\n", area, area->addr);
        area->phys_addr = phys_addr;
        addr = area->addr;
        if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,