Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Revert driver core: move platform_data into platform_device

This reverts commit 006f4571a15fae3a0575f2a0f9e9b63b3d1012f8:

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>


+2 -11
-3
drivers/base/platform.c
··· 217 217 if (d) { 218 218 memcpy(d, data, size); 219 219 pdev->dev.platform_data = d; 220 - pdev->platform_data = d; 221 220 } 222 221 return d ? 0 : -ENOMEM; 223 222 } ··· 245 246 dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id); 246 247 else 247 248 dev_set_name(&pdev->dev, pdev->name); 248 - 249 - pdev->platform_data = pdev->dev.platform_data; 250 249 251 250 for (i = 0; i < pdev->num_resources; i++) { 252 251 struct resource *p, *r = &pdev->resource[i];
+2 -7
include/linux/device.h
··· 384 384 struct device_driver *driver; /* which driver has allocated this 385 385 device */ 386 386 void *driver_data; /* data private to the driver */ 387 - 388 - void *platform_data; /* We will remove platform_data 389 - field if all platform devices 390 - pass its platform specific data 391 - from platform_device->platform_data, 392 - other kind of devices should not 393 - use platform_data. */ 387 + void *platform_data; /* Platform specific data, device 388 + core doesn't touch it */ 394 389 struct dev_pm_info power; 395 390 396 391 #ifdef CONFIG_NUMA
-1
include/linux/platform_device.h
··· 20 20 struct device dev; 21 21 u32 num_resources; 22 22 struct resource * resource; 23 - void *platform_data; 24 23 25 24 struct platform_device_id *id_entry; 26 25 };