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

ide-floppy: 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 dd47087b

drivers/ide/ide-floppy.c

+8 −6
Original line number Diff line number Diff line
@@ -887,14 +887,16 @@ static ide_startstop_t idefloppy_do_request(ide_drive_t *drive, 
static int idefloppy_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)

{

	struct ide_floppy_obj *floppy = drive->driver_data;

	struct request rq;

	struct request *rq;

	int error;



	ide_init_drive_cmd(&rq);

	rq.buffer = (char *) pc;

	rq.cmd_type = REQ_TYPE_SPECIAL;

	rq.rq_disk = floppy->disk;

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

	rq->buffer = (char *) pc;

	rq->cmd_type = REQ_TYPE_SPECIAL;

	error = blk_execute_rq(drive->queue, floppy->disk, rq, 0);

	blk_put_request(rq);



	return ide_do_drive_cmd(drive, &rq, ide_wait);

	return error;

}



/*