ide-cd: cdrom_decode_status: simplify do_end_request logic
PATCH 3/3 ide-cd: cdrom_decode_status: simplify do_end_request logic
Set do_end_request per default which results in several lines removed and simplifying code flow. Also, add defines for cdrom_decode_status's return codes instead of naked numbers.
There should be no functional change resulting from this patch.
--- drivers/ide/ide-cd.c | 35 ++++++++++++----------------------- drivers/ide/ide-cd.h | 9 ++++++--- 2 files changed, 18 insertions(+), 26 deletions(-)
drivers/ide/ide-cd.c +12 -23
@@ -301,17 +301,11 @@ static int ide_cd_breathe(ide_drive_t *drive, struct request *rq) } } -/** -* Returns: -* 0: if the request should be continued. -* 1: if the request will be going through error recovery. -* 2: if the request should be ended. -*/ static int cdrom_decode_status (ide_drive_t *drive,u8 stat) {ide_hwif_t *hwif = drive->hwif;struct request *rq = hwif->rq; -int err, sense_key, do_end_request; +int err, sense_key, do_end_request =1 ;/* get the IDE error register */ err =ide_read_error (drive);
@@ -328,7 +322,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)* Just give up. */ rq->cmd_flags |=REQ_FAILED ; -return 2 ; +return REQ_FAIL ; }/* if we got an error, pass CHECK_CONDITION as the scsi status byte */
@@ -342,18 +336,17 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)case NOT_READY :if (blk_fs_request (rq) && (rq_data_dir (rq) ==WRITE )) {if (ide_cd_breathe (drive, rq)) -return 1 ; +return REQ_RECOVER ; }else {cdrom_saw_media_change (drive); printk(KERN_ERR PFX "%s: tray open\n", drive->name); } - do_end_request =1 ;break ;case UNIT_ATTENTION :cdrom_saw_media_change (drive);if (blk_pc_request (rq) || rq->cmd_type ==REQ_TYPE_ATA_PC ) -return 0 ; +return REQ_CONT ;break ;case ILLEGAL_REQUEST :
@@ -365,10 +358,10 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)* * cdrom_log_sense() knows this! */ -if (rq->cmd[0 ] !=GPCMD_START_STOP_UNIT ) { +if (rq->cmd[0 ] !=GPCMD_START_STOP_UNIT )ide_dump_status (drive,"command error" , stat); - do_end_request =1 ; - } +else + do_end_request =0 ;break ;case MEDIUM_ERROR :
@@ -377,28 +370,24 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)* got here the error is not correctable. */ ide_dump_status (drive,"media error (bad sector)" , stat); - do_end_request =1 ;break ;case BLANK_CHECK :/* disk appears blank ?? */ ide_dump_status (drive,"media error (blank)" , stat); - do_end_request =1 ;break ;default :if (err & ~ATA_ABORTED ) {/* go to the default handler for other errors */ ide_error (drive,"cdrom_decode_status" , stat); -return 1 ; +return REQ_RECOVER ; }if (!(rq->cmd_flags &REQ_QUIET )) {ide_dump_status (drive,"command error" , stat);blk_dump_rq_flags (rq,PFX "failing rq" ); } - - do_end_request =1 ;break ; }
@@ -415,7 +404,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)if (stat &ATA_ERR )cdrom_queue_request_sense (drive,NULL ,NULL ); -return 1 ; +return REQ_RECOVER ; end_request:if (stat &ATA_ERR ) {
@@ -429,9 +418,9 @@ end_request: hwif->rq =NULL ;cdrom_queue_request_sense (drive, rq->sense, rq); -return 1 ; - }else -return 2 ; +return REQ_RECOVER ; + } +return REQ_FAIL ; }/*
drivers/ide/ide-cd.h +6 -3
@@ -18,15 +18,18 @@#define ATAPI_WAIT_WRITE_BUSY (10 * HZ) -/************************************************************************/ - -#define SECTOR_BITS 9 +#define SECTOR_BITS 9#ifndef SECTOR_SIZE #define SECTOR_SIZE (1 << SECTOR_BITS)#endif #define SECTORS_PER_FRAME (CD_FRAMESIZE >> SECTOR_BITS)#define SECTOR_BUFFER_SIZE (CD_FRAMESIZE * 32) +/* internal decode_status codes */ +#define REQ_CONT 0 +#define REQ_RECOVER 1 +#define REQ_FAIL 2 +/* Capabilities Page size including 8 bytes of Mode Page Header */ #define ATAPI_CAPABILITIES_PAGE_SIZE (8 + 20)#define ATAPI_CAPABILITIES_PAGE_PAD_SIZE 4
Signature · 1 line
1.6.2.1
Quoted 22 lines · Borislav Petkov
Set
do_end_requestper default which results in several lines removed and simplifying code flow. Also, add defines for cdrom_decode_status's return codes instead of naked numbers.There should be no functional change resulting from this patch.
Signed-off-by Borislav Petkov <[email protected]>--- drivers/ide/ide-cd.c | 35 ++++++++++++----------------------- drivers/ide/ide-cd.h | 9 ++++++--- 2 files changed, 18 insertions(+), 26 deletions(-)drivers/ide/ide-cd.c +0
-2@@ -301,17 +301,11 @@ static int ide_cd_breathe(ide_drive_t *drive, struct request *rq) } } -/** -* Returns:
drivers/ide/ide-cd.c static int ide_cd_breathe(ide_drive_t *drive, struct request *rq) · line 308
Quoted 10 lines
drivers/ide/ide-cd.c +1
-5-* 0: if the request should be continued. -* 1: if the request will be going through error recovery. -* 2: if the request should be ended. -*/ static int cdrom_decode_status (ide_drive_t *drive,u8 stat) {ide_hwif_t *hwif = drive->hwif;struct request *rq = hwif->rq; -int err, sense_key, do_end_request; +int err, sense_key, do_end_request =1 ;
I think that do_end_request inversion makes code harder to follow and adds risk of subtle behavior changes. It is not worth it IMHO, especialy since we may later remove this variable by doing a bit of code re-organization.
[...]
drivers/ide/ide-cd.c line 24
Quoted 11 lines
drivers/ide/ide-cd.c +1
-3@@ -18,15 +18,18 @@#define ATAPI_WAIT_WRITE_BUSY (10 * HZ) -/************************************************************************/ - -#define SECTOR_BITS 9 +#define SECTOR_BITS 9#ifndef SECTOR_SIZE #define SECTOR_SIZE (1 << SECTOR_BITS)#endif
you may remove this extra SECTOR_SIZE definition while at it
drivers/ide/ide-cd.c line 31
Quoted 7 lines
drivers/ide/ide-cd.c +4
-0#define SECTORS_PER_FRAME (CD_FRAMESIZE >> SECTOR_BITS)#define SECTOR_BUFFER_SIZE (CD_FRAMESIZE * 32) +/* internal decode_status codes */ +#define REQ_CONT 0 +#define REQ_RECOVER 1 +#define REQ_FAIL 2
REQ_* prefix is too generic, IDE_RQ_*? also please use enum for it