]> err.no Git - linux-2.6/commitdiff
ide-cd: remove cdrom_do_pc_continuation()
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 1 Feb 2008 22:09:26 +0000 (23:09 +0100)
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Fri, 1 Feb 2008 22:09:26 +0000 (23:09 +0100)
cdrom_do_pc_continuation() is now identical to cdrom_do_newpc_cont()
so just always use the latter function.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
drivers/ide/ide-cd.c

index 97d0c1375247b37d3462bfdd2d6d199f975cc013..328d26c07798442c90ed58298693410d788bd9e3 100644 (file)
@@ -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)