diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-26 03:35:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-07 20:04:49 -0500 |
commit | 831fad2f75f0d7bfc339de81173e7068a3c72276 (patch) | |
tree | bb566ec230d6bbc1c7ce942e8e1355c9876e24ea | |
parent | 52cf25d0ab7f78eeecc59ac652ed5090f69b619e (diff) |
Driver core: make struct platform_driver.id_table const
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>
Acked-by: Vikram Dhillon <dhillonv10@gmail.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/base/platform.c | 2 | ||||
-rw-r--r-- | include/linux/platform_device.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 937d58021d1b..575e08bc6630 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
@@ -636,7 +636,7 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
636 | } | 636 | } |
637 | 637 | ||
638 | static const struct platform_device_id *platform_match_id( | 638 | static const struct platform_device_id *platform_match_id( |
639 | struct platform_device_id *id, | 639 | const struct platform_device_id *id, |
640 | struct platform_device *pdev) | 640 | struct platform_device *pdev) |
641 | { | 641 | { |
642 | while (id->name[0]) { | 642 | while (id->name[0]) { |
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 2c2d035bfb92..212da17d06af 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
@@ -62,7 +62,7 @@ struct platform_driver { | |||
62 | int (*suspend)(struct platform_device *, pm_message_t state); | 62 | int (*suspend)(struct platform_device *, pm_message_t state); |
63 | int (*resume)(struct platform_device *); | 63 | int (*resume)(struct platform_device *); |
64 | struct device_driver driver; | 64 | struct device_driver driver; |
65 | struct platform_device_id *id_table; | 65 | const struct platform_device_id *id_table; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | extern int platform_driver_register(struct platform_driver *); | 68 | extern int platform_driver_register(struct platform_driver *); |