Commit:     6eefd34fdcbd34e2cddb8b7da26d838367591954
Parent:     c63e07834bb12910bea41da15b8902150f5217c2
Author:     Scott Wood <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 4 14:57:19 2006 -0800
Committer:  Greg Kroah-Hartman <[EMAIL PROTECTED]>
CommitDate: Wed Dec 13 15:38:46 2006 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
 drivers/base/platform.c         |    2 +-
 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 0338289..f9c903b 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -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 
+int platform_device_add_data(struct platform_device *pdev, const void *data, 
size_t size)
        void *d;
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 20f47b8..8bbd459 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
 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);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to