Commit ed820f19 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-cd: remove ide_cd_init_rq 



ide_cd_init_rq is not used by ide-cd_ioctl any more. Only
cdrom_queue_request_sense use it. This converts
cdrom_queue_request_sense to use blk_rq_init directly and removes
ide_cd_init_rq.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Borislav Petkov <petkovbb@gmail.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 124cafc5

drivers/ide/ide-cd.c

+3 −11
Original line number Diff line number Diff line
@@ -188,16 +188,6 @@ static void cdrom_analyze_sense_data(ide_drive_t *drive, 
	ide_cd_log_error(drive->name, failed_command, sense);

}



/* Initialize a ide-cd packet command request */

void ide_cd_init_rq(ide_drive_t *drive, struct request *rq)

{

	struct cdrom_info *cd = drive->driver_data;



	blk_rq_init(NULL, rq);

	rq->cmd_type = REQ_TYPE_ATA_PC;

	rq->rq_disk = cd->disk;

}



static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense,

				      struct request *failed_command)

{
@@ -208,7 +198,9 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense, 
		sense = &info->sense_data;



	/* stuff the sense request in front of our current request */

	ide_cd_init_rq(drive, rq);

	blk_rq_init(NULL, rq);

	rq->cmd_type = REQ_TYPE_ATA_PC;

	rq->rq_disk = info->disk;



	rq->data = sense;

	rq->cmd[0] = GPCMD_REQUEST_SENSE;

drivers/ide/ide-cd.h

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ struct cdrom_info { 
void ide_cd_log_error(const char *, struct request *, struct request_sense *);



/* ide-cd.c functions used by ide-cd_ioctl.c */

void ide_cd_init_rq(ide_drive_t *, struct request *);

int ide_cd_queue_pc(ide_drive_t *, const unsigned char *, int, void *,

		    unsigned *, struct request_sense *, int, unsigned int);

int ide_cd_read_toc(ide_drive_t *, struct request_sense *);