From akpm@osdl.org Mon Dec 4 14:58:40 2006 Message-Id: <200612042258.kB4MwSJU007617@shell0.pdx.osdl.net> From: Scott Wood Subject: Driver core: Make platform_device_add_data accept a const pointer To: greg@kroah.com Cc: akpm@osdl.org, scottwood@freescale.com Date: Mon, 04 Dec 2006 14:57:19 -0800 From: Scott Wood 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 Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- drivers/base/platform.c | 2 +- include/linux/platform_device.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/base/platform.c +++ gregkh-2.6/drivers/base/platform.c @@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(platform_device_add_re * pointer. The memory associated with the platform data will be freed * when the platform device is released. */ -int platform_device_add_data(struct platform_device *pdev, void *data, size_t size) +int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size) { void *d; --- gregkh-2.6.orig/include/linux/platform_device.h +++ gregkh-2.6/include/linux/platform_device.h @@ -39,7 +39,7 @@ extern struct platform_device *platform_ extern struct platform_device *platform_device_alloc(const char *name, unsigned int id); extern int platform_device_add_resources(struct platform_device *pdev, struct resource *res, unsigned int num); -extern int platform_device_add_data(struct platform_device *pdev, void *data, size_t size); +extern int platform_device_add_data(struct platform_device *pdev, const void *data, size_t size); extern int platform_device_add(struct platform_device *pdev); extern void platform_device_del(struct platform_device *pdev); extern void platform_device_put(struct platform_device *pdev);