Le 03/26/2013 09:05 PM, Mike Turquette a écrit : > Quoting Maxime Coquelin (2013-03-26 07:27:15) >> 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]> > Hi Maxime, > > This patch did not apply cleanly onto clk-next. Below is what I merged. > Please let me know if there are any issues. Hi Mike,
I just fetched your clk-next branch. It looks good to me. Thanks for the merge, Maxime > > Regards, > Mike > > > > From 5717b1a93c7d86cfea501a35bb8c83910c20159f Mon Sep 17 00:00:00 2001 > From: Maxime Coquelin <[email protected]> > Date: Tue, 26 Mar 2013 15:27:15 +0100 > Subject: [PATCH] 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: Maxime Coquelin <[email protected]> > Acked-by: Ulf Hansson <[email protected]> > Signed-off-by: Mike Turquette <[email protected]> > [[email protected]: resolved trivial merge issues] > --- > drivers/clk/ux500/clk-prcmu.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/clk/ux500/clk-prcmu.c b/drivers/clk/ux500/clk-prcmu.c > index 9d83256..293a288 100644 > --- a/drivers/clk/ux500/clk-prcmu.c > +++ b/drivers/clk/ux500/clk-prcmu.c > @@ -44,7 +44,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)); > else > clk->is_prepared = 0; > } > @@ -106,7 +106,7 @@ static int clk_prcmu_opp_prepare(struct clk_hw *hw) > 100); > if (err) { > pr_err("clk_prcmu: %s fail req APE OPP for %s.\n", > - __func__, hw->init->name); > + __func__, __clk_get_name(hw->clk)); > return err; > } > clk->opp_requested = 1; > @@ -130,7 +130,7 @@ static void clk_prcmu_opp_unprepare(struct clk_hw *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)); > return; > } > > @@ -152,7 +152,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 fail req APE OPP VOLT for %s.\n", > - __func__, hw->init->name); > + __func__, __clk_get_name(hw->clk)); > return err; > } > clk->opp_requested = 1; > @@ -175,7 +175,7 @@ static void clk_prcmu_opp_volt_unprepare(struct clk_hw > *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)); > return; > } >
