From: Jonghwan Choi <jhbird.choi@samsung.com>
Date: Fri, 21 Oct 2011 22:22:54 +0000 (+0200)
Subject: PM / Clocks: Remove redundant NULL checks before kfree()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0ab1e79b825a5cd8aeb3b34d89c9a89dea900056;p=mv-sheeva.git

PM / Clocks: Remove redundant NULL checks before kfree()

Since kfree() checks it its argument is not NULL, it is not necessary
to duplicate this check in __pm_clk_remove().

[rjw: Added the changelog.]

Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---

diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index b876e60a53e..5f0f85d5c57 100644
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
@@ -104,9 +104,7 @@ static void __pm_clk_remove(struct pm_clock_entry *ce)
 			clk_put(ce->clk);
 	}
 
-	if (ce->con_id)
-		kfree(ce->con_id);
-
+	kfree(ce->con_id);
 	kfree(ce);
 }