Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6eefd34f authored by Scott Wood's avatar Scott Wood Committed by Greg Kroah-Hartman
Browse files

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: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c63e0783

drivers/base/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ EXPORT_SYMBOL_GPL(platform_device_add_resources); 
 *	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;

include/linux/platform_device.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ extern struct platform_device *platform_device_register_simple(char *, unsigned 


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);