Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e67c8562 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert driver core: move platform_data into platform_device 



This reverts commit 006f4571:

	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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bee86321

drivers/base/platform.c

+0 −3
Original line number Diff line number Diff line
@@ -217,7 +217,6 @@ 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;

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

+2 −7
Original line number Diff line number Diff line
@@ -384,13 +384,8 @@ struct device { 
	struct device_driver *driver;	/* which driver has allocated this

					   device */

	void		*driver_data;	/* data private to the driver */



	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. */

	void		*platform_data;	/* Platform specific data, device

					   core doesn't touch it */

	struct dev_pm_info	power;



#ifdef CONFIG_NUMA

include/linux/platform_device.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ struct platform_device { 
	struct device	dev;

	u32		num_resources;

	struct resource	* resource;

	void		*platform_data;



	struct platform_device_id	*id_entry;

};