From: Markus Elfring Date: Tue, 30 Jun 2015 12:00:16 +0000 (+0200) Subject: ARM: OMAP2: Delete an unnecessary check X-Git-Tag: android-x86-6.0-r1~821^2~2^2~3^2~1 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9a0cb98589037c0ccb6210f5fd827445b3710c5e;p=android-x86%2Fkernel.git ARM: OMAP2: Delete an unnecessary check 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 [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 Signed-off-by: Paul Walmsley --- diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index cac46d852da1..154482216624 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -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); } }