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

Groups > linux.kernel > #1589543

[PATCH v3 3/6] clk: tegra: fix constness for periph clks

Show all headers | View raw

checkpatch now warns for const ** and expects const * const * to be used
instead. This means we have to update the prototypes and function
declarations to handle this change.

Signed-off-by: Peter De Schrijver <pdeschrijver@nvidia.com>
---
 drivers/clk/tegra/clk-periph.c | 4 ++--
 drivers/clk/tegra/clk.h        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c
index a17ca6d..a5a5809 100644
--- a/drivers/clk/tegra/clk-periph.c
+++ b/drivers/clk/tegra/clk-periph.c
@@ -138,7 +138,7 @@ static void clk_periph_disable(struct clk_hw *hw)
 };
 
 static struct clk *_tegra_clk_register_periph(const char *name,
-			const char **parent_names, int num_parents,
+			const char * const *parent_names, int num_parents,
 			struct tegra_clk_periph *periph,
 			void __iomem *clk_base, u32 offset,
 			unsigned long flags)
@@ -186,7 +186,7 @@ static struct clk *_tegra_clk_register_periph(const char *name,
 }
 
 struct clk *tegra_clk_register_periph(const char *name,
-		const char **parent_names, int num_parents,
+		const char * const *parent_names, int num_parents,
 		struct tegra_clk_periph *periph, void __iomem *clk_base,
 		u32 offset, unsigned long flags)
 {
diff --git a/drivers/clk/tegra/clk.h b/drivers/clk/tegra/clk.h
index a62ea73..8b09021e 100644
--- a/drivers/clk/tegra/clk.h
+++ b/drivers/clk/tegra/clk.h
@@ -586,7 +586,7 @@ struct tegra_clk_periph {
 
 extern const struct clk_ops tegra_clk_periph_ops;
 struct clk *tegra_clk_register_periph(const char *name,
-		const char **parent_names, int num_parents,
+		const char * const *parent_names, int num_parents,
 		struct tegra_clk_periph *periph, void __iomem *clk_base,
 		u32 offset, unsigned long flags);
 struct clk *tegra_clk_register_periph_nodiv(const char *name,
@@ -626,7 +626,7 @@ struct tegra_periph_init_data {
 	const char *name;
 	int clk_id;
 	union {
-		const char **parent_names;
+		const char *const *parent_names;
 		const char *parent_name;
 	} p;
 	int num_parents;
-- 
1.9.1

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

Thread

[PATCH v3 0/6] Add missing Tegra210 clocks Peter De Schrijver <pdeschrijver@nvidia.com> - 2017-02-28 16:10 +0100
  [PATCH v3 4/6] clk: tegra: define Tegra210 DMIC clocks Peter De Schrijver <pdeschrijver@nvidia.com> - 2017-02-28 16:10 +0100
  [PATCH v3 5/6] clk: tegra: add super clk mux/div Peter De Schrijver <pdeschrijver@nvidia.com> - 2017-02-28 16:10 +0100
  [PATCH v3 2/6] clk: tegra: define Tegra210 DMIC sync clocks Peter De Schrijver <pdeschrijver@nvidia.com> - 2017-02-28 16:10 +0100
  [PATCH v3 3/6] clk: tegra: fix constness for periph clks Peter De Schrijver <pdeschrijver@nvidia.com> - 2017-02-28 16:10 +0100

csiph-web