ide: remove REQ_TYPE_ATA_TASK
Subsystems (2)
PATCH 15/15 ide: remove REQ_TYPE_ATA_TASK
Based on the earlier work by Tejun Heo.
All users are gone so we can finally remove it.
Cc Tejun Heo <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ide-io.c | 25 +------------------------ drivers/ide/ide-lib.c | 3 +-- include/linux/blkdev.h | 1 - 3 files changed, 2 insertions(+), 27 deletions(-)
drivers/ide/ide-io.c +1 -24
@@ -332,22 +332,6 @@ void ide_end_drive_cmd (ide_drive_t *dri args[1 ] = err; args[2 ] = hwif->INB (IDE_NSECTOR_REG ); } - }else if (rq->cmd_type ==REQ_TYPE_ATA_TASK ) { -u8 *args = (u8 *) rq->buffer; -if (rq->errors ==0 ) - rq->errors = !OK_STAT (stat,READY_STAT ,BAD_STAT ); - -if (args) { - args[0 ] = stat; - args[1 ] = err; -/* be sure we're looking at the low order bits */ - hwif->OUTB (drive->ctl & ~0x80 ,IDE_CONTROL_REG ); - args[2 ] = hwif->INB (IDE_NSECTOR_REG ); - args[3 ] = hwif->INB (IDE_SECTOR_REG ); - args[4 ] = hwif->INB (IDE_LCYL_REG ); - args[5 ] = hwif->INB (IDE_HCYL_REG ); - args[6 ] = hwif->INB (IDE_SELECT_REG ); - } }else if (rq->cmd_type ==REQ_TYPE_ATA_TASKFILE ) {ide_task_t *args = (ide_task_t *) rq->special;if (rq->errors ==0 )
@@ -877,13 +861,7 @@ static ide_startstop_t execute_drive_cmd goto done;memset (<ask,0 ,sizeof (ltask)); -if (rq->cmd_type ==REQ_TYPE_ATA_TASK ) { -#ifdef DEBUG -printk ("%s: DRIVE_TASK_CMD\n" , drive->name); -#endif -memcpy (<ask.tf_array[7 ], &args[1 ],6 ); - ltask.tf_flags =IDE_TFLAG_OUT_TF |IDE_TFLAG_OUT_DEVICE ; - }else {/* rq->cmd_type == REQ_TYPE_ATA_CMD */ +if (rq->cmd_type ==REQ_TYPE_ATA_CMD ) {#ifdef DEBUG printk ("%s: DRIVE_CMD\n" , drive->name);#endif
@@ -1009,7 +987,6 @@ static ide_startstop_t start_request (idide_config_drive_speed (drive, drive->desired_speed);if (rq->cmd_type ==REQ_TYPE_ATA_CMD || - rq->cmd_type ==REQ_TYPE_ATA_TASK || rq->cmd_type ==REQ_TYPE_ATA_TASKFILE )return execute_drive_cmd (drive, rq);else if (blk_pm_request (rq)) {
drivers/ide/ide-lib.c +1 -2
@@ -455,8 +455,7 @@ static void ide_dump_opcode(ide_drive_tspin_unlock (&ide_lock);if (!rq)return ; -if (rq->cmd_type ==REQ_TYPE_ATA_CMD || - rq->cmd_type ==REQ_TYPE_ATA_TASK ) { +if (rq->cmd_type ==REQ_TYPE_ATA_CMD ) {char *args = rq->buffer;if (args) { opcode = args[0 ];
include/linux/blkdev.h +0 -1
@@ -144,7 +144,6 @@ enum rq_cmd_type_bits {* private REQ_LB opcodes to differentiate what type of request this is */ REQ_TYPE_ATA_CMD , -REQ_TYPE_ATA_TASK ,REQ_TYPE_ATA_TASKFILE , REQ_TYPE_ATA_PC, };