driver core: move platform_data into platform_device

This patch moves platform_data from struct device into
struct platform_device, based on the two ideas:

1. Now all platform_driver is registered by platform_driver_register,
   which makes probe()/release()/... of platform_driver passed parameter
   of platform_device *, so platform driver can get platform_data from
   platform_device;

2. Other kind of devices do not need to use platform_data, we can
   decrease size of device if moving it to platform_device.

Taking into consideration of thousands of files to be fixed and they
can't be finished in one night(maybe it will take a long time), so we
keep platform_data in device to allow two kind of cases coexist until
all platform devices pass its platfrom data from
platform_device->platform_data.

All patches to do this kind of conversion are welcome.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index ec993aa6a2ca6bffe63f42378840abad53ae7f32..c5ac81d223039578631aaafaaa4062628e7c8472 100644 (file)
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -217,6 +217,7 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
        if (d) {
                memcpy(d, data, size);
                pdev->dev.platform_data = d;
+               pdev->platform_data = d;
        }
        return d ? 0 : -ENOMEM;
 }
@@ -246,6 +247,8 @@ int platform_device_add(struct platform_device *pdev)
        else
                dev_set_name(&pdev->dev, pdev->name);
 
+       pdev->platform_data = pdev->dev.platform_data;
+
        for (i = 0; i < pdev->num_resources; i++) {
                struct resource *p, *r = &pdev->resource[i];
 

diff --git a/include/linux/device.h b/include/linux/device.h
index 5a64775e68e4934d0346995821da9792701562eb..4bea53fe8f4c0602d2db4efd15f247c2a8b3af3c 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -385,8 +385,13 @@ struct device {
        struct device_driver *driver;   /* which driver has allocated this
                                           device */
        void            *driver_data;   /* data private to the driver */
-       void            *platform_data; /* Platform specific data, device
-                                          core doesn't touch it */
+
+       void            *platform_data; /* We will remove platform_data
+                                          field if all platform devices
+                                          pass its platform specific data
+                                          from platform_device->platform_data,
+                                          other kind of devices should not
+                                          use platform_data. */
        struct dev_pm_info      power;
 
 #ifdef CONFIG_NUMA

diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 76aef7be32ab1f12246489bbe17ff51a66f3db3a..76e470a299bfb9365078574e9ca3b1f438eae1d7 100644 (file)
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -20,6 +20,7 @@ struct platform_device {
        struct device   dev;
        u32             num_resources;
        struct resource * resource;
+       void            *platform_data;
 
        struct platform_device_id       *id_entry;
 };