summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorJonghwan Choi <jhbird.choi@samsung.com>2011-10-22 00:22:54 +0200
committerRafael J. Wysocki <rjw@sisk.pl>2011-10-22 00:22:54 +0200
commit0ab1e79b825a5cd8aeb3b34d89c9a89dea900056 (patch)
treeb30ea644d376fa9e80d25933b2257d7adee1eeb2 /drivers/base
parentPM / Documentation: Update docs about suspend and CPU hotplug (diff)
downloadlinux-0ab1e79b825a5cd8aeb3b34d89c9a89dea900056.tar.xz
linux-0ab1e79b825a5cd8aeb3b34d89c9a89dea900056.zip
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>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/clock_ops.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c
index b876e60a53ef..5f0f85d5c576 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);
}