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

ide-cd: convert ide_do_drive_cmd path to use blk_execute_rq 



This converts the ide_do_drive_cmd path using ide_wait to use
blk_execute_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 5f828546

drivers/ide/ide-cd_ioctl.c

+6 −6
Original line number Diff line number Diff line
@@ -296,14 +296,14 @@ int ide_cdrom_reset(struct cdrom_device_info *cdi) 
	ide_drive_t *drive = cdi->handle;

	struct cdrom_info *cd = drive->driver_data;

	struct request_sense sense;

	struct request req;

	struct request *rq;

	int ret;



	ide_cd_init_rq(drive, &req);

	req.cmd_type = REQ_TYPE_SPECIAL;

	req.cmd_flags = REQ_QUIET;

	ret = ide_do_drive_cmd(drive, &req, ide_wait);



	rq = blk_get_request(drive->queue, READ, __GFP_WAIT);

	rq->cmd_type = REQ_TYPE_SPECIAL;

	rq->cmd_flags = REQ_QUIET;

	ret = blk_execute_rq(drive->queue, cd->disk, rq, 0);

	blk_put_request(rq);

	/*

	 * A reset will unlock the door. If it was previously locked,

	 * lock it again.