Commit b5489168 authored by Maxime Coquelin's avatar Maxime Coquelin Committed by Mike Turquette

clk: ux500: Fix prcmu clocks registration

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: default avatarMaxime Coquelin <maxime.coquelin@st.com>
Acked-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: resolved trivial merge issues]
parent a35e89ad
...@@ -44,7 +44,7 @@ static void clk_prcmu_unprepare(struct clk_hw *hw) ...@@ -44,7 +44,7 @@ static void clk_prcmu_unprepare(struct clk_hw *hw)
struct clk_prcmu *clk = to_clk_prcmu(hw); struct clk_prcmu *clk = to_clk_prcmu(hw);
if (prcmu_request_clock(clk->cg_sel, false)) if (prcmu_request_clock(clk->cg_sel, false))
pr_err("clk_prcmu: %s failed to disable %s.\n", __func__, pr_err("clk_prcmu: %s failed to disable %s.\n", __func__,
hw->init->name); __clk_get_name(hw->clk));
else else
clk->is_prepared = 0; clk->is_prepared = 0;
} }
...@@ -106,7 +106,7 @@ static int clk_prcmu_opp_prepare(struct clk_hw *hw) ...@@ -106,7 +106,7 @@ static int clk_prcmu_opp_prepare(struct clk_hw *hw)
100); 100);
if (err) { if (err) {
pr_err("clk_prcmu: %s fail req APE OPP for %s.\n", pr_err("clk_prcmu: %s fail req APE OPP for %s.\n",
__func__, hw->init->name); __func__, __clk_get_name(hw->clk));
return err; return err;
} }
clk->opp_requested = 1; clk->opp_requested = 1;
...@@ -130,7 +130,7 @@ static void clk_prcmu_opp_unprepare(struct clk_hw *hw) ...@@ -130,7 +130,7 @@ static void clk_prcmu_opp_unprepare(struct clk_hw *hw)
if (prcmu_request_clock(clk->cg_sel, false)) { if (prcmu_request_clock(clk->cg_sel, false)) {
pr_err("clk_prcmu: %s failed to disable %s.\n", __func__, pr_err("clk_prcmu: %s failed to disable %s.\n", __func__,
hw->init->name); __clk_get_name(hw->clk));
return; return;
} }
...@@ -152,7 +152,7 @@ static int clk_prcmu_opp_volt_prepare(struct clk_hw *hw) ...@@ -152,7 +152,7 @@ static int clk_prcmu_opp_volt_prepare(struct clk_hw *hw)
err = prcmu_request_ape_opp_100_voltage(true); err = prcmu_request_ape_opp_100_voltage(true);
if (err) { if (err) {
pr_err("clk_prcmu: %s fail req APE OPP VOLT for %s.\n", pr_err("clk_prcmu: %s fail req APE OPP VOLT for %s.\n",
__func__, hw->init->name); __func__, __clk_get_name(hw->clk));
return err; return err;
} }
clk->opp_requested = 1; clk->opp_requested = 1;
...@@ -175,7 +175,7 @@ static void clk_prcmu_opp_volt_unprepare(struct clk_hw *hw) ...@@ -175,7 +175,7 @@ static void clk_prcmu_opp_volt_unprepare(struct clk_hw *hw)
if (prcmu_request_clock(clk->cg_sel, false)) { if (prcmu_request_clock(clk->cg_sel, false)) {
pr_err("clk_prcmu: %s failed to disable %s.\n", __func__, pr_err("clk_prcmu: %s failed to disable %s.\n", __func__,
hw->init->name); __clk_get_name(hw->clk));
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment