Commit 006f4571 authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman

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: default avatarMing Lei <tom.leiming@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e0edd3c6
...@@ -217,6 +217,7 @@ int platform_device_add_data(struct platform_device *pdev, const void *data, ...@@ -217,6 +217,7 @@ int platform_device_add_data(struct platform_device *pdev, const void *data,
if (d) { if (d) {
memcpy(d, data, size); memcpy(d, data, size);
pdev->dev.platform_data = d; pdev->dev.platform_data = d;
pdev->platform_data = d;
} }
return d ? 0 : -ENOMEM; return d ? 0 : -ENOMEM;
} }
...@@ -246,6 +247,8 @@ int platform_device_add(struct platform_device *pdev) ...@@ -246,6 +247,8 @@ int platform_device_add(struct platform_device *pdev)
else else
dev_set_name(&pdev->dev, pdev->name); dev_set_name(&pdev->dev, pdev->name);
pdev->platform_data = pdev->dev.platform_data;
for (i = 0; i < pdev->num_resources; i++) { for (i = 0; i < pdev->num_resources; i++) {
struct resource *p, *r = &pdev->resource[i]; struct resource *p, *r = &pdev->resource[i];
......
...@@ -385,8 +385,13 @@ struct device { ...@@ -385,8 +385,13 @@ struct device {
struct device_driver *driver; /* which driver has allocated this struct device_driver *driver; /* which driver has allocated this
device */ device */
void *driver_data; /* data private to the driver */ 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; struct dev_pm_info power;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
......
...@@ -20,6 +20,7 @@ struct platform_device { ...@@ -20,6 +20,7 @@ struct platform_device {
struct device dev; struct device dev;
u32 num_resources; u32 num_resources;
struct resource * resource; struct resource * resource;
void *platform_data;
struct platform_device_id *id_entry; struct platform_device_id *id_entry;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment