| Message ID | 20170106163101.32048-1-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Am Freitag, 6. Januar 2017, 08:31:01 CET schrieb Douglas Anderson: > When we used to defer setting the "grf" member to > rockchip_clk_get_grf() it was important to init the "grf" member to an > error value in rockchip_clk_init(). With recent changes, we now set > "grf" right in rockchip_clk_init() (two lines below the place where we > initted it). That makes the old init useless. Get rid of it. > > Fixes: 6f339dc2719e ("clk: rockchip: lookup General Register Files in > rockchip_clk_init") Signed-off-by: Douglas Anderson <dianders@chromium.org> thanks for the catch, applied for 4.11 Thanks Heiko
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c index 3abcbf441cc5..fe1d393cf678 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -344,7 +344,6 @@ struct rockchip_clk_provider * __init rockchip_clk_init(struct device_node *np, ctx->clk_data.clks = clk_table; ctx->clk_data.clk_num = nr_clks; ctx->cru_node = np; - ctx->grf = ERR_PTR(-EPROBE_DEFER); spin_lock_init(&ctx->lock); ctx->grf = syscon_regmap_lookup_by_phandle(ctx->cru_node,
When we used to defer setting the "grf" member to rockchip_clk_get_grf() it was important to init the "grf" member to an error value in rockchip_clk_init(). With recent changes, we now set "grf" right in rockchip_clk_init() (two lines below the place where we initted it). That makes the old init useless. Get rid of it. Fixes: 6f339dc2719e ("clk: rockchip: lookup General Register Files in rockchip_clk_init") Signed-off-by: Douglas Anderson <dianders@chromium.org> --- drivers/clk/rockchip/clk.c | 1 - 1 file changed, 1 deletion(-)