Commit 901bd08a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: merge task_{in,out}_intr() 



* Merge task_out_intr() with task_in_intr().

* Rename task_in_intr() to task_pio_intr().

There should be no functional changes caused by this patch.

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

drivers/ide/ide-taskfile.c

+31 −41
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int taskfile_lib_get_identify (ide_drive_t *drive, u8 *buf) 


static ide_startstop_t task_no_data_intr(ide_drive_t *);

static ide_startstop_t pre_task_out_intr(ide_drive_t *, struct ide_cmd *);

static ide_startstop_t task_in_intr(ide_drive_t *);

static ide_startstop_t task_pio_intr(ide_drive_t *);



ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd)

{
@@ -92,7 +92,7 @@ ide_startstop_t do_rw_taskfile(ide_drive_t *drive, struct ide_cmd *orig_cmd) 
			ndelay(400);	/* FIXME */

			return pre_task_out_intr(drive, cmd);

		}

		handler = task_in_intr;

		handler = task_pio_intr;

		/* fall-through */

	case ATA_PROT_NODATA:

		if (handler == NULL)
@@ -329,19 +329,22 @@ static ide_startstop_t task_in_unexpected(ide_drive_t *drive, 
	}



	/* Assume it was a spurious irq */

	ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);

	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);



	return ide_started;

}



/*

 * Handler for command with PIO data-in phase (Read/Read Multiple).

 * Handler for command with PIO data phase.

 */

static ide_startstop_t task_in_intr(ide_drive_t *drive)

static ide_startstop_t task_pio_intr(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_cmd *cmd = &drive->hwif->cmd;

	u8 stat = hwif->tp_ops->read_status(hwif);

	u8 write = !!(cmd->tf_flags & IDE_TFLAG_WRITE);



	if (write == 0) {

		/* Error? */

		if (stat & ATA_ERR)

			return task_error(drive, cmd, __func__, stat);
@@ -349,48 +352,34 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive) 
		/* Didn't want any data? Odd. */

		if ((stat & ATA_DRQ) == 0)

			return task_in_unexpected(drive, cmd, stat);

	} else {

		if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))

			return task_error(drive, cmd, __func__, stat);



	ide_pio_datablock(drive, cmd, 0);



	/* Are we done? Check status and finish transfer. */

	if (cmd->nleft == 0) {

		stat = wait_drive_not_busy(drive);

		if (!OK_STAT(stat, 0, BAD_STAT))

		/* Deal with unexpected ATA data phase. */

		if (((stat & ATA_DRQ) == 0) ^ (cmd->nleft == 0))

			return task_error(drive, cmd, __func__, stat);

	}



	if (write && cmd->nleft == 0) {

		ide_finish_cmd(drive, cmd, stat);

		return ide_stopped;

	}



	/* Still data left to transfer. */

	ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);



	return ide_started;

}

	ide_pio_datablock(drive, cmd, write);



/*

 * Handler for command with PIO data-out phase (Write/Write Multiple).

 */

static ide_startstop_t task_out_intr (ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_cmd *cmd = &drive->hwif->cmd;

	u8 stat = hwif->tp_ops->read_status(hwif);



	if (!OK_STAT(stat, DRIVE_READY, drive->bad_wstat))

		return task_error(drive, cmd, __func__, stat);



	/* Deal with unexpected ATA data phase. */

	if (((stat & ATA_DRQ) == 0) ^ (cmd->nleft == 0))

	/* Are we done? Check status and finish transfer. */

	if (write == 0 && cmd->nleft == 0) {

		stat = wait_drive_not_busy(drive);

		if (!OK_STAT(stat, 0, BAD_STAT))

			return task_error(drive, cmd, __func__, stat);



	if (cmd->nleft == 0) {

		ide_finish_cmd(drive, cmd, stat);

		return ide_stopped;

	}



	/* Still data left to transfer. */

	ide_pio_datablock(drive, cmd, 1);

	ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);

	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);



	return ide_started;

}
@@ -412,7 +401,8 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive, 
	if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)

		local_irq_disable();



	ide_set_handler(drive, &task_out_intr, WAIT_WORSTCASE, NULL);

	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE, NULL);



	ide_pio_datablock(drive, cmd, 1);



	return ide_started;