| Message ID | 1457799953-3267-1-git-send-email-shawn.lin@rock-chips.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Sonntag, 13. März 2016, 00:25:53 schrieb Shawn Lin: > 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> applied for v4.7 Thanks Heiko
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c index c12db69..7345be4 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -357,11 +357,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)
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> --- drivers/clk/rockchip/clk.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)