3 files changed, 0 insertions, 12 deletions

diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index 1fbb219aa9ba..d9e11b536659 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -767,10 +767,8 @@ static void fcp_scsi_done (Scsi_Cmnd *SCpnt)
 {
         unsigned long flags;
 
-        spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
         if (FCP_CMND(SCpnt)->done)
                 FCP_CMND(SCpnt)->done(SCpnt);
-        spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
 }
 
 static int fcp_scsi_queue_it(fc_channel *fc, Scsi_Cmnd *SCpnt, fcp_cmnd *fcmd, int prepare)
@@ -912,9 +910,7 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
                 unsigned long flags;
 
                 SCpnt->result = DID_ABORT;
-                spin_lock_irqsave(SCpnt->device->host->host_lock, flags);
                 fcmd->done(SCpnt);
-                spin_unlock_irqrestore(SCpnt->device->host->host_lock, flags);
                 printk("FC: soft abort\n");
                 return SUCCESS;
         } else {
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c
index aa941025072e..de552486b1c9 100644
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@@ -2453,8 +2453,6 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
                                       u32 scsi_status, struct scsi_cmnd *SCpnt,
                                       void (*done)(struct scsi_cmnd *))
 {
-        unsigned long flags;
-
         SBP2_DEBUG("sbp2scsi_complete_command");
 
         /*
@@ -2553,11 +2551,7 @@ static void sbp2scsi_complete_command(struct scsi_id_instance_data *scsi_id,
         /*
          * Tell scsi stack that we're done with this command
          */
-        spin_lock_irqsave(scsi_id->scsi_host->host_lock,flags);
         done (SCpnt);
-        spin_unlock_irqrestore(scsi_id->scsi_host->host_lock,flags);
-
-        return;
 }
 
 
diff --git a/drivers/scsi/ultrastor.c b/drivers/scsi/ultrastor.c
index 97f4d9112b48..2c17470a229d 100644
--- a/drivers/scsi/ultrastor.c
+++ b/drivers/scsi/ultrastor.c
@@ -954,9 +954,7 @@ static int ultrastor_abort(Scsi_Cmnd *SCpnt)
     SCpnt->result = DID_ABORT << 16;
     
     /* Take the host lock to guard against scsi layer re-entry */
-    spin_lock_irqsave(host->host_lock, flags);
     done(SCpnt);
-    spin_unlock_irqrestore(host->host_lock, flags);
 
     /* Need to set a timeout here in case command never completes.  */
     return SUCCESS;