1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c
index 030ba49f33ff..016c462bc771 100644
--- a/drivers/scsi/ncr53c8xx.c
+++ b/drivers/scsi/ncr53c8xx.c
@@ -8143,12 +8143,7 @@ static int ncr53c8xx_abort(struct scsi_cmnd *cmd)
         unsigned long flags;
         struct scsi_cmnd *done_list;
 
-#if defined SCSI_RESET_SYNCHRONOUS && defined SCSI_RESET_ASYNCHRONOUS
-        printk("ncr53c8xx_abort: pid=%lu serial_number=%ld\n",
-                cmd->pid, cmd->serial_number);
-#else
-        printk("ncr53c8xx_abort: command pid %lu\n", cmd->pid);
-#endif
+        printk("ncr53c8xx_abort: command pid %lu\n", cmd->serial_number);
 
         NCR_LOCK_NCB(np, flags);
 
@@ -8528,18 +8523,15 @@ struct Scsi_Host * __init ncr_attach(struct scsi_host_template *tpnt,
 }
 
 
-int ncr53c8xx_release(struct Scsi_Host *host)
+void ncr53c8xx_release(struct Scsi_Host *host)
 {
-        struct host_data *host_data;
+        struct host_data *host_data = shost_priv(host);
 #ifdef DEBUG_NCR53C8XX
         printk("ncr53c8xx: release\n");
 #endif
-        if (!host)
-                return 1;
-        host_data = (struct host_data *)host->hostdata;
-        if (host_data && host_data->ncb)
+        if (host_data->ncb)
                 ncr_detach(host_data->ncb);
-        return 1;
+        scsi_host_put(host);
 }
 
 static void ncr53c8xx_set_period(struct scsi_target *starget, int period)