Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert driver core: move platform_data into platform_device

Browse source 
This reverts commit 006f4571a1:

	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.

As we don't really want to do it, it was a bad idea.

Cc: David Brownell <david-b@pacbell.net>
Cc: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-03-08 23:13:32 +08:00
parent bee86321b7
commit e67c85626c
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/base/platform.c
View file

@ -217,7 +217,6 @@ 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;
} }
@ -247,8 +246,6 @@ 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];

9
include/linux/device.h
View file

@ -384,13 +384,8 @@ 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
void *platform_data; /* We will remove platform_data core doesn't touch it */
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

1
include/linux/platform_device.h
View file

@ -20,7 +20,6 @@ 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;
}; };