summaryrefslogtreecommitdiffstats
path: root/src/drivers/block
diff options
context:
space:
mode:
authorMichael Brown2017-03-09 13:16:35 +0100
committerMichael Brown2017-03-09 13:16:35 +0100
commit7ff3fc7c72effe730cc8ee0a2964efbd7fc58d2a (patch)
tree2014dd666513129e13447813b7c396377dc9a31b /src/drivers/block
parent[iscsi] Use intfs_shutdown() when shutting down multiple interfaces (diff)
downloadipxe-7ff3fc7c72effe730cc8ee0a2964efbd7fc58d2a.tar.gz
ipxe-7ff3fc7c72effe730cc8ee0a2964efbd7fc58d2a.tar.xz
ipxe-7ff3fc7c72effe730cc8ee0a2964efbd7fc58d2a.zip
[scsi] Use intfs_shutdown() when shutting down multiple interfaces
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/block')
-rw-r--r--src/drivers/block/scsi.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/drivers/block/scsi.c b/src/drivers/block/scsi.c
index 847e0d46..51a1dc0c 100644
--- a/src/drivers/block/scsi.c
+++ b/src/drivers/block/scsi.c
@@ -394,8 +394,7 @@ static void scsicmd_close ( struct scsi_command *scsicmd, int rc ) {
}
/* Shut down interfaces */
- intf_shutdown ( &scsicmd->scsi, rc );
- intf_shutdown ( &scsicmd->block, rc );
+ intfs_shutdown ( rc, &scsicmd->scsi, &scsicmd->block, NULL );
}
/**
@@ -840,9 +839,8 @@ static void scsidev_close ( struct scsi_device *scsidev, int rc ) {
process_del ( &scsidev->process );
/* Shut down interfaces */
- intf_shutdown ( &scsidev->block, rc );
- intf_shutdown ( &scsidev->scsi, rc );
- intf_shutdown ( &scsidev->ready, rc );
+ intfs_shutdown ( rc, &scsidev->block, &scsidev->scsi, &scsidev->ready,
+ NULL );
/* Shut down any remaining commands */
list_for_each_entry_safe ( scsicmd, tmp, &scsidev->cmds, list ) {