driver core: Move driver_data back to struct device (1bb6c08a) · Commits · 戴 / test

drivers/base/base.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -63,8 +63,6 @@ struct driver_private {
		* binding of drivers which were unable to get all the resources needed by
		* the device; typically because it depends on another driver getting
		* probed first.
		* @driver_data - private pointer for driver specific info. Will turn into a
		* list soon.
		* @device - pointer back to the struct class that this structure is
		* associated with.
		*
		@@ -76,7 +74,6 @@ struct device_private {
		struct klist_node knode_driver;
		struct klist_node knode_bus;
		struct list_head deferred_probe;
		void *driver_data;
		struct device *device;
		};
		#define to_device_private_parent(obj) \

+3 −10

Original line number	Diff line number	Diff line
		@@ -594,22 +594,15 @@ void driver_detach(struct device_driver *drv)
		*/
		void dev_get_drvdata(const struct device dev)
		{
		if (dev && dev->p)
		return dev->p->driver_data;
		if (dev)
		return dev->driver_data;
		return NULL;
		}
		EXPORT_SYMBOL(dev_get_drvdata);

		int dev_set_drvdata(struct device dev, void data)
		{
		int error;

		if (!dev->p) {
		error = device_private_init(dev);
		if (error)
		return error;
		}
		dev->p->driver_data = data;
		dev->driver_data = data;
		return 0;
		}
		EXPORT_SYMBOL(dev_set_drvdata);

+3 −0

Original line number	Diff line number	Diff line
		@@ -673,6 +673,7 @@ struct acpi_dev_node {
		* variants, which GPIO pins act in what additional roles, and so
		* on. This shrinks the "Board Support Packages" (BSPs) and
		* minimizes board-specific #ifdefs in drivers.
		* @driver_data: Private pointer for driver specific info.
		* @power: For device power management.
		* See Documentation/power/devices.txt for details.
		* @pm_domain: Provide callbacks that are executed during system suspend,
		@@ -734,6 +735,8 @@ struct device {
		device */
		void platform_data; / Platform specific data, device
		core doesn't touch it */
		void driver_data; / Driver data, set and get with
		dev_set/get_drvdata */
		struct dev_pm_info power;
		struct dev_pm_domain *pm_domain;