]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: OMAP2: Delete an unnecessary check
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 30 Jun 2015 12:00:16 +0000 (14:00 +0200)
committerPaul Walmsley <paul@pwsan.com>
Thu, 16 Jul 2015 05:59:39 +0000 (23:59 -0600)
The of_node_put() function tests whether its argument is NULL and then
returns immediately if so.  Furthermore, the kerneldoc for
of_node_put() explicitly supports passing in a NULL pointer as its
argument.  Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[paul@pwsan.com: dropped the omap_device.c and omap_hwmod.c changes for
 now, edited the commit message accordingly and to note the documented
 "contract"]
Reviewed-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
arch/arm/mach-omap2/timer.c

index cac46d852da18003a21fa3d66278e11e6cf51afc..15448221662416f4e596ec34809fe1c1f1ddd252 100644 (file)
@@ -208,8 +208,7 @@ static void __init omap_dmtimer_init(void)
        /* If we are a secure device, remove any secure timer nodes */
        if ((omap_type() != OMAP2_DEVICE_TYPE_GP)) {
                np = omap_get_timer_dt(omap_timer_match, "ti,timer-secure");
-               if (np)
-                       of_node_put(np);
+               of_node_put(np);
        }
 }