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

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

driver core: move knode_driver into private structure 



Nothing outside of the driver core should ever touch knode_driver, so
move it out of the public eye.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 11c3b5c3

drivers/base/base.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,7 @@ struct class_private { 
 *

 *

 * @klist_children - klist containing all children of this device

 * @klist_children - klist containing all children of this device

 * @knode_parent - node in sibling list

 * @knode_parent - node in sibling list

 * @knode_driver - node in driver list

 * @device - pointer back to the struct class that this structure is

 * @device - pointer back to the struct class that this structure is

 * associated with.

 * associated with.

 *

 *
@@ -76,10 +77,13 @@ struct class_private { 
struct device_private {

struct device_private {

	struct klist klist_children;

	struct klist klist_children;

	struct klist_node knode_parent;

	struct klist_node knode_parent;

	struct klist_node knode_driver;

	struct device *device;

	struct device *device;

};

};

#define to_device_private_parent(obj)	\

#define to_device_private_parent(obj)	\

	container_of(obj, struct device_private, knode_parent)

	container_of(obj, struct device_private, knode_parent)

#define to_device_private_driver(obj)	\

	container_of(obj, struct device_private, knode_driver)





/* initialisation functions */

/* initialisation functions */

extern int devices_init(void);

extern int devices_init(void);

drivers/base/dd.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 




static void driver_bound(struct device *dev)

static void driver_bound(struct device *dev)

{

{

	if (klist_node_attached(&dev->knode_driver)) {

	if (klist_node_attached(&dev->p->knode_driver)) {

		printk(KERN_WARNING "%s: device %s already bound\n",

		printk(KERN_WARNING "%s: device %s already bound\n",

			__func__, kobject_name(&dev->kobj));

			__func__, kobject_name(&dev->kobj));

		return;

		return;
@@ -41,7 +41,7 @@ static void driver_bound(struct device *dev) 
		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,

		blocking_notifier_call_chain(&dev->bus->p->bus_notifier,

					     BUS_NOTIFY_BOUND_DRIVER, dev);

					     BUS_NOTIFY_BOUND_DRIVER, dev);





	klist_add_tail(&dev->knode_driver, &dev->driver->p->klist_devices);

	klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices);

}

}





static int driver_sysfs_add(struct device *dev)

static int driver_sysfs_add(struct device *dev)
@@ -311,7 +311,7 @@ static void __device_release_driver(struct device *dev) 
			drv->remove(dev);

			drv->remove(dev);

		devres_release_all(dev);

		devres_release_all(dev);

		dev->driver = NULL;

		dev->driver = NULL;

		klist_remove(&dev->knode_driver);

		klist_remove(&dev->p->knode_driver);

	}

	}

}

}
@@ -341,6 +341,7 @@ EXPORT_SYMBOL_GPL(device_release_driver); 
 */

 */

void driver_detach(struct device_driver *drv)

void driver_detach(struct device_driver *drv)

{

{

	struct device_private *dev_prv;

	struct device *dev;

	struct device *dev;





	for (;;) {

	for (;;) {
@@ -349,8 +350,10 @@ void driver_detach(struct device_driver *drv) 
			spin_unlock(&drv->p->klist_devices.k_lock);

			spin_unlock(&drv->p->klist_devices.k_lock);

			break;

			break;

		}

		}

		dev = list_entry(drv->p->klist_devices.k_list.prev,

		dev_prv = list_entry(drv->p->klist_devices.k_list.prev,

				struct device, knode_driver.n_node);

				     struct device_private,

				     knode_driver.n_node);

		dev = dev_prv->device;

		get_device(dev);

		get_device(dev);

		spin_unlock(&drv->p->klist_devices.k_lock);

		spin_unlock(&drv->p->klist_devices.k_lock);

drivers/base/driver.c

+10 −3
Original line number Original line Diff line number Diff line
@@ -19,7 +19,14 @@ 
static struct device *next_device(struct klist_iter *i)

static struct device *next_device(struct klist_iter *i)

{

{

	struct klist_node *n = klist_next(i);

	struct klist_node *n = klist_next(i);

	return n ? container_of(n, struct device, knode_driver) : NULL;

	struct device *dev = NULL;

	struct device_private *dev_prv;



	if (n) {

		dev_prv = to_device_private_driver(n);

		dev = dev_prv->device;

	}

	return dev;

}

}





/**

/**
@@ -42,7 +49,7 @@ int driver_for_each_device(struct device_driver *drv, struct device *start, 
		return -EINVAL;

		return -EINVAL;





	klist_iter_init_node(&drv->p->klist_devices, &i,

	klist_iter_init_node(&drv->p->klist_devices, &i,

			     start ? &start->knode_driver : NULL);

			     start ? &start->p->knode_driver : NULL);

	while ((dev = next_device(&i)) && !error)

	while ((dev = next_device(&i)) && !error)

		error = fn(dev, data);

		error = fn(dev, data);

	klist_iter_exit(&i);

	klist_iter_exit(&i);
@@ -76,7 +83,7 @@ struct device *driver_find_device(struct device_driver *drv, 
		return NULL;

		return NULL;





	klist_iter_init_node(&drv->p->klist_devices, &i,

	klist_iter_init_node(&drv->p->klist_devices, &i,

			     (start ? &start->knode_driver : NULL));

			     (start ? &start->p->knode_driver : NULL));

	while ((dev = next_device(&i)))

	while ((dev = next_device(&i)))

		if (match(dev, data) && get_device(dev))

		if (match(dev, data) && get_device(dev))

			break;

			break;

include/linux/device.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -366,7 +366,6 @@ struct device_dma_parameters { 
};

};





struct device {

struct device {

	struct klist_node	knode_driver;

	struct klist_node	knode_bus;

	struct klist_node	knode_bus;

	struct device		*parent;

	struct device		*parent;