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

Commit 2230d90d authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: sanitize ide_finish_cmd() 



* Move ide_end_request() call out from ide_finish_cmd() to its users.

* Use ide_finish_cmd() in task_no_data_intr().

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d364c7f5

drivers/ide/ide-dma.c

+4 −1
Original line number Diff line number Diff line
@@ -98,7 +98,10 @@ ide_startstop_t ide_dma_intr(ide_drive_t *drive) 
		if (!dma_stat) {

			struct ide_cmd *cmd = &hwif->cmd;



			if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)

				ide_finish_cmd(drive, cmd, stat);

			else

				ide_end_request(drive, 1, cmd->rq->nr_sectors);

			return ide_stopped;

		}

		printk(KERN_ERR "%s: %s: bad DMA status (0x%02x)\n",

drivers/ide/ide-taskfile.c

+9 −15
Original line number Diff line number Diff line
@@ -155,12 +155,8 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive) 


		if (blk_pm_request(rq))

			ide_complete_pm_rq(drive, rq);

		else {

			u8 err = ide_read_error(drive);



			ide_complete_cmd(drive, cmd, stat, err);

			ide_complete_rq(drive, err);

		}

		else

			ide_finish_cmd(drive, cmd, stat);

	}



	return ide_stopped;
@@ -293,15 +289,10 @@ static void ide_error_cmd(ide_drive_t *drive, struct ide_cmd *cmd) 


void ide_finish_cmd(ide_drive_t *drive, struct ide_cmd *cmd, u8 stat)

{

	if ((cmd->tf_flags & IDE_TFLAG_FS) == 0) {

	u8 err = ide_read_error(drive);



	ide_complete_cmd(drive, cmd, stat, err);

	ide_complete_rq(drive, err);

		return;

	}



	ide_end_request(drive, 1, cmd->rq->nr_sectors);

}



/*
@@ -356,7 +347,10 @@ out_wait: 
	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);

	return ide_started;

out_end:

	if ((cmd->tf_flags & IDE_TFLAG_FS) == 0)

		ide_finish_cmd(drive, cmd, stat);

	else

		ide_end_request(drive, 1, cmd->rq->nr_sectors);

	return ide_stopped;

out_err:

	ide_error_cmd(drive, cmd);