From: Maxime Coquelin <[email protected]> In clk_reg_prcmu(), clk->hw.init field is assigned with a reference local to clk_reg_prcmu() function.
This patch replaces references to clk->hw.init with calls to __clk_get_name when called after clock registration. This patch applies on top of v3.9-rc4. Signed-off-by: Maxime Coquelin <[email protected]> Acked-by: Ulf Hansson <[email protected]> --- drivers/clk/ux500/clk-prcmu.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/clk/ux500/clk-prcmu.c b/drivers/clk/ux500/clk-prcmu.c index 74faa7e..63ba261 100644 --- a/drivers/clk/ux500/clk-prcmu.c +++ b/drivers/clk/ux500/clk-prcmu.c @@ -36,7 +36,7 @@ static void clk_prcmu_unprepare(struct clk_hw *hw) struct clk_prcmu *clk = to_clk_prcmu(hw); if (prcmu_request_clock(clk->cg_sel, false)) pr_err("clk_prcmu: %s failed to disable %s.\n", __func__, - hw->init->name); + __clk_get_name(hw->clk)); } static int clk_prcmu_enable(struct clk_hw *hw) @@ -107,7 +107,7 @@ static int clk_prcmu_opp_prepare(struct clk_hw *hw) err = request_ape_opp100(true); if (err) { pr_err("clk_prcmu: %s failed to request APE OPP100 for %s.\n", - __func__, hw->init->name); + __func__, __clk_get_name(hw->clk)); return err; } @@ -130,7 +130,7 @@ static void clk_prcmu_opp_unprepare(struct clk_hw *hw) out_error: pr_err("clk_prcmu: %s failed to disable %s.\n", __func__, - hw->init->name); + __clk_get_name(hw->clk)); } static int clk_prcmu_opp_volt_prepare(struct clk_hw *hw) @@ -141,7 +141,7 @@ static int clk_prcmu_opp_volt_prepare(struct clk_hw *hw) err = prcmu_request_ape_opp_100_voltage(true); if (err) { pr_err("clk_prcmu: %s failed to request APE OPP VOLT for %s.\n", - __func__, hw->init->name); + __func__, __clk_get_name(hw->clk)); return err; } @@ -164,7 +164,7 @@ static void clk_prcmu_opp_volt_unprepare(struct clk_hw *hw) out_error: pr_err("clk_prcmu: %s failed to disable %s.\n", __func__, - hw->init->name); + __clk_get_name(hw->clk)); } static struct clk_ops clk_prcmu_scalable_ops = { -- 1.7.8 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
