Unused now. Signed-off-by: Hannes Reinecke <hare@xxxxxxx> --- drivers/scsi/constants.c | 2 +- include/scsi/scsi.h | 1 - include/trace/events/scsi.h | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/constants.c b/drivers/scsi/constants.c index b2ba83e6b98d..1780837ea11e 100644 --- a/drivers/scsi/constants.c +++ b/drivers/scsi/constants.c @@ -408,7 +408,7 @@ static const char * const hostbyte_table[]={ static const char * const driverbyte_table[]={ "DRIVER_OK", "DRIVER_BUSY", "DRIVER_SOFT", "DRIVER_MEDIA", "DRIVER_ERROR", -"DRIVER_INVALID", "DRIVER_TIMEOUT"}; +"DRIVER_INVALID"}; const char *scsi_hostbyte_string(int result) { diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h index cf022e08e0b0..5cd29d8c7c3b 100644 --- a/include/scsi/scsi.h +++ b/include/scsi/scsi.h @@ -171,7 +171,6 @@ static inline int scsi_is_wlun(u64 lun) #define DRIVER_ERROR 0x04 #define DRIVER_INVALID 0x05 -#define DRIVER_TIMEOUT 0x06 /* * Internal return values. diff --git a/include/trace/events/scsi.h b/include/trace/events/scsi.h index e15373917d1e..a1b4da442c5c 100644 --- a/include/trace/events/scsi.h +++ b/include/trace/events/scsi.h @@ -132,8 +132,7 @@ scsi_driverbyte_name(DRIVER_SOFT), \ scsi_driverbyte_name(DRIVER_MEDIA), \ scsi_driverbyte_name(DRIVER_ERROR), \ - scsi_driverbyte_name(DRIVER_INVALID), \ - scsi_driverbyte_name(DRIVER_TIMEOUT)) + scsi_driverbyte_name(DRIVER_INVALID)) #define scsi_msgbyte_name(result) { result, #result } #define show_msgbyte_name(val) \ -- 2.16.4