From 9637db357e435ea877f5282019972fb6c0d246ae Mon Sep 17 00:00:00 2001 From: "gregkh@suse.de" Date: Fri, 25 Mar 2005 11:45:31 -0800 Subject: [PATCH] --- yaml --- r: 2366 b: refs/heads/master c: 64360322ab3330d4881166380ad43a1eec2f123d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/nodemgr.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 3ea5851445a6..20ef74656ffc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff710710eae73990dd484ea8e37dba636452502b +refs/heads/master: 64360322ab3330d4881166380ad43a1eec2f123d diff --git a/trunk/drivers/ieee1394/nodemgr.c b/trunk/drivers/ieee1394/nodemgr.c index 83e66ed97ab5..a155b39469a1 100644 --- a/trunk/drivers/ieee1394/nodemgr.c +++ b/trunk/drivers/ieee1394/nodemgr.c @@ -695,14 +695,15 @@ static void nodemgr_remove_ne(struct node_entry *ne) put_device(dev); } +static int __nodemgr_remove_host_dev(struct device *dev, void *data) +{ + nodemgr_remove_ne(container_of(dev, struct node_entry, device)); + return 0; +} static void nodemgr_remove_host_dev(struct device *dev) { - struct device *ne_dev, *next; - - list_for_each_entry_safe(ne_dev, next, &dev->children, node) - nodemgr_remove_ne(container_of(ne_dev, struct node_entry, device)); - + device_for_each_child(dev, NULL, __nodemgr_remove_host_dev); sysfs_remove_link(&dev->kobj, "irm_id"); sysfs_remove_link(&dev->kobj, "busmgr_id"); sysfs_remove_link(&dev->kobj, "host_id");