diff mbox series

[-resend,v2] clk: pistachio: Fix initconst confusion

Message ID 20220920055838.22637-1-jslaby@suse.cz (mailing list archive)
State Accepted, archived
Headers show
Series [-resend,v2] clk: pistachio: Fix initconst confusion | expand

Commit Message

Jiri Slaby Sept. 20, 2022, 5:58 a.m. UTC 
From: Andi Kleen <ak@linux.intel.com>

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 <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: linux-clk@vger.kernel.org
Cc: Martin Liska <mliska@suse.cz>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---

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(-)

Comments

Stephen Boyd Sept. 29, 2022, 1:35 a.m. UTC | #1 
Quoting Jiri Slaby (2022-09-19 22:58:38)
> From: Andi Kleen <ak@linux.intel.com>
> 
> 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 <mturquette@baylibre.com>
> Cc: Stephen Boyd <sboyd@kernel.org>
> Cc: linux-clk@vger.kernel.org
> Cc: Martin Liska <mliska@suse.cz>
> Signed-off-by: Andi Kleen <ak@linux.intel.com>
> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
> ---

Applied to clk-next
diff mbox series

Patch

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)			\
 	{							\