Commit ef61329d authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig

scsi: remove scsi_show_result()

Open-code scsi_print_result in sd.c, and cleanup logging to
not print duplicate informations.
Also remove the call to scsi_show_result() in ufshcd.c
to be consistent with other callers of scsi_execute().

With that we can remove scsi_show_result in constants.c
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 3cc958cc
...@@ -1440,22 +1440,6 @@ const char *scsi_driverbyte_string(int result) ...@@ -1440,22 +1440,6 @@ const char *scsi_driverbyte_string(int result)
} }
EXPORT_SYMBOL(scsi_driverbyte_string); EXPORT_SYMBOL(scsi_driverbyte_string);
void scsi_show_result(int result)
{
const char *hb_string = scsi_hostbyte_string(result);
const char *db_string = scsi_driverbyte_string(result);
if (hb_string || db_string)
printk("Result: hostbyte=%s driverbyte=%s\n",
hb_string ? hb_string : "invalid",
db_string ? db_string : "invalid");
else
printk("Result: hostbyte=0x%02x driverbyte=0x%02x\n",
host_byte(result), driver_byte(result));
}
EXPORT_SYMBOL(scsi_show_result);
void scsi_print_result(struct scsi_cmnd *cmd) void scsi_print_result(struct scsi_cmnd *cmd)
{ {
const char *hb_string = scsi_hostbyte_string(cmd->result); const char *hb_string = scsi_hostbyte_string(cmd->result);
......
...@@ -116,7 +116,7 @@ static int sd_eh_action(struct scsi_cmnd *, int); ...@@ -116,7 +116,7 @@ static int sd_eh_action(struct scsi_cmnd *, int);
static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer); static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
static void scsi_disk_release(struct device *cdev); static void scsi_disk_release(struct device *cdev);
static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *); static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
static void sd_print_result(struct scsi_disk *, int); static void sd_print_result(const struct scsi_disk *, const char *, int);
static DEFINE_SPINLOCK(sd_index_lock); static DEFINE_SPINLOCK(sd_index_lock);
static DEFINE_IDA(sd_index_ida); static DEFINE_IDA(sd_index_ida);
...@@ -1492,7 +1492,7 @@ static int sd_sync_cache(struct scsi_disk *sdkp) ...@@ -1492,7 +1492,7 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
} }
if (res) { if (res) {
sd_print_result(sdkp, res); sd_print_result(sdkp, "Synchronize Cache(10) failed", res);
if (driver_byte(res) & DRIVER_SENSE) if (driver_byte(res) & DRIVER_SENSE)
sd_print_sense_hdr(sdkp, &sshdr); sd_print_sense_hdr(sdkp, &sshdr);
...@@ -1713,17 +1713,6 @@ static int sd_done(struct scsi_cmnd *SCpnt) ...@@ -1713,17 +1713,6 @@ static int sd_done(struct scsi_cmnd *SCpnt)
if (sense_valid) if (sense_valid)
sense_deferred = scsi_sense_is_deferred(&sshdr); sense_deferred = scsi_sense_is_deferred(&sshdr);
} }
#ifdef CONFIG_SCSI_LOGGING
SCSI_LOG_HLCOMPLETE(1, scsi_print_result(SCpnt));
if (sense_valid) {
SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
"sd_done: sb[respc,sk,asc,"
"ascq]=%x,%x,%x,%x\n",
sshdr.response_code,
sshdr.sense_key, sshdr.asc,
sshdr.ascq));
}
#endif
sdkp->medium_access_timed_out = 0; sdkp->medium_access_timed_out = 0;
if (driver_byte(result) != DRIVER_SENSE && if (driver_byte(result) != DRIVER_SENSE &&
...@@ -1778,6 +1767,10 @@ static int sd_done(struct scsi_cmnd *SCpnt) ...@@ -1778,6 +1767,10 @@ static int sd_done(struct scsi_cmnd *SCpnt)
break; break;
} }
out: out:
SCSI_LOG_HLCOMPLETE(1, scmd_printk(KERN_INFO, SCpnt,
"sd_done: completed %d of %d bytes\n",
good_bytes, scsi_bufflen(SCpnt)));
if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt)) if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt))
sd_dif_complete(SCpnt, good_bytes); sd_dif_complete(SCpnt, good_bytes);
...@@ -1833,12 +1826,12 @@ sd_spinup_disk(struct scsi_disk *sdkp) ...@@ -1833,12 +1826,12 @@ sd_spinup_disk(struct scsi_disk *sdkp)
/* no sense, TUR either succeeded or failed /* no sense, TUR either succeeded or failed
* with a status error */ * with a status error */
if(!spintime && !scsi_status_is_good(the_result)) { if(!spintime && !scsi_status_is_good(the_result)) {
sd_printk(KERN_NOTICE, sdkp, "Unit Not Ready\n"); sd_print_result(sdkp, "Test Unit Ready failed",
sd_print_result(sdkp, the_result); the_result);
} }
break; break;
} }
/* /*
* The device does not want the automatic start to be issued. * The device does not want the automatic start to be issued.
*/ */
...@@ -1954,7 +1947,6 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp, ...@@ -1954,7 +1947,6 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp,
struct scsi_sense_hdr *sshdr, int sense_valid, struct scsi_sense_hdr *sshdr, int sense_valid,
int the_result) int the_result)
{ {
sd_print_result(sdkp, the_result);
if (driver_byte(the_result) & DRIVER_SENSE) if (driver_byte(the_result) & DRIVER_SENSE)
sd_print_sense_hdr(sdkp, sshdr); sd_print_sense_hdr(sdkp, sshdr);
else else
...@@ -2035,7 +2027,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, ...@@ -2035,7 +2027,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
} while (the_result && retries); } while (the_result && retries);
if (the_result) { if (the_result) {
sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY(16) failed\n"); sd_print_result(sdkp, "Read Capacity(16) failed", the_result);
read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result); read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
return -EINVAL; return -EINVAL;
} }
...@@ -2117,7 +2109,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, ...@@ -2117,7 +2109,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
} while (the_result && retries); } while (the_result && retries);
if (the_result) { if (the_result) {
sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY failed\n"); sd_print_result(sdkp, "Read Capacity(10) failed", the_result);
read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result); read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
return -EINVAL; return -EINVAL;
} }
...@@ -3141,8 +3133,7 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start) ...@@ -3141,8 +3133,7 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, &sshdr, res = scsi_execute_req_flags(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
SD_TIMEOUT, SD_MAX_RETRIES, NULL, REQ_PM); SD_TIMEOUT, SD_MAX_RETRIES, NULL, REQ_PM);
if (res) { if (res) {
sd_printk(KERN_WARNING, sdkp, "START_STOP FAILED\n"); sd_print_result(sdkp, "Start/Stop Unit failed", res);
sd_print_result(sdkp, res);
if (driver_byte(res) & DRIVER_SENSE) if (driver_byte(res) & DRIVER_SENSE)
sd_print_sense_hdr(sdkp, &sshdr); sd_print_sense_hdr(sdkp, &sshdr);
if (scsi_sense_valid(&sshdr) && if (scsi_sense_valid(&sshdr) &&
...@@ -3343,9 +3334,20 @@ static void sd_print_sense_hdr(struct scsi_disk *sdkp, ...@@ -3343,9 +3334,20 @@ static void sd_print_sense_hdr(struct scsi_disk *sdkp,
sshdr->asc, sshdr->ascq); sshdr->asc, sshdr->ascq);
} }
static void sd_print_result(struct scsi_disk *sdkp, int result) static void sd_print_result(const struct scsi_disk *sdkp, const char *msg,
int result)
{ {
sd_printk(KERN_INFO, sdkp, " "); const char *hb_string = scsi_hostbyte_string(result);
scsi_show_result(result); const char *db_string = scsi_driverbyte_string(result);
if (hb_string || db_string)
sd_printk(KERN_INFO, sdkp,
"%s: Result: hostbyte=%s driverbyte=%s\n", msg,
hb_string ? hb_string : "invalid",
db_string ? db_string : "invalid");
else
sd_printk(KERN_INFO, sdkp,
"%s: Result: hostbyte=0x%02x driverbyte=0x%02x\n",
msg, host_byte(result), driver_byte(result));
} }
...@@ -4707,8 +4707,8 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba, ...@@ -4707,8 +4707,8 @@ static int ufshcd_set_dev_pwr_mode(struct ufs_hba *hba,
START_STOP_TIMEOUT, 0, NULL, REQ_PM); START_STOP_TIMEOUT, 0, NULL, REQ_PM);
if (ret) { if (ret) {
sdev_printk(KERN_WARNING, sdp, sdev_printk(KERN_WARNING, sdp,
"START_STOP failed for power mode: %d\n", pwr_mode); "START_STOP failed for power mode: %d, result %x\n",
scsi_show_result(ret); pwr_mode, ret);
if (driver_byte(ret) & DRIVER_SENSE) { if (driver_byte(ret) & DRIVER_SENSE) {
scsi_show_sense_hdr(sdp, NULL, &sshdr); scsi_show_sense_hdr(sdp, NULL, &sshdr);
scsi_show_extd_sense(sdp, NULL, sshdr.asc, sshdr.ascq); scsi_show_extd_sense(sdp, NULL, sshdr.asc, sshdr.ascq);
......
...@@ -17,7 +17,6 @@ extern void scsi_print_sense(const struct scsi_cmnd *); ...@@ -17,7 +17,6 @@ extern void scsi_print_sense(const struct scsi_cmnd *);
extern void __scsi_print_sense(const struct scsi_device *, const char *name, extern void __scsi_print_sense(const struct scsi_device *, const char *name,
const unsigned char *sense_buffer, const unsigned char *sense_buffer,
int sense_len); int sense_len);
extern void scsi_show_result(int);
extern void scsi_print_result(struct scsi_cmnd *); extern void scsi_print_result(struct scsi_cmnd *);
extern const char *scsi_hostbyte_string(int); extern const char *scsi_hostbyte_string(int);
extern const char *scsi_driverbyte_string(int); extern const char *scsi_driverbyte_string(int);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment