[PATCH] clk: constify parent name arrays in macros

[PATCH] clk: constify parent name arrays in macros

[Rajendra Nayak]

parent name array is now expected to be const char *, make
the relevent changes in the clk macros which define
default clock types.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
 include/linux/clk-private.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
index eeae7a3..6ebec83 100644
--- a/include/linux/clk-private.h
+++ b/include/linux/clk-private.h
@@ -70,7 +70,7 @@ struct clk {
 #define DEFINE_CLK_FIXED_RATE(_name, _flags, _rate,		\
 				_fixed_rate_flags)		\
 	static struct clk _name;				\
-	static char *_name##_parent_names[] = {};		\
+	static const char *_name##_parent_names[] = {};		\
 	static struct clk_fixed_rate _name##_hw = {		\
 		.hw = {						\
 			.clk = &_name,				\
@@ -85,7 +85,7 @@ struct clk {
 				_flags, _reg, _bit_idx,		\
 				_gate_flags, _lock)		\
 	static struct clk _name;				\
-	static char *_name##_parent_names[] = {			\
+	static const char *_name##_parent_names[] = {		\
 		_parent_name,					\
 	};							\
 	static struct clk *_name##_parents[] = {		\
@@ -107,7 +107,7 @@ struct clk {
 				_flags, _reg, _shift, _width,	\
 				_divider_flags, _lock)		\
 	static struct clk _name;				\
-	static char *_name##_parent_names[] = {			\
+	static const char *_name##_parent_names[] = {		\
 		_parent_name,					\
 	};							\
 	static struct clk *_name##_parents[] = {		\
-- 
1.7.1

Re: [PATCH] clk: constify parent name arrays in macros

[Turquette, Mike]

On Fri, Apr 27, 2012 at 5:28 AM, Rajendra Nayak <rnayak@ti.com> wrote:
> parent name array is now expected to be const char *, make
> the relevent changes in the clk macros which define
> default clock types.
>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>

Good catch Rajendra.  I'll pull it into clk-next.

Regards,
Mike

> ---
>  include/linux/clk-private.h |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
> index eeae7a3..6ebec83 100644
> --- a/include/linux/clk-private.h
> +++ b/include/linux/clk-private.h
> @@ -70,7 +70,7 @@ struct clk {
>  #define DEFINE_CLK_FIXED_RATE(_name, _flags, _rate,            \
>                                _fixed_rate_flags)              \
>        static struct clk _name;                                \
> -       static char *_name##_parent_names[] = {};               \
> +       static const char *_name##_parent_names[] = {};         \
>        static struct clk_fixed_rate _name##_hw = {             \
>                .hw = {                                         \
>                        .clk = &_name,                          \
> @@ -85,7 +85,7 @@ struct clk {
>                                _flags, _reg, _bit_idx,         \
>                                _gate_flags, _lock)             \
>        static struct clk _name;                                \
> -       static char *_name##_parent_names[] = {                 \
> +       static const char *_name##_parent_names[] = {           \
>                _parent_name,                                   \
>        };                                                      \
>        static struct clk *_name##_parents[] = {                \
> @@ -107,7 +107,7 @@ struct clk {
>                                _flags, _reg, _shift, _width,   \
>                                _divider_flags, _lock)          \
>        static struct clk _name;                                \
> -       static char *_name##_parent_names[] = {                 \
> +       static const char *_name##_parent_names[] = {           \
>                _parent_name,                                   \
>        };                                                      \
>        static struct clk *_name##_parents[] = {                \
> --
> 1.7.1
>
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: [PATCH] clk: constify parent name arrays in macros

[Felipe Balbi]

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

On Fri, Apr 27, 2012 at 10:55:50AM -0700, Turquette, Mike wrote:
> On Fri, Apr 27, 2012 at 5:28 AM, Rajendra Nayak <rnayak@ti.com> wrote:
> > parent name array is now expected to be const char *, make
> > the relevent changes in the clk macros which define
> > default clock types.
> >
> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> 
> Good catch Rajendra.  I'll pull it into clk-next.
> 
> Regards,
> Mike
> 
> > ---
> >  include/linux/clk-private.h |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
> > index eeae7a3..6ebec83 100644
> > --- a/include/linux/clk-private.h
> > +++ b/include/linux/clk-private.h
> > @@ -70,7 +70,7 @@ struct clk {
> >  #define DEFINE_CLK_FIXED_RATE(_name, _flags, _rate,            \
> >                                _fixed_rate_flags)              \
> >        static struct clk _name;                                \
> > -       static char *_name##_parent_names[] = {};               \
> > +       static const char *_name##_parent_names[] = {};         \

does it make sense to have this as:

static const char * const _name##_parent_names[] = { }; ??

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] clk: constify parent name arrays in macros

[Turquette, Mike]

On Fri, Apr 27, 2012 at 11:18 AM, Felipe Balbi <balbi@ti.com> wrote:
> On Fri, Apr 27, 2012 at 10:55:50AM -0700, Turquette, Mike wrote:
>> On Fri, Apr 27, 2012 at 5:28 AM, Rajendra Nayak <rnayak@ti.com> wrote:
>> > parent name array is now expected to be const char *, make
>> > the relevent changes in the clk macros which define
>> > default clock types.
>> >
>> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>>
>> Good catch Rajendra.  I'll pull it into clk-next.
>>
>> Regards,
>> Mike
>>
>> > ---
>> >  include/linux/clk-private.h |    6 +++---
>> >  1 files changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h
>> > index eeae7a3..6ebec83 100644
>> > --- a/include/linux/clk-private.h
>> > +++ b/include/linux/clk-private.h
>> > @@ -70,7 +70,7 @@ struct clk {
>> >  #define DEFINE_CLK_FIXED_RATE(_name, _flags, _rate,            \
>> >                                _fixed_rate_flags)              \
>> >        static struct clk _name;                                \
>> > -       static char *_name##_parent_names[] = {};               \
>> > +       static const char *_name##_parent_names[] = {};         \
>
> does it make sense to have this as:
>
> static const char * const _name##_parent_names[] = { }; ??

Hi Felipe,

I don't think so.  We're never going to reference the member of the
array anyways, so I think the current approach is fine for just
satisfying type qualifier-sameness.

Thanks,
Mike