diff options
author | Scott Wood <scottwood@freescale.com> | 2006-12-04 17:57:19 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-13 18:38:46 -0500 |
commit | 6eefd34fdcbd34e2cddb8b7da26d838367591954 (patch) | |
tree | 16b19067de4ad05a29bae7ee3303dda90c52b995 | |
parent | c63e07834bb12910bea41da15b8902150f5217c2 (diff) |
Driver core: Make platform_device_add_data accept a const pointer
platform_device_add_data() makes a copy of the data that is given to it,
and thus the parameter can be const. This removes a warning when data
from get_property() on powerpc is handed to platform_device_add_data(),
as get_property() returns a const pointer.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
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 0338289f9b5c..f9c903ba9fcd 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c | |||
@@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources); | |||
212 | * pointer. The memory associated with the platform data will be freed | 212 | * pointer. The memory associated with the platform data will be freed |
213 | * when the platform device is released. | 213 | * when the platform device is released. |
214 | */ | 214 | */ |
215 | int platform_device_add_data(struct platform_device *pdev, void *data, size_t size) | 215 | int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size) |
216 | { | 216 | { |
217 | void *d; | 217 | void *d; |
218 | 218 | ||
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h index 20f47b81d3fa..8bbd459eafdc 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h | |||
@@ -39,7 +39,7 @@ extern struct platform_device *platform_device_register_simple(char *, unsigned | |||
39 | 39 | ||
40 | extern struct platform_device *platform_device_alloc(const char *name, unsigned int id); | 40 | extern struct platform_device *platform_device_alloc(const char *name, unsigned int id); |
41 | extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num); | 41 | extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num); |
42 | extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size); | 42 | extern int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size); |
43 | extern int platform_device_add(struct platform_device *pdev); | 43 | extern int platform_device_add(struct platform_device *pdev); |
44 | extern void platform_device_del(struct platform_device *pdev); | 44 | extern void platform_device_del(struct platform_device *pdev); |
45 | extern void platform_device_put(struct platform_device *pdev); | 45 | extern void platform_device_put(struct platform_device *pdev); |