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: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Borislav Petkov <petkovbb@gmail.com> Cc: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
dd47087bc1
commit
6fe162381e
|
@ -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)
|
static int idefloppy_queue_pc_tail(ide_drive_t *drive, struct ide_atapi_pc *pc)
|
||||||
{
|
{
|
||||||
struct ide_floppy_obj *floppy = drive->driver_data;
|
struct ide_floppy_obj *floppy = drive->driver_data;
|
||||||
struct request rq;
|
struct request *rq;
|
||||||
|
int error;
|
||||||
|
|
||||||
ide_init_drive_cmd(&rq);
|
rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
|
||||||
rq.buffer = (char *) pc;
|
rq->buffer = (char *) pc;
|
||||||
rq.cmd_type = REQ_TYPE_SPECIAL;
|
rq->cmd_type = REQ_TYPE_SPECIAL;
|
||||||
rq.rq_disk = floppy->disk;
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue