ide: remove ide_end_request()
* Add ide_rq_bytes() helper. * Add blk_noretry_request() quirk to ide_complete_rq() (currently only fs requests can be marked as "noretry" so there is no change in behavior). * Switch current ide_end_request() users to use ide_complete_rq(). [ No need to check for rq->nr_sectors == 0 in {ide_dma,task_pio}_intr(), nsectors == 0 in cdrom_end_request() and err == 0 in ide_do_devset(). ] * Remove no longer needed ide_end_request(). There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@ -283,7 +283,7 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd)
|
||||
}
|
||||
|
||||
if (sectors > 0)
|
||||
ide_end_request(drive, 1, sectors);
|
||||
ide_complete_rq(drive, 0, sectors << 9);
|
||||
}
|
||||
}
|
||||
|
||||
@ -352,7 +352,7 @@ out_end:
|
||||
if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)
|
||||
ide_finish_cmd(drive, cmd, stat);
|
||||
else
|
||||
ide_end_request(drive, 1, cmd->rq->nr_sectors);
|
||||
ide_complete_rq(drive, 0, cmd->rq->nr_sectors << 9);
|
||||
return ide_stopped;
|
||||
out_err:
|
||||
ide_error_cmd(drive, cmd);
|
||||
|
Reference in New Issue
Block a user