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

Commit 63f5abb0 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: remove action argument in ide_do_drive_cmd 



ide_do_drive_cmd is called only with ide_preempt action argument. So
we can remove the action argument in ide_do_drive_cmd and ide_action_t
typedef.

This patch also includes two minor cleanups: 1) ide_do_drive_cmd
always succeeds so we don't need the return value; 2) the callers use
blk_rq_init before ide_do_drive_cmd so there is no need to initialize
rq->errors.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 7e12ca11

drivers/ide/ide-cd.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense, 
	/* NOTE! Save the failed command in "rq->buffer" */

	rq->buffer = (void *) failed_command;



	(void) ide_do_drive_cmd(drive, rq, ide_preempt);

	ide_do_drive_cmd(drive, rq);

}



static void cdrom_end_request(ide_drive_t *drive, int uptodate)

drivers/ide/ide-floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void idefloppy_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc, 
	rq->cmd_type = REQ_TYPE_SPECIAL;

	rq->cmd_flags |= REQ_PREEMPT;

	rq->rq_disk = floppy->disk;

	(void) ide_do_drive_cmd(drive, rq, ide_preempt);

	ide_do_drive_cmd(drive, rq);

}



static struct ide_atapi_pc *idefloppy_next_pc_storage(ide_drive_t *drive)

drivers/ide/ide-io.c

+9 −31
Original line number Diff line number Diff line
@@ -1520,49 +1520,27 @@ irqreturn_t ide_intr (int irq, void *dev_id) 
 *	ide_do_drive_cmd	-	issue IDE special command

 *	@drive: device to issue command

 *	@rq: request to issue

 *	@action: action for processing

 *

 *	This function issues a special IDE device request

 *	onto the request queue.

 *

 *	If action is ide_wait, then the rq is queued at the end of the

 *	request queue, and the function sleeps until it has been processed.

 *	This is for use when invoked from an ioctl handler.

 *

 *	If action is ide_preempt, then the rq is queued at the head of

 *	the request queue, displacing the currently-being-processed

 *	request and this function returns immediately without waiting

 *	for the new rq to be completed.  This is VERY DANGEROUS, and is

 *	intended for careful use by the ATAPI tape/cdrom driver code.

 *

 *	If action is ide_end, then the rq is queued at the end of the

 *	request queue, and the function returns immediately without waiting

 *	for the new rq to be completed. This is again intended for careful

 *	use by the ATAPI tape/cdrom driver code.

 *	the rq is queued at the head of the request queue, displacing

 *	the currently-being-processed request and this function

 *	returns immediately without waiting for the new rq to be

 *	completed.  This is VERY DANGEROUS, and is intended for

 *	careful use by the ATAPI tape/cdrom driver code.

 */



int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t action)

void ide_do_drive_cmd(ide_drive_t *drive, struct request *rq)

{

	unsigned long flags;

	ide_hwgroup_t *hwgroup = HWGROUP(drive);

	int where = ELEVATOR_INSERT_BACK;



	rq->errors = 0;



	if (action == ide_preempt)

		where = ELEVATOR_INSERT_FRONT;



	spin_lock_irqsave(&ide_lock, flags);

	if (action == ide_preempt)

	hwgroup->rq = NULL;

	__elv_add_request(drive->queue, rq, where, 1);

	__elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 1);

	__generic_unplug_device(drive->queue);

	/* the queue is stopped so it won't be plugged+unplugged */

	if (blk_pm_resume_request(rq))

		do_ide_request(drive->queue);

	spin_unlock_irqrestore(&ide_lock, flags);



	return 0;

}



EXPORT_SYMBOL(ide_do_drive_cmd);

drivers/ide/ide-tape.c

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ static void idetape_queue_pc_head(ide_drive_t *drive, struct ide_atapi_pc *pc, 
	rq->cmd_flags |= REQ_PREEMPT;

	rq->buffer = (char *) pc;

	rq->rq_disk = tape->disk;

	(void) ide_do_drive_cmd(drive, rq, ide_preempt);

	ide_do_drive_cmd(drive, rq);

}



/*

drivers/scsi/ide-scsi.c

+2 −1
Original line number Diff line number Diff line
@@ -245,7 +245,8 @@ static int idescsi_check_condition(ide_drive_t *drive, 
		ide_scsi_hex_dump(pc->c, 6);

	}

	rq->rq_disk = scsi->disk;

	return ide_do_drive_cmd(drive, rq, ide_preempt);

	ide_do_drive_cmd(drive, rq);

	return 0;

}



static int idescsi_end_request(ide_drive_t *, int, int);