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

Commit 18660823 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove ide_do_drive_cmd() 



* Use elv_add_request() instead of __elv_add_request() in ide_do_drive_cmd().

* ide_do_drive_cmd() is used only in ide-{atapi,cd}.c so inline it there.

There should be no functional changes caused by this patch.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 65ca5377

drivers/ide/ide-atapi.c

+4 −1
Original line number Diff line number Diff line
@@ -149,7 +149,10 @@ static void ide_queue_pc_head(ide_drive_t *drive, struct gendisk *disk, 
	memcpy(rq->cmd, pc->c, 12);

	if (drive->media == ide_tape)

		rq->cmd[13] = REQ_IDETAPE_PC1;

	ide_do_drive_cmd(drive, rq);



	drive->hwif->rq = NULL;



	elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 0);

}



/*

drivers/ide/ide-cd.c

+3 −1
Original line number Diff line number Diff line
@@ -242,7 +242,9 @@ static void cdrom_queue_request_sense(ide_drive_t *drive, void *sense, 
		ide_debug_log(IDE_DBG_SENSE, "failed_cmd: 0x%x\n",

			      failed_command->cmd[0]);



	ide_do_drive_cmd(drive, rq);

	drive->hwif->rq = NULL;



	elv_add_request(drive->queue, rq, ELEVATOR_INSERT_FRONT, 0);

}



static void cdrom_end_request(ide_drive_t *drive, int uptodate)

drivers/ide/ide-io.c

+0 −28
Original line number Diff line number Diff line
@@ -1129,34 +1129,6 @@ irqreturn_t ide_intr (int irq, void *dev_id) 
}

EXPORT_SYMBOL_GPL(ide_intr);



/**

 *	ide_do_drive_cmd	-	issue IDE special command

 *	@drive: device to issue command

 *	@rq: request to issue

 *

 *	This function issues a special IDE device request

 *	onto the request queue.

 *

 *	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.

 */



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

{

	struct request_queue *q = drive->queue;

	unsigned long flags;



	drive->hwif->rq = NULL;



	spin_lock_irqsave(q->queue_lock, flags);

	__elv_add_request(q, rq, ELEVATOR_INSERT_FRONT, 0);

	spin_unlock_irqrestore(q->queue_lock, flags);

}

EXPORT_SYMBOL(ide_do_drive_cmd);



void ide_pad_transfer(ide_drive_t *drive, int write, int len)

{

	ide_hwif_t *hwif = drive->hwif;

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -1174,8 +1174,6 @@ extern ide_startstop_t ide_do_reset (ide_drive_t *); 
extern int ide_devset_execute(ide_drive_t *drive,

			      const struct ide_devset *setting, int arg);



extern void ide_do_drive_cmd(ide_drive_t *, struct request *);



extern void ide_end_drive_cmd(ide_drive_t *, u8, u8);



void ide_tf_dump(const char *, struct ide_taskfile *);