aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 17:09:26 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-02-01 17:09:26 -0500
commita7c7d16383748029de8187075cabbc3f5df2cd78 (patch)
treea5e339eb2d5cad1655a7942958eb4b9746f8fe4f /drivers
parentff1bfbc1f02f7c293a03a64722291c539deb162c (diff)
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>
Diffstat (limited to 'drivers')
-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)
1061 } 1061 }
1062} 1062}
1063 1063
1064static ide_startstop_t cdrom_newpc_intr(ide_drive_t *); 1064static ide_startstop_t cdrom_do_newpc_cont(ide_drive_t *);
1065
1066static ide_startstop_t cdrom_do_pc_continuation (ide_drive_t *drive)
1067{
1068 struct request *rq = HWGROUP(drive)->rq;
1069
1070 if (!rq->timeout)
1071 rq->timeout = ATAPI_WAIT_PC;
1072
1073 /* Send the command to the drive and return. */
1074 return cdrom_transfer_packet_command(drive, rq, cdrom_newpc_intr);
1075}
1076 1065
1077static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive) 1066static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive)
1078{ 1067{
@@ -1085,7 +1074,7 @@ static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive)
1085 len = rq->data_len; 1074 len = rq->data_len;
1086 1075
1087 /* Start sending the command to the drive. */ 1076 /* Start sending the command to the drive. */
1088 return cdrom_start_packet_command(drive, len, cdrom_do_pc_continuation); 1077 return cdrom_start_packet_command(drive, len, cdrom_do_newpc_cont);
1089} 1078}
1090 1079
1091int ide_cd_queue_pc(ide_drive_t *drive, struct request *rq) 1080int ide_cd_queue_pc(ide_drive_t *drive, struct request *rq)