aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:50:58 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 17:50:58 -0700
commitdf4edad1787bbfa3c9c10824e4f11e9f4a7ec5c6 (patch)
treefbeffafc1b3161bba4767676a53a177fd4c5c33b
parent0481990b758628e12f4b0a9e15094e70cefc7cd1 (diff)
[SCSI] Revert "final klist fixes"
Revert commit 2b7d6a8cb9718fc1d9e826201b64909c44a915f4. The "fix" was known to not even compile. Duh. That's not a fix. That's just stupid. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/base/attribute_container.c24
1 files changed, 4 insertions, 20 deletions
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 373e7b728fa..6c0f49340eb 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -27,21 +27,6 @@ struct internal_container {
struct class_device classdev;
};
-static void internal_container_klist_get(struct klist_node *n)
-{
- struct internal_container *ic =
- container_of(n, struct internal_container, node);
- class_device_get(&ic->classdev);
-}
-
-static void internal_container_klist_put(struct klist_node *n)
-{
- struct internal_container *ic =
- container_of(n, struct internal_container, node);
- class_device_put(&ic->classdev);
-}
-
-
/**
* attribute_container_classdev_to_container - given a classdev, return the container
*
@@ -72,8 +57,7 @@ int
attribute_container_register(struct attribute_container *cont)
{
INIT_LIST_HEAD(&cont->node);
- klist_init(&cont->containers,internal_container_klist_get,
- internal_container_klist_put);
+ klist_init(&cont->containers);
down(&attribute_container_mutex);
list_add_tail(&cont->node, &attribute_container_list);
@@ -179,8 +163,8 @@ attribute_container_add_device(struct device *dev,
#define klist_for_each_entry(pos, head, member, iter) \
for (klist_iter_init(head, iter); (pos = ({ \
struct klist_node *n = klist_next(iter); \
- n ? container_of(n, typeof(*pos), member) : \
- ({ klist_iter_exit(iter) ; NULL; }); \
+ n ? ({ klist_iter_exit(iter) ; NULL; }) : \
+ container_of(n, typeof(*pos), member);\
}) ) != NULL; )
@@ -222,7 +206,7 @@ attribute_container_remove_device(struct device *dev,
klist_for_each_entry(ic, &cont->containers, node, &iter) {
if (dev != ic->classdev.dev)
continue;
- klist_del(&ic->node);
+ klist_remove(&ic->node);
if (fn)
fn(cont, dev, &ic->classdev);
else {