diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-16 15:25:49 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:44:32 -0500 |
commit | 93e746db183b3bdbbda67900f79b5835f9cb388f (patch) | |
tree | 658cb2c8cac313b7e2cc94f914dac52996432c93 | |
parent | 11c3b5c3e08f4d855cbef52883c266b9ab9df879 (diff) |
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: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/base/base.h | 4 | ||||
-rw-r--r-- | drivers/base/dd.c | 13 | ||||
-rw-r--r-- | drivers/base/driver.c | 13 | ||||
-rw-r--r-- | include/linux/device.h | 1 |
4 files changed, 22 insertions, 9 deletions
diff --git a/drivers/base/base.h b/drivers/base/base.h index f5cf31c664d7..8af0bb2c0aa8 100644 --- a/drivers/base/base.h +++ b/drivers/base/base.h | |||
@@ -68,6 +68,7 @@ struct class_private { | |||
68 | * | 68 | * |
69 | * @klist_children - klist containing all children of this device | 69 | * @klist_children - klist containing all children of this device |
70 | * @knode_parent - node in sibling list | 70 | * @knode_parent - node in sibling list |
71 | * @knode_driver - node in driver list | ||
71 | * @device - pointer back to the struct class that this structure is | 72 | * @device - pointer back to the struct class that this structure is |
72 | * associated with. | 73 | * associated with. |
73 | * | 74 | * |
@@ -76,10 +77,13 @@ struct class_private { | |||
76 | struct device_private { | 77 | struct device_private { |
77 | struct klist klist_children; | 78 | struct klist klist_children; |
78 | struct klist_node knode_parent; | 79 | struct klist_node knode_parent; |
80 | struct klist_node knode_driver; | ||
79 | struct device *device; | 81 | struct device *device; |
80 | }; | 82 | }; |
81 | #define to_device_private_parent(obj) \ | 83 | #define to_device_private_parent(obj) \ |
82 | container_of(obj, struct device_private, knode_parent) | 84 | container_of(obj, struct device_private, knode_parent) |
85 | #define to_device_private_driver(obj) \ | ||
86 | container_of(obj, struct device_private, knode_driver) | ||
83 | 87 | ||
84 | /* initialisation functions */ | 88 | /* initialisation functions */ |
85 | extern int devices_init(void); | 89 | extern int devices_init(void); |
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 17a8e45cf9c6..bb5f1eb83c03 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c | |||
@@ -28,7 +28,7 @@ | |||
28 | 28 | ||
29 | static void driver_bound(struct device *dev) | 29 | static void driver_bound(struct device *dev) |
30 | { | 30 | { |
31 | if (klist_node_attached(&dev->knode_driver)) { | 31 | if (klist_node_attached(&dev->p->knode_driver)) { |
32 | printk(KERN_WARNING "%s: device %s already bound\n", | 32 | printk(KERN_WARNING "%s: device %s already bound\n", |
33 | __func__, kobject_name(&dev->kobj)); | 33 | __func__, kobject_name(&dev->kobj)); |
34 | return; | 34 | return; |
@@ -41,7 +41,7 @@ static void driver_bound(struct device *dev) | |||
41 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, | 41 | blocking_notifier_call_chain(&dev->bus->p->bus_notifier, |
42 | BUS_NOTIFY_BOUND_DRIVER, dev); | 42 | BUS_NOTIFY_BOUND_DRIVER, dev); |
43 | 43 | ||
44 | klist_add_tail(&dev->knode_driver, &dev->driver->p->klist_devices); | 44 | klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices); |
45 | } | 45 | } |
46 | 46 | ||
47 | static int driver_sysfs_add(struct device *dev) | 47 | static int driver_sysfs_add(struct device *dev) |
@@ -311,7 +311,7 @@ static void __device_release_driver(struct device *dev) | |||
311 | drv->remove(dev); | 311 | drv->remove(dev); |
312 | devres_release_all(dev); | 312 | devres_release_all(dev); |
313 | dev->driver = NULL; | 313 | dev->driver = NULL; |
314 | klist_remove(&dev->knode_driver); | 314 | klist_remove(&dev->p->knode_driver); |
315 | } | 315 | } |
316 | } | 316 | } |
317 | 317 | ||
@@ -341,6 +341,7 @@ EXPORT_SYMBOL_GPL(device_release_driver); | |||
341 | */ | 341 | */ |
342 | void driver_detach(struct device_driver *drv) | 342 | void driver_detach(struct device_driver *drv) |
343 | { | 343 | { |
344 | struct device_private *dev_prv; | ||
344 | struct device *dev; | 345 | struct device *dev; |
345 | 346 | ||
346 | for (;;) { | 347 | for (;;) { |
@@ -349,8 +350,10 @@ void driver_detach(struct device_driver *drv) | |||
349 | spin_unlock(&drv->p->klist_devices.k_lock); | 350 | spin_unlock(&drv->p->klist_devices.k_lock); |
350 | break; | 351 | break; |
351 | } | 352 | } |
352 | dev = list_entry(drv->p->klist_devices.k_list.prev, | 353 | dev_prv = list_entry(drv->p->klist_devices.k_list.prev, |
353 | struct device, knode_driver.n_node); | 354 | struct device_private, |
355 | knode_driver.n_node); | ||
356 | dev = dev_prv->device; | ||
354 | get_device(dev); | 357 | get_device(dev); |
355 | spin_unlock(&drv->p->klist_devices.k_lock); | 358 | spin_unlock(&drv->p->klist_devices.k_lock); |
356 | 359 | ||
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 1e2bda780e48..b76cc69f1106 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c | |||
@@ -19,7 +19,14 @@ | |||
19 | static struct device *next_device(struct klist_iter *i) | 19 | static struct device *next_device(struct klist_iter *i) |
20 | { | 20 | { |
21 | struct klist_node *n = klist_next(i); | 21 | struct klist_node *n = klist_next(i); |
22 | return n ? container_of(n, struct device, knode_driver) : NULL; | 22 | struct device *dev = NULL; |
23 | struct device_private *dev_prv; | ||
24 | |||
25 | if (n) { | ||
26 | dev_prv = to_device_private_driver(n); | ||
27 | dev = dev_prv->device; | ||
28 | } | ||
29 | return dev; | ||
23 | } | 30 | } |
24 | 31 | ||
25 | /** | 32 | /** |
@@ -42,7 +49,7 @@ int driver_for_each_device(struct device_driver *drv, struct device *start, | |||
42 | return -EINVAL; | 49 | return -EINVAL; |
43 | 50 | ||
44 | klist_iter_init_node(&drv->p->klist_devices, &i, | 51 | klist_iter_init_node(&drv->p->klist_devices, &i, |
45 | start ? &start->knode_driver : NULL); | 52 | start ? &start->p->knode_driver : NULL); |
46 | while ((dev = next_device(&i)) && !error) | 53 | while ((dev = next_device(&i)) && !error) |
47 | error = fn(dev, data); | 54 | error = fn(dev, data); |
48 | klist_iter_exit(&i); | 55 | klist_iter_exit(&i); |
@@ -76,7 +83,7 @@ struct device *driver_find_device(struct device_driver *drv, | |||
76 | return NULL; | 83 | return NULL; |
77 | 84 | ||
78 | klist_iter_init_node(&drv->p->klist_devices, &i, | 85 | klist_iter_init_node(&drv->p->klist_devices, &i, |
79 | (start ? &start->knode_driver : NULL)); | 86 | (start ? &start->p->knode_driver : NULL)); |
80 | while ((dev = next_device(&i))) | 87 | while ((dev = next_device(&i))) |
81 | if (match(dev, data) && get_device(dev)) | 88 | if (match(dev, data) && get_device(dev)) |
82 | break; | 89 | break; |
diff --git a/include/linux/device.h b/include/linux/device.h index 60423e687205..e3630222c3c1 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -366,7 +366,6 @@ struct device_dma_parameters { | |||
366 | }; | 366 | }; |
367 | 367 | ||
368 | struct device { | 368 | struct device { |
369 | struct klist_node knode_driver; | ||
370 | struct klist_node knode_bus; | 369 | struct klist_node knode_bus; |
371 | struct device *parent; | 370 | struct device *parent; |
372 | 371 | ||