Messages in this thread Patch in this message | | | From | Tejun Heo <> | Subject | [PATCH 03/17] ide: use blk_update_request() instead of blk_end_request_callback() | Date | Mon, 16 Mar 2009 11:28:46 +0900 |
| |
blk_end_request_callback() is being phased out in favor of blk_update_request(). Switch.
Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --- drivers/ide/ide-cd.c | 16 ++-------------- 1 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index ddfbea4..f825d50 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -748,16 +748,6 @@ int ide_cd_queue_pc(ide_drive_t *drive, const unsigned char *cmd, return (flags & REQ_FAILED) ? -EIO : 0; } -/* - * Called from blk_end_request_callback() after the data of the request is - * completed and before the request itself is completed. By returning value '1', - * blk_end_request_callback() returns immediately without completing it. - */ -static int cdrom_newpc_intr_dummy_cb(struct request *rq) -{ - return 1; -} - static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) { ide_hwif_t *hwif = drive->hwif; @@ -932,12 +922,10 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) /* * The request can't be completed until DRQ is cleared. * So complete the data, but don't complete the request - * using the dummy function for the callback feature - * of blk_end_request_callback(). + * using blk_update_request(). */ if (rq->bio) - blk_end_request_callback(rq, 0, blen, - cdrom_newpc_intr_dummy_cb); + blk_update_request(rq, 0, blen); else rq->data += blen; } -- 1.6.0.2
| |