Skip to contentSkip to conversation

driver core: move platform_data into platform_device

PATCH New [email protected] 1 participant 1 message Mar 8, 2009 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 driver core: move platform_data into platform_device

From: Ming Lei <[email protected]>

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.

---
 drivers/base/platform.c         |    3 +++
 include/linux/device.h          |    9 +++++++--
 include/linux/platform_device.h |    1 +
 3 files changed, 11 insertions(+), 2 deletions(-)
drivers/base/platform.c +3 -0
index ec993aa..c5ac81d 100644
@@ -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];
 
include/linux/device.h +7 -2
index 663bb49..8647cde 100644
@@ -384,8 +384,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
include/linux/platform_device.h +1 -0
index 76aef7b..76e470a 100644
@@ -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;
 };
Signature · 1 line
1.6.0.GIT