mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
ff1bfbc1f0
commit
a7c7d16383
|
@ -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_newpc_cont(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_packet_command (ide_drive_t *drive)
|
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;
|
len = rq->data_len;
|
||||||
|
|
||||||
/* Start sending the command to the drive. */
|
/* 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)
|
int ide_cd_queue_pc(ide_drive_t *drive, struct request *rq)
|
||||||
|
|
Loading…
Reference in New Issue