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

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

[PATCH] Use device_for_each_child() to unregister devices in nodemgr_remove_host_dev() 



Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

diff -Nru a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
parent ff710710

drivers/ieee1394/nodemgr.c

+6 −5
Original line number Diff line number Diff line
@@ -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");