[SCSI] Remove SUGGEST flags

The SUGGEST_* flags in the SCSI command result have been out of fashion
for a while and we don't actually use them in the error handling.
Remove the remaining occurrences.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

9 files changed, 15 insertions, 36 deletions

diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index e6416f8541b0..babe1b8ba25e 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -2147,7 +2147,6 @@ static void zfcp_fsf_send_fcp_command_task_handler(struct zfcp_fsf_req *req)
 
         if (unlikely(req->status & ZFCP_STATUS_FSFREQ_ABORTED)) {
                 set_host_byte(scpnt, DID_SOFT_ERROR);
-                set_driver_byte(scpnt, SUGGEST_RETRY);
                 goto skip_fsfstatus;
         }
 
diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c
index 4003deefb7d8..e79e18101f87 100644
--- a/drivers/scsi/constants.c
+++ b/drivers/scsi/constants.c
@@ -1373,21 +1373,14 @@ static const char * const driverbyte_table[]={
 "DRIVER_INVALID", "DRIVER_TIMEOUT", "DRIVER_HARD", "DRIVER_SENSE"};
 #define NUM_DRIVERBYTE_STRS ARRAY_SIZE(driverbyte_table)
 
-static const char * const driversuggest_table[]={"SUGGEST_OK",
-"SUGGEST_RETRY", "SUGGEST_ABORT", "SUGGEST_REMAP", "SUGGEST_DIE",
-"SUGGEST_5", "SUGGEST_6", "SUGGEST_7", "SUGGEST_SENSE"};
-#define NUM_SUGGEST_STRS ARRAY_SIZE(driversuggest_table)
-
 void scsi_show_result(int result)
 {
         int hb = host_byte(result);
-        int db = (driver_byte(result) & DRIVER_MASK);
-        int su = ((driver_byte(result) & SUGGEST_MASK) >> 4);
+        int db = driver_byte(result);
 
-        printk("Result: hostbyte=%s driverbyte=%s,%s\n",
+        printk("Result: hostbyte=%s driverbyte=%s\n",
                (hb < NUM_HOSTBYTE_STRS ? hostbyte_table[hb]     : "invalid"),
-               (db < NUM_DRIVERBYTE_STRS ? driverbyte_table[db] : "invalid"),
-               (su < NUM_SUGGEST_STRS ? driversuggest_table[su] : "invalid"));
+               (db < NUM_DRIVERBYTE_STRS ? driverbyte_table[db] : "invalid"));
 }
 
 #else
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c
index 34be88d7afa5..af1f0af0c5ac 100644
--- a/drivers/scsi/hptiop.c
+++ b/drivers/scsi/hptiop.c
@@ -580,8 +580,7 @@ static void hptiop_finish_scsi_req(struct hptiop_hba *hba, u32 tag,
                 break;
 
         default:
-                scp->result = ((DRIVER_INVALID|SUGGEST_ABORT)<<24) |
-                                        (DID_ABORT<<16);
+                scp->result = DRIVER_INVALID << 24 | DID_ABORT << 16;
                 break;
         }
 
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index ef683f0d2b5a..457d76a4cfe5 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -1004,8 +1004,7 @@ static int __ips_eh_reset(struct scsi_cmnd *SC)
         DEBUG_VAR(1, "(%s%d) Failing active commands", ips_name, ha->host_num);
 
         while ((scb = ips_removeq_scb_head(&ha->scb_activelist))) {
-                scb->scsi_cmd->result =
-                    (DID_RESET << 16) | (SUGGEST_RETRY << 24);
+                scb->scsi_cmd->result = DID_RESET << 16;
                 scb->scsi_cmd->scsi_done(scb->scsi_cmd);
                 ips_freescb(ha, scb);
         }
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c
index 2a631d7dbcec..a070e5712439 100644
--- a/drivers/scsi/libfc/fc_fcp.c
+++ b/drivers/scsi/libfc/fc_fcp.c
@@ -259,7 +259,7 @@ static void fc_fcp_retry_cmd(struct fc_fcp_pkt *fsp)
         }
 
         fsp->state &= ~FC_SRB_ABORT_PENDING;
-        fsp->io_status = SUGGEST_RETRY << 24;
+        fsp->io_status = 0;
         fsp->status_code = FC_ERROR;
         fc_fcp_complete_locked(fsp);
 }
@@ -859,7 +859,7 @@ static void fc_fcp_complete_locked(struct fc_fcp_pkt *fsp)
                     (!(fsp->scsi_comp_flags & FCP_RESID_UNDER) ||
                      fsp->xfer_len < fsp->data_len - fsp->scsi_resid)) {
                         fsp->status_code = FC_DATA_UNDRUN;
-                        fsp->io_status = SUGGEST_RETRY << 24;
+                        fsp->io_status = 0;
                 }
         }
 
