lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] Use device_for_each_child() to unregister devices in scsi_remove_target().

Browse Source 
Signed-off-by: Patrick Mochel <mochel@digitalimplant.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Index: gregkh-2.6/drivers/scsi/scsi_sysfs.c
===================================================================
This commit is contained in:
mochel@digitalimplant.org
2005-03-24 19:03:59 -08:00
committed by Greg Kroah-Hartman
parent 0293a50940
commit 20b1e67423
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/scsi_sysfs.c
View File

@@ -669,6 +669,13 @@ void __scsi_remove_target(struct scsi_target *starget)
scsi_target_reap(starget); scsi_target_reap(starget);
} }
static int __remove_child (struct device * dev, void * data)
{
if (scsi_is_target_device(dev))
__scsi_remove_target(to_scsi_target(dev));
return 0;
}
/** /**
* scsi_remove_target - try to remove a target and all its devices * scsi_remove_target - try to remove a target and all its devices
* @dev: generic starget or parent of generic stargets to be removed * @dev: generic starget or parent of generic stargets to be removed
@@ -679,7 +686,7 @@ void __scsi_remove_target(struct scsi_target *starget)
*/ */
void scsi_remove_target(struct device *dev) void scsi_remove_target(struct device *dev)
{ {
struct device *rdev, *idev, *next; struct device *rdev;
if (scsi_is_target_device(dev)) { if (scsi_is_target_device(dev)) {
__scsi_remove_target(to_scsi_target(dev)); __scsi_remove_target(to_scsi_target(dev));
@@ -687,10 +694,7 @@ void scsi_remove_target(struct device *dev)
} }
rdev = get_device(dev); rdev = get_device(dev);
list_for_each_entry_safe(idev, next, &dev->children, node) { device_for_each_child(dev, NULL, __remove_child);
if (scsi_is_target_device(idev))
__scsi_remove_target(to_scsi_target(idev));
}
put_device(rdev); put_device(rdev);
} }
EXPORT_SYMBOL(scsi_remove_target); EXPORT_SYMBOL(scsi_remove_target);