Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7b241a7 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Jens Axboe
Browse files

ide: use blk_rq_init() to initialize the request 



This converts ide to use blk_rq_init to initialize the request.

This is a preparation for large command support, which needs to
initialize the request in a proper way (that is, just doing a memset()
will not work).

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 4f54eec8

drivers/ide/ide-io.c

+1 −2
Original line number Diff line number Diff line
@@ -1550,8 +1550,7 @@ irqreturn_t ide_intr (int irq, void *dev_id) 


void ide_init_drive_cmd (struct request *rq)

{

	memset(rq, 0, sizeof(*rq));

	rq->ref_count = 1;

	blk_rq_init(NULL, rq);

}



EXPORT_SYMBOL(ide_init_drive_cmd);

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static void idetape_create_request_sense_cmd(struct ide_atapi_pc *pc) 


static void idetape_init_rq(struct request *rq, u8 cmd)

{

	memset(rq, 0, sizeof(*rq));

	blk_rq_init(NULL, rq);

	rq->cmd_type = REQ_TYPE_SPECIAL;

	rq->cmd[0] = cmd;

}

drivers/ide/ide-taskfile.c

+1 −2
Original line number Diff line number Diff line
@@ -494,8 +494,7 @@ int ide_raw_taskfile(ide_drive_t *drive, ide_task_t *task, u8 *buf, u16 nsect) 
{

	struct request rq;



	memset(&rq, 0, sizeof(rq));

	rq.ref_count = 1;

	blk_rq_init(NULL, &rq);

	rq.cmd_type = REQ_TYPE_ATA_TASKFILE;

	rq.buffer = buf;

drivers/ide/ide.c

+2 −2
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int generic_ide_suspend(struct device *dev, pm_message_t mesg) 
	if (!(drive->dn % 2))

		ide_acpi_get_timing(hwif);



	memset(&rq, 0, sizeof(rq));

	blk_rq_init(NULL, &rq);

	memset(&rqpm, 0, sizeof(rqpm));

	memset(&args, 0, sizeof(args));

	rq.cmd_type = REQ_TYPE_PM_SUSPEND;
@@ -602,7 +602,7 @@ static int generic_ide_resume(struct device *dev) 


	ide_acpi_exec_tfs(drive);



	memset(&rq, 0, sizeof(rq));

	blk_rq_init(NULL, &rq);

	memset(&rqpm, 0, sizeof(rqpm));

	memset(&args, 0, sizeof(args));

	rq.cmd_type = REQ_TYPE_PM_RESUME;