diff options
| author | Hannes Reinecke <hare@suse.de> | 2021-04-27 10:30:46 +0200 |
|---|---|---|
| committer | Martin K. Petersen <martin.petersen@oracle.com> | 2021-06-01 05:59:18 +0200 |
| commit | 3d45cefc8edd7f560e6c97a8d9928ad571f76dec (patch) | |
| tree | 0692fdf11728f56b0f61af245f7f32240028c905 /drivers/scsi/sr.c | |
| parent | scsi: pcmcia: nsp_cs: Use SAM_STAT_CHECK_CONDITION (diff) | |
| download | linux-3d45cefc8edd7f560e6c97a8d9928ad571f76dec.tar.xz linux-3d45cefc8edd7f560e6c97a8d9928ad571f76dec.zip | |
scsi: core: Drop obsolete Linux-specific SCSI status codes
Originally the SCSI subsystem has been using 'special' SCSI status codes,
which were the SAM-specified ones but shifted by 1. As most drivers have
now been modified to use the SAM-specified ones, having two nearly
identical sets of definitions only causes confusion.
The Linux-specifed SCSI status codes have been marked obsolete for several
years so drop them and use the SAM-specified status codes throughout.
Link: https://lore.kernel.org/r/20210427083046.31620-41-hare@suse.de
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Douglas Gilbert <dgilbert@interlog.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index e9cb874f6891..482a07b662a9 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -338,7 +338,7 @@ static int sr_done(struct scsi_cmnd *SCpnt) * care is taken to avoid unnecessary additional work such as * memcpy's that could be avoided. */ - if (status_byte(result) == SAM_STAT_CHECK_CONDITION && + if (scsi_status_is_check_condition(result) && (SCpnt->sense_buffer[0] & 0x7f) == 0x70) { /* Sense current */ switch (SCpnt->sense_buffer[2]) { case MEDIUM_ERROR: |