[SCSI] Fix mistaken uses of ->done

All these drivers meant to call ->scsi_done() but got confused.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

4 files changed, 9 insertions, 9 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index f8e449a98d29..5b27966d37f0 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -2133,7 +2133,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                 sink = 1;
                                 do_abort(instance);
                                 cmd->result = DID_ERROR << 16;
-                                cmd->done(cmd);
+                                cmd->scsi_done(cmd);
                                 return;
 #endif
                                 /* 
@@ -2196,7 +2196,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) {
                                                 sink = 1;
                                                 do_abort(instance);
                                                 cmd->result = DID_ERROR << 16;
-                                                cmd->done(cmd);
+                                                cmd->scsi_done(cmd);
                                                 /* XXX - need to source or sink data here, as appropriate */
                                         } else
                                                 cmd->SCp.this_residual -= transfersize - len;
@@ -2740,7 +2740,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
                         tmp->host_scribble = NULL;
                         tmp->result = DID_ABORT << 16;
                         dprintk(NDEBUG_ABORT, ("scsi%d : abort removed command from issue queue.\n", instance->host_no));
-                        tmp->done(tmp);
+                        tmp->scsi_done(tmp);
                         return SUCCESS;
                 }
 #if (NDEBUG  & NDEBUG_ABORT)
@@ -2805,7 +2805,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) {
                                         *prev = (Scsi_Cmnd *) tmp->host_scribble;
                                         tmp->host_scribble = NULL;
                                         tmp->result = DID_ABORT << 16;
-                                        tmp->done(tmp);
+                                        tmp->scsi_done(tmp);
                                         return SUCCESS;
                                 }
                 }
diff --git a/drivers/scsi/NCR53C9x.c b/drivers/scsi/NCR53C9x.c
index 79b4df158140..96e8e29aa05d 100644
--- a/drivers/scsi/NCR53C9x.c
+++ b/drivers/scsi/NCR53C9x.c
@@ -1385,7 +1385,7 @@ int esp_abort(Scsi_Cmnd *SCptr)
                                 this->host_scribble = NULL;
                                 esp_release_dmabufs(esp, this);
                                 this->result = DID_ABORT << 16;
-                                this->done(this);
+                                this->scsi_done(this);
                                 if(don)
                                         esp->dma_ints_on(esp);
                                 return SUCCESS;
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index 03dbe60c264a..743df4c20cf4 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -2041,7 +2041,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                 sink = 1;
                                 do_abort(instance);
                                 cmd->result = DID_ERROR << 16;
-                                cmd->done(cmd);
+                                cmd->scsi_done(cmd);
                                 return;
 #endif
                         case PHASE_DATAIN:
@@ -2100,7 +2100,7 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance)
                                                 sink = 1;
                                                 do_abort(instance);
                                                 cmd->result = DID_ERROR << 16;
-                                                cmd->done(cmd);
+                                                cmd->scsi_done(cmd);
                                                 /* XXX - need to source or sink data here, as appropriate */
                                         } else {
 #ifdef REAL_DMA
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index 98e3fe10c1dc..376953776ea3 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -2055,7 +2055,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
                 sink = 1;
                 do_abort(instance);
                 cmd->result = DID_ERROR  << 16;
-                cmd->done(cmd);
+                cmd->scsi_done(cmd);
                 return;
 #endif
             case PHASE_DATAIN:
@@ -2115,7 +2115,7 @@ static void NCR5380_information_transfer (struct Scsi_Host *instance)
                         sink = 1;
                         do_abort(instance);
                         cmd->result = DID_ERROR  << 16;
-                        cmd->done(cmd);
+                        cmd->scsi_done(cmd);
                         /* XXX - need to source or sink data here, as appropriate */
                     } else {
 #ifdef REAL_DMA