[PATCH] RFC: make struct platform_driver.id_table const

[PATCH] RFC: make struct platform_driver.id_table const

[Uwe Kleine-König]

This fixes a warning on several pxa based machines:

	arch/arm/mach-pxa/ssp.c:475: warning: initialization discards qualifiers from pointer target type

Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
Cc: Eric Miao <eric.miao@marvell.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/base/platform.c         |    2 +-
 include/linux/platform_device.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 58efaf2..962246c 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -578,7 +578,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
 }
 
 static const struct platform_device_id *platform_match_id(
-			struct platform_device_id *id,
+			const struct platform_device_id *id,
 			struct platform_device *pdev)
 {
 	while (id->name[0]) {
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 71ff887..3a6201e 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -21,7 +21,7 @@ struct platform_device {
 	u32		num_resources;
 	struct resource	* resource;
 
-	struct platform_device_id	*id_entry;
+	const struct platform_device_id	*id_entry;
 
 	/* arch specific additions */
 	struct pdev_archdata	archdata;
@@ -62,7 +62,7 @@ struct platform_driver {
 	int (*suspend)(struct platform_device *, pm_message_t state);
 	int (*resume)(struct platform_device *);
 	struct device_driver driver;
-	struct platform_device_id *id_table;
+	const struct platform_device_id *id_table;
 };
 
 extern int platform_driver_register(struct platform_driver *);
-- 
1.6.6

[PATCH] RFC: make struct platform_driver.id_table const

[Ben Dooks]

On Fri, Jan 22, 2010 at 06:03:57PM +0100, Uwe Kleine-K?nig wrote:
> This fixes a warning on several pxa based machines:
> 
> 	arch/arm/mach-pxa/ssp.c:475: warning: initialization discards qualifiers from pointer target type

this looks sane to me.
 
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> Cc: Eric Miao <eric.miao@marvell.com>
> Cc: Greg Kroah-Hartman <gregkh@suse.de>
> ---
>  drivers/base/platform.c         |    2 +-
>  include/linux/platform_device.h |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
> index 58efaf2..962246c 100644
> --- a/drivers/base/platform.c
> +++ b/drivers/base/platform.c
> @@ -578,7 +578,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
>  }
>  
>  static const struct platform_device_id *platform_match_id(
> -			struct platform_device_id *id,
> +			const struct platform_device_id *id,
>  			struct platform_device *pdev)
>  {
>  	while (id->name[0]) {
> diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
> index 71ff887..3a6201e 100644
> --- a/include/linux/platform_device.h
> +++ b/include/linux/platform_device.h
> @@ -21,7 +21,7 @@ struct platform_device {
>  	u32		num_resources;
>  	struct resource	* resource;
>  
> -	struct platform_device_id	*id_entry;
> +	const struct platform_device_id	*id_entry;
>  
>  	/* arch specific additions */
>  	struct pdev_archdata	archdata;
> @@ -62,7 +62,7 @@ struct platform_driver {
>  	int (*suspend)(struct platform_device *, pm_message_t state);
>  	int (*resume)(struct platform_device *);
>  	struct device_driver driver;
> -	struct platform_device_id *id_table;
> +	const struct platform_device_id *id_table;
>  };
>  
>  extern int platform_driver_register(struct platform_driver *);
> -- 
> 1.6.6
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

[PATCH] RFC: make struct platform_driver.id_table const

[Vikram Dhillon]

On 01/24/2010 08:34 PM, Ben Dooks wrote:
> On Fri, Jan 22, 2010 at 06:03:57PM +0100, Uwe Kleine-K?nig wrote:
>    
>> This fixes a warning on several pxa based machines:
>>
>> 	arch/arm/mach-pxa/ssp.c:475: warning: initialization discards qualifiers from pointer target type
>>      
> this looks sane to me.
>
>    
>> Signed-off-by: Uwe Kleine-K?nig<u.kleine-koenig@pengutronix.de>
>> Cc: Eric Miao<eric.miao@marvell.com>
>> Cc: Greg Kroah-Hartman<gregkh@suse.de>
>> ---
>>   drivers/base/platform.c         |    2 +-
>>   include/linux/platform_device.h |    4 ++--
>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/base/platform.c b/drivers/base/platform.c
>> index 58efaf2..962246c 100644
>> --- a/drivers/base/platform.c
>> +++ b/drivers/base/platform.c
>> @@ -578,7 +578,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
>>   }
>>
>>   static const struct platform_device_id *platform_match_id(
>> -			struct platform_device_id *id,
>> +			const struct platform_device_id *id,
>>   			struct platform_device *pdev)
>>   {
>>   	while (id->name[0]) {
>> diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
>> index 71ff887..3a6201e 100644
>> --- a/include/linux/platform_device.h
>> +++ b/include/linux/platform_device.h
>> @@ -21,7 +21,7 @@ struct platform_device {
>>   	u32		num_resources;
>>   	struct resource	* resource;
>>
>> -	struct platform_device_id	*id_entry;
>> +	const struct platform_device_id	*id_entry;
>>
>>   	/* arch specific additions */
>>   	struct pdev_archdata	archdata;
>> @@ -62,7 +62,7 @@ struct platform_driver {
>>   	int (*suspend)(struct platform_device *, pm_message_t state);
>>   	int (*resume)(struct platform_device *);
>>   	struct device_driver driver;
>> -	struct platform_device_id *id_table;
>> +	const struct platform_device_id *id_table;
>>   };
>>
>>   extern int platform_driver_register(struct platform_driver *);
>> -- 
>> 1.6.6
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel at lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>>      
>    
Look alright here too :) so:
Cc: Vikram Dhillon <dhillonv10@gmail.com>

--
Regards,
Vikram

[PATCH] RFC: make struct platform_driver.id_table const

[Uwe Kleine-König]

Hi,

> Look alright here too :) so:
> Cc: Vikram Dhillon <dhillonv10@gmail.com>
You mean Acked-by: Vikram Dhillon <dhillonv10@gmail.com> ?

Best regards
Uwe

-- 
Pengutronix e.K.                              | Uwe Kleine-K?nig            |
Industrial Linux Solutions                    | http://www.pengutronix.de/  |

[PATCH] RFC: make struct platform_driver.id_table const

[Vikram Dhillon]

On 01/25/2010 02:42 AM, Uwe Kleine-K?nig wrote:
> Hi,
>
>    
>> Look alright here too :) so:
>> Cc: Vikram Dhillon<dhillonv10@gmail.com>
>>      
> You mean Acked-by: Vikram Dhillon<dhillonv10@gmail.com>  ?
>
> Best regards
> Uwe
>
>    
Sorry about that stupid mistake, was a little sleepy when I typed this 
message before:

Acked-by: Vikram Dhillon <dhillonv10@gmail.com>

--
Regards,
Vikram Dhillon

[PATCH] RFC: make struct platform_driver.id_table const

[Eric Miao]

I seems to remember a similar patch sent to GregKH weeks ago and
should be sitting somewhere but this one looks to be more complete.

Uwe, maybe you can file an incremental patch, or GregKH may help
to drop mine and merge this instead, either way is OK to me.

- eric

[PATCH] RFC: make struct platform_driver.id_table const

[Uwe Kleine-König]

Greg,

On Tue, Jan 26, 2010 at 02:01:15PM +0800, Eric Miao wrote:
> I seems to remember a similar patch sent to GregKH weeks ago and
> should be sitting somewhere but this one looks to be more complete.
Yes, it's
	gregkh-2.6/gregkh-05-driver-core/driver-core-make-platform_device_id-table-const.patch

Below you can find the current state with all Acks it has got until now.
(Eric: I considered your mail as Ack, too.  OK?)
As I don't know how to change the log message with an incremental patch
you have to tell me if you prefer this way.

Best regards
Uwe

[PATCH] RFC: make struct platform_driver.id_table const

[Eric Miao]

2010/1/26 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:
> Greg,
>
> On Tue, Jan 26, 2010 at 02:01:15PM +0800, Eric Miao wrote:
>> I seems to remember a similar patch sent to GregKH weeks ago and
>> should be sitting somewhere but this one looks to be more complete.
> Yes, it's
> ? ? ? ?gregkh-2.6/gregkh-05-driver-core/driver-core-make-platform_device_id-table-const.patch
>
> Below you can find the current state with all Acks it has got until now.
> (Eric: I considered your mail as Ack, too. ?OK?)

OK.

> As I don't know how to change the log message with an incremental patch
> you have to tell me if you prefer this way.

Greg?

[PATCH] RFC: make struct platform_driver.id_table const

[Greg KH]

On Tue, Jan 26, 2010 at 04:54:13PM +0800, Eric Miao wrote:
> 2010/1/26 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:
> > Greg,
> >
> > On Tue, Jan 26, 2010 at 02:01:15PM +0800, Eric Miao wrote:
> >> I seems to remember a similar patch sent to GregKH weeks ago and
> >> should be sitting somewhere but this one looks to be more complete.
> > Yes, it's
> > ? ? ? ?gregkh-2.6/gregkh-05-driver-core/driver-core-make-platform_device_id-table-const.patch
> >
> > Below you can find the current state with all Acks it has got until now.
> > (Eric: I considered your mail as Ack, too. ?OK?)
> 
> OK.
> 
> > As I don't know how to change the log message with an incremental patch
> > you have to tell me if you prefer this way.
> 
> Greg?

I took out the chunk that came in the previous patch, and applied it.

thanks,

greg k-h