summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:26 +0100
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 23:09:26 +0100
commita7c7d16383748029de8187075cabbc3f5df2cd78 (patch)
treea5e339eb2d5cad1655a7942958eb4b9746f8fe4f
parentff1bfbc1f02f7c293a03a64722291c539deb162c (diff)
downloadblackbird-op-linux-a7c7d16383748029de8187075cabbc3f5df2cd78.tar.gz
blackbird-op-linux-a7c7d16383748029de8187075cabbc3f5df2cd78.zip
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 <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-cd.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index 97d0c1375247..328d26c07798 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)
OpenPOWER on IntegriCloud