diff mbox

clk: wm831x: fix checkpatch issue for static const char * array

Message ID 1341395680-14142-1-git-send-email-Barry.Song@csr.com
State New, archived
Headers show

Commit Message

Barry Song July 4, 2012, 9:54 a.m. UTC
From: Barry Song <Baohua.Song@csr.com>

static const char * array should probably be static const char * const

Signed-off-by: Barry Song <Baohua.Song@csr.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/clk/clk-wm831x.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

Mark Brown July 4, 2012, 10:19 a.m. UTC | #1
On Wed, Jul 04, 2012 at 05:54:40PM +0800, Barry Song wrote:
> From: Barry Song <Baohua.Song@csr.com>
> 
> static const char * array should probably be static const char * const

We need some additional clock API patches to get merged before this is
OK, last time I checked the API wasn't const correct enough for it.
Barry Song July 6, 2012, 2:37 a.m. UTC | #2
2012/7/4 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Wed, Jul 04, 2012 at 05:54:40PM +0800, Barry Song wrote:
>> From: Barry Song <Baohua.Song@csr.com>
>>
>> static const char * array should probably be static const char * const
>
> We need some additional clock API patches to get merged before this is
> OK, last time I checked the API wasn't const correct enough for it.
>
ok. also with this conflict: "warning: initialization discards
qualifiers from pointer target type"
Mark Brown July 6, 2012, 11:08 a.m. UTC | #3
On Fri, Jul 06, 2012 at 10:37:19AM +0800, Barry Song wrote:
> 2012/7/4 Mark Brown <broonie@opensource.wolfsonmicro.com>:

> > We need some additional clock API patches to get merged before this is
> > OK, last time I checked the API wasn't const correct enough for it.

> ok. also with this conflict: "warning: initialization discards
> qualifiers from pointer target type"

Yes, that's the issue I'm referring to - we need the clock API to mark
the inputs it takes as const before we can have the drivers declare
thinngs const.
diff mbox

Patch

diff --git a/drivers/clk/clk-wm831x.c b/drivers/clk/clk-wm831x.c
index e7b7765..f601e61 100644
--- a/drivers/clk/clk-wm831x.c
+++ b/drivers/clk/clk-wm831x.c
@@ -177,7 +177,7 @@  static int wm831x_fll_set_rate(struct clk_hw *hw, unsigned long rate,
 			       WM831X_FLL_AUTO_FREQ_MASK, i);
 }
 
-static const char *wm831x_fll_parents[] = {
+static const char * const wm831x_fll_parents[] = {
 	"xtal",
 	"clkin",
 };
@@ -298,7 +298,7 @@  static void wm831x_clkout_unprepare(struct clk_hw *hw)
 	wm831x_reg_lock(wm831x);
 }
 
-static const char *wm831x_clkout_parents[] = {
+static const char * const wm831x_clkout_parents[] = {
 	"xtal",
 	"fll",
 };