[PATCH 03/24] wd33c93: use SCSI status

[Hannes Reinecke]

Use standard SCSI status and drop usage of the linux-specific ones.

Signed-off-by: Hannes Reinecke <h...@suse.de>
---
 drivers/scsi/wd33c93.c | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index f81046f0e68a..98e04a7b9d63 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -1176,10 +1176,8 @@ wd33c93_intr(struct Scsi_Host *instance)
                        if (cmd->SCp.Status == ILLEGAL_STATUS_BYTE)
                                cmd->SCp.Status = lun;
                        if (cmd->cmnd[0] == REQUEST_SENSE
-                           && cmd->SCp.Status != GOOD)
-                               cmd->result =
-                                   (cmd->
-                                    result & 0x00ffff) | (DID_ERROR << 16);
+                           && cmd->SCp.Status != SAM_STAT_GOOD)
+                               set_host_byte(cmd, DID_ERROR);
                        else
                                cmd->result =
                                    cmd->SCp.Status | (cmd->SCp.Message << 8);
@@ -1262,9 +1260,8 @@ wd33c93_intr(struct Scsi_Host *instance)
                    hostdata->connected = NULL;
                hostdata->busy[cmd->device->id] &= ~(1 << (cmd->device->lun & 
0xff));
                hostdata->state = S_UNCONNECTED;
-               if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != GOOD)
-                       cmd->result =
-                           (cmd->result & 0x00ffff) | (DID_ERROR << 16);
+               if (cmd->cmnd[0] == REQUEST_SENSE && cmd->SCp.Status != 
SAM_STAT_GOOD)
+                       set_host_byte(cmd, DID_ERROR);
                else
                        cmd->result = cmd->SCp.Status | (cmd->SCp.Message << 8);
                cmd->scsi_done(cmd);
@@ -1294,12 +1291,10 @@ wd33c93_intr(struct Scsi_Host *instance)
                        hostdata->connected = NULL;
                        hostdata->busy[cmd->device->id] &= ~(1 << 
(cmd->device->lun & 0xff));
                        hostdata->state = S_UNCONNECTED;
-                       DB(DB_INTR, printk(":%d", cmd->SCp.Status))
-                           if (cmd->cmnd[0] == REQUEST_SENSE
-                               && cmd->SCp.Status != GOOD)
-                               cmd->result =
-                                   (cmd->
-                                    result & 0x00ffff) | (DID_ERROR << 16);
+                       DB(DB_INTR, printk(":%d", cmd->SCp.Status));
+                       if (cmd->cmnd[0] == REQUEST_SENSE
+                           && cmd->SCp.Status != SAM_STAT_GOOD)
+                               set_host_byte(cmd->result, DID_ERROR);
                        else
                                cmd->result =
                                    cmd->SCp.Status | (cmd->SCp.Message << 8);
-- 
2.16.4