Skip to contentSkip to conversation

ide-cd: remove cdrom_do_pc_continuation()

PATCH In review Bartlomiej Zolnierkiewicz 1 participant 1 message Dec 20, 2007 libata

lore
Share & tools
lore

Bartlomiej Zolnierkiewicz

author
#0 lore raw

PATCH 50/63 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 <[email protected]>

---
-49 bytes

 drivers/ide/ide-cd.c |   15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)
drivers/ide/ide-cd.c +2 -13
Index: b/drivers/ide/ide-cd.c
===================================================================
@@ -1061,18 +1061,7 @@ static void ide_cd_request_sense_fixup(s
 		}
 }
 
-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_c
 	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)