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

Commit 7e12ca11 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Bartlomiej Zolnierkiewicz
Browse files

ide-scsi: replace ide_do_drive_cmd with blk_execute_rq_nowait 



All the callers of ide_do_drive_cmd() except for ide-scsi use
ide_preempt action argument. This converts ide-scsi to use
blk_execute_rq_nowait instead of ide_do_drive_cmd so that we can
remove the action argument in ide_do_drive_cmd and ide_action_t
typedef.

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 ff074883

drivers/scsi/ide-scsi.c

+1 −2
Original line number Diff line number Diff line
@@ -790,8 +790,7 @@ static int idescsi_queue (struct scsi_cmnd *cmd, 
	rq->special = (char *) pc;

	rq->cmd_type = REQ_TYPE_SPECIAL;

	spin_unlock_irq(host->host_lock);

	rq->rq_disk = scsi->disk;

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

	blk_execute_rq_nowait(drive->queue, scsi->disk, rq, 0, NULL);

	spin_lock_irq(host->host_lock);

	return 0;

abort: