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:
@@ -410,7 +410,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
|
||||
if (rq->errors == 0)
|
||||
rq->errors = -EIO;
|
||||
}
|
||||
ide_end_request(drive, uptodate, 0);
|
||||
ide_complete_rq(drive, uptodate ? 0 : -EIO,
|
||||
ide_rq_bytes(rq));
|
||||
}
|
||||
|
||||
return ide_stopped;
|
||||
@@ -469,7 +470,8 @@ static ide_startstop_t ide_pc_intr(ide_drive_t *drive)
|
||||
|
||||
/* FIXME: don't do partial completions */
|
||||
if (drive->media == ide_floppy)
|
||||
ide_end_request(drive, 1, done >> 9);
|
||||
ide_complete_rq(drive, 0,
|
||||
done ? done : ide_rq_bytes(rq));
|
||||
} else
|
||||
xferfunc(drive, NULL, pc->cur_pos, bcount);
|
||||
|
||||
|
Reference in New Issue
Block a user