2022-09-20 06:36:18

by Jiri Slaby

Subject: [PATCH -resend v2] clk: pistachio: Fix initconst confusion

From: Andi Kleen <[email protected]>

A variable pointing to const isn't const itself. It has to contain
"const" keyword after "*" too. So to keep it in __initconst (and not
mark properly as __initdata), add the "const" keyword exactly there.

Note we need to update struct pistachio_mux too. On the other hand, the
clk core already counts with "const char *const" already.

[js] more explanatory commit message.

Cc: Michael Turquette <[email protected]>
Cc: Stephen Boyd <[email protected]>
Cc: [email protected]
Cc: Martin Liska <[email protected]>
Signed-off-by: Andi Kleen <[email protected]>
Signed-off-by: Jiri Slaby <[email protected]>
---

Notes:
[v2] as suggested by Stephen, instead of switching to __initdata, make
it real const

drivers/clk/pistachio/clk.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/pistachio/clk.h b/drivers/clk/pistachio/clk.h
index f9c31e3a0e47..2f4ffbd98282 100644
--- a/drivers/clk/pistachio/clk.h
+++ b/drivers/clk/pistachio/clk.h
@@ -31,10 +31,10 @@ struct pistachio_mux {
unsigned int shift;
unsigned int num_parents;
const char *name;
- const char **parents;
+ const char *const *parents;
};

-#define PNAME(x) static const char *x[] __initconst
+#define PNAME(x) static const char *const x[] __initconst

#define MUX(_id, _name, _pnames, _reg, _shift) \
{ \
--
2.37.3

2022-09-29 01:39:03

by Stephen Boyd

Subject: Re: [PATCH -resend v2] clk: pistachio: Fix initconst confusion

Quoting Jiri Slaby (2022-09-19 22:58:38)
> From: Andi Kleen <[email protected]>
>
> A variable pointing to const isn't const itself. It has to contain
> "const" keyword after "*" too. So to keep it in __initconst (and not
> mark properly as __initdata), add the "const" keyword exactly there.
>
> Note we need to update struct pistachio_mux too. On the other hand, the
> clk core already counts with "const char *const" already.
>
> [js] more explanatory commit message.
>
> Cc: Michael Turquette <[email protected]>
> Cc: Stephen Boyd <[email protected]>
> Cc: [email protected]
> Cc: Martin Liska <[email protected]>
> Signed-off-by: Andi Kleen <[email protected]>
> Signed-off-by: Jiri Slaby <[email protected]>
> ---

Applied to clk-next