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

[SCSI] scsi_debug: use list_for_each_entry_safe

Browse Source 
This replaces list_for_each_safe and list_entry with
list_for_each_entry_safe.

Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
FUJITA Tomonori
2008-03-20 11:09:18 +09:00
committed by James Bottomley
parent a75869d1ff
commit 8b40228f3f
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/scsi/scsi_debug.c
View File

@@ -2930,8 +2930,7 @@ static int sdebug_add_adapter(void)
int k, devs_per_host; int k, devs_per_host;
int error = 0; int error = 0;
struct sdebug_host_info *sdbg_host; struct sdebug_host_info *sdbg_host;
struct sdebug_dev_info *sdbg_devinfo; struct sdebug_dev_info *sdbg_devinfo, *tmp;
struct list_head *lh, *lh_sf;
sdbg_host = kzalloc(sizeof(*sdbg_host),GFP_KERNEL); sdbg_host = kzalloc(sizeof(*sdbg_host),GFP_KERNEL);
if (NULL == sdbg_host) { if (NULL == sdbg_host) {
@@ -2971,9 +2970,8 @@ static int sdebug_add_adapter(void)
return error; return error;
clean: clean:
list_for_each_safe(lh, lh_sf, &sdbg_host->dev_info_list) { list_for_each_entry_safe(sdbg_devinfo, tmp, &sdbg_host->dev_info_list,
sdbg_devinfo = list_entry(lh, struct sdebug_dev_info, dev_list) {
dev_list);
list_del(&sdbg_devinfo->dev_list); list_del(&sdbg_devinfo->dev_list);
kfree(sdbg_devinfo); kfree(sdbg_devinfo);
} }
@@ -3062,9 +3060,8 @@ static int sdebug_driver_probe(struct device * dev)
static int sdebug_driver_remove(struct device * dev) static int sdebug_driver_remove(struct device * dev)
{ {
struct list_head *lh, *lh_sf;
struct sdebug_host_info *sdbg_host; struct sdebug_host_info *sdbg_host;
struct sdebug_dev_info *sdbg_devinfo; struct sdebug_dev_info *sdbg_devinfo, *tmp;
sdbg_host = to_sdebug_host(dev); sdbg_host = to_sdebug_host(dev);
@@ -3076,9 +3073,8 @@ static int sdebug_driver_remove(struct device * dev)
scsi_remove_host(sdbg_host->shost); scsi_remove_host(sdbg_host->shost);
list_for_each_safe(lh, lh_sf, &sdbg_host->dev_info_list) { list_for_each_entry_safe(sdbg_devinfo, tmp, &sdbg_host->dev_info_list,
sdbg_devinfo = list_entry(lh, struct sdebug_dev_info, dev_list) {
dev_list);
list_del(&sdbg_devinfo->dev_list); list_del(&sdbg_devinfo->dev_list);
kfree(sdbg_devinfo); kfree(sdbg_devinfo);
} }