redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

sr: reduce debug noise in sr_do_ioctl 

The midlayer scsi logging already logs the command and sense code
if the logging level is high enough, no need to duplicate that
in the sr driver.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: James Bottomley <JBottomley@Parallels.com>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
hifive-unleashed-5.1
Christoph Hellwig 2015-01-18 16:11:31 +01:00
parent 63c6ea1734
commit c7e09574d6
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/scsi/sr_ioctl.c
View File

@ -188,7 +188,6 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
struct scsi_sense_hdr sshdr;
int result, err = 0, retries = 0;
struct request_sense *sense = cgc->sense;
char logbuf[SCSI_LOG_BUFSIZE];
SDev = cd->device;
@ -246,9 +245,6 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
sr_printk(KERN_INFO, cd,
"CDROM not ready. Make sure there "
"is a disc in the drive.\n");
#ifdef DEBUG
scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
#endif
err = -ENOMEDIUM;
break;
case ILLEGAL_REQUEST:
@ -257,22 +253,8 @@ int sr_do_ioctl(Scsi_CD *cd, struct packet_command *cgc)
sshdr.ascq == 0x00)
/* sense: Invalid command operation code */
err = -EDRIVE_CANT_DO_THIS;
#ifdef DEBUG
__scsi_format_command(logbuf, sizeof(logbuf),
cgc->cmd, CDROM_PACKET_SIZE);
sr_printk(KERN_INFO, cd,
"CDROM (ioctl) invalid command: %s\n",
logbuf);
scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
#endif
break;
default:
__scsi_format_command(logbuf, sizeof(logbuf),
cgc->cmd, CDROM_PACKET_SIZE);
sr_printk(KERN_ERR, cd,
"CDROM (ioctl) error, command: %s\n",
logbuf);
scsi_print_sense_hdr(cd->device, cd->cdi.name, &sshdr);
err = -EIO;
}
}