Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1203066

Re: [PATCH 02/26] clk: Replace __clk_get_num_parents with clk_hw_get_num_parents()

Show all headers | View raw

On 08/06, Sylwester Nawrocki wrote:
> On 31/07/15 19:03, Stephen Boyd wrote:
> > diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c
> > index 665cb6794639..8653e555c920 100644
> > --- a/drivers/clk/mmp/clk-mix.c
> > +++ b/drivers/clk/mmp/clk-mix.c
> > @@ -63,7 +63,7 @@ static unsigned int _get_div(struct mmp_clk_mix *mix, unsigned int val)
> >  
> >  static unsigned int _get_mux(struct mmp_clk_mix *mix, unsigned int val)
> >  {
> > -	int num_parents = __clk_get_num_parents(mix->hw.clk);
> > +	int num_parents = clk_hw_get_num_parents(hw);
> 
> Shouldn't this be:
> 	int num_parents = clk_hw_get_num_parents(&mix->hw);

Yes thanks! I really gotta fix that script....

Here's the interdiff for this file:


diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c
index 979e2cfc07c2..403a8b2839c4 100644
--- a/drivers/clk/mmp/clk-mix.c
+++ b/drivers/clk/mmp/clk-mix.c
@@ -63,7 +63,7 @@ static unsigned int _get_div(struct mmp_clk_mix *mix, unsigned int val)
 
 static unsigned int _get_mux(struct mmp_clk_mix *mix, unsigned int val)
 {
-	int num_parents = clk_hw_get_num_parents(hw);
+	int num_parents = clk_hw_get_num_parents(&mix->hw);
 	int i;
 
 	if (mix->mux_flags & CLK_MUX_INDEX_BIT)
@@ -116,7 +116,7 @@ static void _filter_clk_table(struct mmp_clk_mix *mix,
 	struct clk_hw *parent, *hw;
 	unsigned long parent_rate;
 
-	hw = &mix->hw
+	hw = &mix->hw;
 
 	for (i = 0; i < table_size; i++) {
 		item = &table[i];

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: [PATCH 02/26] clk: Replace __clk_get_num_parents with  clk_hw_get_num_parents() Sylwester Nawrocki <s.nawrocki@samsung.com> - 2015-08-06 10:20 +0200
  Re: [PATCH 02/26] clk: Replace __clk_get_num_parents with  clk_hw_get_num_parents() Stephen Boyd <sboyd@codeaurora.org> - 2015-08-08 00:50 +0200

csiph-web