[PATCH] clk: Pass correct arguments to __clk_hw_register_gate()

[PATCH] clk: Pass correct arguments to __clk_hw_register_gate()

[Stephen Boyd]

I copy/pasted these macros and forgot to update the argument
names and where they're passed to. Fix it so that these macros make
sense.

Reported-by: Maxime Ripard <maxime@cerno.tech>
Fixes: 194efb6e2667 ("clk: gate: Add support for specifying parents via DT/pointers")
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
---
 include/linux/clk-provider.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 952ac035bab9..95cc8a4f6e39 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -522,9 +522,9 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
  * @clk_gate_flags: gate-specific flags for this clock
  * @lock: shared register lock for this clock
  */
-#define clk_hw_register_gate_parent_hw(dev, name, parent_name, flags, reg,    \
+#define clk_hw_register_gate_parent_hw(dev, name, parent_hw, flags, reg,      \
 				       bit_idx, clk_gate_flags, lock)	      \
-	__clk_hw_register_gate((dev), NULL, (name), (parent_name), NULL,      \
+	__clk_hw_register_gate((dev), NULL, (name), NULL, (parent_hw),        \
 			       NULL, (flags), (reg), (bit_idx),		      \
 			       (clk_gate_flags), (lock))
 /**
@@ -539,10 +539,10 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
  * @clk_gate_flags: gate-specific flags for this clock
  * @lock: shared register lock for this clock
  */
-#define clk_hw_register_gate_parent_data(dev, name, parent_name, flags, reg,  \
+#define clk_hw_register_gate_parent_data(dev, name, parent_data, flags, reg,  \
 				       bit_idx, clk_gate_flags, lock)	      \
-	__clk_hw_register_gate((dev), NULL, (name), (parent_name), NULL,      \
-			       NULL, (flags), (reg), (bit_idx),		      \
+	__clk_hw_register_gate((dev), NULL, (name), NULL, NULL, (parent_data) \
+			       (flags), (reg), (bit_idx),		      \
 			       (clk_gate_flags), (lock))
 void clk_unregister_gate(struct clk *clk);
 void clk_hw_unregister_gate(struct clk_hw *hw);
-- 
Sent by a computer, using git, on the internet

Re: [PATCH] clk: Pass correct arguments to __clk_hw_register_gate()

[Stephen Boyd]

Quoting Stephen Boyd (2020-03-24 19:22:57)
> diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
> index 952ac035bab9..95cc8a4f6e39 100644
> --- a/include/linux/clk-provider.h
> +++ b/include/linux/clk-provider.h
> @@ -539,10 +539,10 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
>   * @clk_gate_flags: gate-specific flags for this clock
>   * @lock: shared register lock for this clock
>   */
> -#define clk_hw_register_gate_parent_data(dev, name, parent_name, flags, reg,  \
> +#define clk_hw_register_gate_parent_data(dev, name, parent_data, flags, reg,  \
>                                        bit_idx, clk_gate_flags, lock)         \
> -       __clk_hw_register_gate((dev), NULL, (name), (parent_name), NULL,      \
> -                              NULL, (flags), (reg), (bit_idx),               \
> +       __clk_hw_register_gate((dev), NULL, (name), NULL, NULL, (parent_data) \

And this needs a comma after it.

I'll apply this to clk-fixes and send to Linus in the next few days.

> +                              (flags), (reg), (bit_idx),                     \
>                                (clk_gate_flags), (lock))

Re: [PATCH] clk: Pass correct arguments to __clk_hw_register_gate()

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]

On Tue, Mar 24, 2020 at 07:28:12PM -0700, Stephen Boyd wrote:
> Quoting Stephen Boyd (2020-03-24 19:22:57)
> > diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
> > index 952ac035bab9..95cc8a4f6e39 100644
> > --- a/include/linux/clk-provider.h
> > +++ b/include/linux/clk-provider.h
> > @@ -539,10 +539,10 @@ struct clk *clk_register_gate(struct device *dev, const char *name,
> >   * @clk_gate_flags: gate-specific flags for this clock
> >   * @lock: shared register lock for this clock
> >   */
> > -#define clk_hw_register_gate_parent_data(dev, name, parent_name, flags, reg,  \
> > +#define clk_hw_register_gate_parent_data(dev, name, parent_data, flags, reg,  \
> >                                        bit_idx, clk_gate_flags, lock)         \
> > -       __clk_hw_register_gate((dev), NULL, (name), (parent_name), NULL,      \
> > -                              NULL, (flags), (reg), (bit_idx),               \
> > +       __clk_hw_register_gate((dev), NULL, (name), NULL, NULL, (parent_data) \
>
> And this needs a comma after it.
>
> I'll apply this to clk-fixes and send to Linus in the next few days.

With that fix,
Tested-by: Maxime Ripard <mripard@kernel.org>

Maxime

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]