@@ -1267,7 +1267,7 @@ static void fc_fcp_rec(struct fc_fcp_pkt *fsp)
         rp = rport->dd_data;
         if (!fsp->seq_ptr || rp->rp_state != RPORT_ST_READY) {
                 fsp->status_code = FC_HRD_ERROR;
-                fsp->io_status = SUGGEST_RETRY << 24;
+                fsp->io_status = 0;
                 fc_fcp_complete_locked(fsp);
                 return;
         }
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index b103b6ed4970..b1bd3fc7bae8 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1357,7 +1357,7 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,
 
                 scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,
                                 0x10, 0x1);
-                cmd->result = (DRIVER_SENSE|SUGGEST_DIE) << 24
+                cmd->result = DRIVER_SENSE << 24
                         | ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION);
                 phba->bg_guard_err_cnt++;
                 printk(KERN_ERR "BLKGRD: guard_tag error\n");
@@ -1368,7 +1368,7 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,
 
                 scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,
                                 0x10, 0x3);
-                cmd->result = (DRIVER_SENSE|SUGGEST_DIE) << 24
+                cmd->result = DRIVER_SENSE << 24
                         | ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION);
 
                 phba->bg_reftag_err_cnt++;
@@ -1380,7 +1380,7 @@ lpfc_parse_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd,
 
                 scsi_build_sense_buffer(1, cmd->sense_buffer, ILLEGAL_REQUEST,
                                 0x10, 0x2);
-                cmd->result = (DRIVER_SENSE|SUGGEST_DIE) << 24
+                cmd->result = DRIVER_SENSE << 24
                         | ScsiResult(DID_ABORT, SAM_STAT_CHECK_CONDITION);
 
                 phba->bg_apptag_err_cnt++;
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index c6f19ee8f2cb..eb24efea8f14 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -374,9 +374,9 @@ static int st_chk_result(struct scsi_tape *STp, struct st_request * SRpnt)
         if (!debugging) { /* Abnormal conditions for tape */
                 if (!cmdstatp->have_sense)
                         printk(KERN_WARNING
-                               "%s: Error %x (sugg. bt 0x%x, driver bt 0x%x, host bt 0x%x).\n",
-                               name, result, suggestion(result),
-                               driver_byte(result) & DRIVER_MASK, host_byte(result));
+                               "%s: Error %x (driver bt 0x%x, host bt 0x%x).\n",
+                               name, result, driver_byte(result),
+                               host_byte(result));
                 else if (cmdstatp->have_sense &&
                          scode != NO_SENSE &&
                          scode != RECOVERED_ERROR &&
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index fb65d221cedf..02e30a3ce7bf 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -781,7 +781,7 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us)
         /* Did we transfer less than the minimum amount required? */
         if ((srb->result == SAM_STAT_GOOD || srb->sense_buffer[2] == 0) &&
                         scsi_bufflen(srb) - scsi_get_resid(srb) < srb->underflow)
-                srb->result = (DID_ERROR << 16) | (SUGGEST_RETRY << 24);
+                srb->result = DID_ERROR << 16;
 
         last_sector_hacks(us, srb);
         return;
diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
index a109165714d6..815d4047c4ce 100644
--- a/include/scsi/scsi.h
+++ b/include/scsi/scsi.h
@@ -402,16 +402,6 @@ static inline int scsi_is_wlun(unsigned int lun)
 #define DRIVER_HARD         0x07
 #define DRIVER_SENSE        0x08
 
-#define SUGGEST_RETRY       0x10
-#define SUGGEST_ABORT       0x20
-#define SUGGEST_REMAP       0x30
-#define SUGGEST_DIE         0x40
-#define SUGGEST_SENSE       0x80
-#define SUGGEST_IS_OK       0xff
-
-#define DRIVER_MASK         0x0f
-#define SUGGEST_MASK        0xf0
-
 /*
  * Internal return values.
  */
@@ -447,7 +437,6 @@ static inline int scsi_is_wlun(unsigned int lun)
 #define msg_byte(result)    (((result) >> 8) & 0xff)
 #define host_byte(result)   (((result) >> 16) & 0xff)
 #define driver_byte(result) (((result) >> 24) & 0xff)
-#define suggestion(result)  (driver_byte(result) & SUGGEST_MASK)
 
 static inline void set_msg_byte(struct scsi_cmnd *cmd, char status)
 {