From a7c7d16383748029de8187075cabbc3f5df2cd78 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Fri, 1 Feb 2008 23:09:26 +0100 Subject: ide-cd: remove cdrom_do_pc_continuation() cdrom_do_pc_continuation() is now identical to cdrom_do_newpc_cont() so just always use the latter function. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-cd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'drivers/ide') diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 97d0c137524..328d26c0779 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c @@ -1061,18 +1061,7 @@ static void ide_cd_request_sense_fixup(struct request *rq) } } -static ide_startstop_t cdrom_newpc_intr(ide_drive_t *); - -static ide_startstop_t cdrom_do_pc_continuation (ide_drive_t *drive) -{ - struct request *rq = HWGROUP(drive)->rq; - - if (!rq->timeout) - rq->timeout = ATAPI_WAIT_PC; - - /* Send the command to the drive and return. */ - return cdrom_transfer_packet_command(drive, rq, cdrom_newpc_intr); -} +static ide_startstop_t cdrom_do_newpc_cont(ide_drive_t *); static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive) { @@ -1085,7 +1074,7 @@ static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive) len = rq->data_len; /* Start sending the command to the drive. */ - return cdrom_start_packet_command(drive, len, cdrom_do_pc_continuation); + return cdrom_start_packet_command(drive, len, cdrom_do_newpc_cont); } int ide_cd_queue_pc(ide_drive_t *drive, struct request *rq) -- cgit v1.2.3