summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Lin <shawn.lin@rock-chips.com>2016-03-13 00:25:53 +0800
committerHeiko Stuebner <heiko@sntech.de>2016-03-27 13:03:35 +0200
commitff1ae209617cb31a5297bd103709d6b9e2db77d2 (patch)
treef78cc97b8db8159e4b09bb7e5fbc4171a6fcc721
parent2af2544d60f007277a98f66391a521ec377a6a67 (diff)
downloadlinux-stable-ff1ae209617cb31a5297bd103709d6b9e2db77d2.tar.gz
linux-stable-ff1ae209617cb31a5297bd103709d6b9e2db77d2.tar.bz2
linux-stable-ff1ae209617cb31a5297bd103709d6b9e2db77d2.zip
clk: rockchip: remove redundant checking of device_node
rockchip_clk_of_add_provider is used by sub-clk driver which already call of_iomap before calling it. If device_node does not exist, of_iomap returns NULL which will fail to init the sub-clk driver. So really it's redundant. Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-rw-r--r--drivers/clk/rockchip/clk.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index 5618a8761dee..277f9270bf72 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -359,11 +359,9 @@ err_free:
void __init rockchip_clk_of_add_provider(struct device_node *np,
struct rockchip_clk_provider *ctx)
{
- if (np) {
- if (of_clk_add_provider(np, of_clk_src_onecell_get,
- &ctx->clk_data))
- pr_err("%s: could not register clk provider\n", __func__);
- }
+ if (of_clk_add_provider(np, of_clk_src_onecell_get,
+ &ctx->clk_data))
+ pr_err("%s: could not register clk provider\n", __func__);
}
struct regmap *rockchip_clk_get_grf(struct rockchip_clk_provider *ctx)