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

ide: remove ide_init_drive_cmd 



ide_init_drive_cmd just calls blk_rq_init. This converts the users of
ide_init_drive_cmd to use blk_rq_init directly and removes
ide_init_drive_cmd.

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 5f2e1cee

drivers/ide/ide-cd.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ void ide_cd_init_rq(ide_drive_t *drive, struct request *rq) 
{

	struct cdrom_info *cd = drive->driver_data;



	ide_init_drive_cmd(rq);

	blk_rq_init(NULL, rq);

	rq->cmd_type = REQ_TYPE_ATA_PC;

	rq->rq_disk = cd->disk;

}

drivers/ide/ide-floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static void idefloppy_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc, 
{

	struct ide_floppy_obj *floppy = drive->driver_data;



	ide_init_drive_cmd(rq);

	blk_rq_init(NULL, rq);

	rq->buffer = (char *) pc;

	rq->cmd_type = REQ_TYPE_SPECIAL;

	rq->cmd_flags |= REQ_PREEMPT;

drivers/ide/ide-io.c

+0 −17
Original line number Diff line number Diff line
@@ -1538,23 +1538,6 @@ irqreturn_t ide_intr (int irq, void *dev_id) 
	return IRQ_HANDLED;

}



/**

 *	ide_init_drive_cmd	-	initialize a drive command request

 *	@rq: request object

 *

 *	Initialize a request before we fill it in and send it down to

 *	ide_do_drive_cmd. Commands must be set up by this function. Right

 *	now it doesn't do a lot, but if that changes abusers will have a

 *	nasty surprise.

 */



void ide_init_drive_cmd (struct request *rq)

{

	blk_rq_init(NULL, rq);

}



EXPORT_SYMBOL(ide_init_drive_cmd);



/**

 *	ide_do_drive_cmd	-	issue IDE special command

 *	@drive: device to issue command

drivers/scsi/ide-scsi.c

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int idescsi_check_condition(ide_drive_t *drive, 
		kfree(pc);

		return -ENOMEM;

	}

	ide_init_drive_cmd(rq);

	blk_rq_init(NULL, rq);

	rq->special = (char *) pc;

	pc->rq = rq;

	pc->buf = buf;
@@ -786,7 +786,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd, 
		}

	}



	ide_init_drive_cmd (rq);

	blk_rq_init(NULL, rq);

	rq->special = (char *) pc;

	rq->cmd_type = REQ_TYPE_SPECIAL;

	spin_unlock_irq(host->host_lock);

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -857,8 +857,6 @@ int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long); 


extern ide_startstop_t ide_do_reset (ide_drive_t *);



extern void ide_init_drive_cmd (struct request *rq);



/*

 * "action" parameter type for ide_do_drive_cmd() below.

 */