diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:45 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 12:46:45 +0100 |
| commit | 130e886708d6e11f3d54e5d27c266578de56f343 (patch) | |
| tree | af6c09224bd1aa21119c052cd3664719916ec795 /drivers/ide/ide-eh.c | |
| parent | ba7d479c36dde12821c01ad0696d678635b8fb92 (diff) | |
| download | kernel_samsung_aries-130e886708d6e11f3d54e5d27c266578de56f343.zip kernel_samsung_aries-130e886708d6e11f3d54e5d27c266578de56f343.tar.gz kernel_samsung_aries-130e886708d6e11f3d54e5d27c266578de56f343.tar.bz2 | |
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>
Diffstat (limited to 'drivers/ide/ide-eh.c')
| -rw-r--r-- | drivers/ide/ide-eh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-eh.c b/drivers/ide/ide-eh.c index ccfd06e..aff1a9b 100644 --- a/drivers/ide/ide-eh.c +++ b/drivers/ide/ide-eh.c @@ -149,7 +149,7 @@ static inline void ide_complete_drive_reset(ide_drive_t *drive, int err) if (rq && blk_special_request(rq) && rq->cmd[0] == REQ_DRIVE_RESET) { if (err <= 0 && rq->errors == 0) rq->errors = -EIO; - ide_end_request(drive, err ? err : 1, 0); + ide_complete_rq(drive, err ? err : 0, ide_rq_bytes(rq)); } } |