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

Commit bac08cee authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: call {in|out}put_data() methods from tf_{read|load}() methods (take 2) 



Handle IDE_FTFLAG_{IN|OUT}_DATA flags in tf_{read|load}() methods by calling
{in|out}put_data() methods to transfer 2 bytes -- this will allow us to move
that handling out of those methods altogether...

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

drivers/ide/at91_ide.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -196,9 +196,9 @@ static void at91_ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) 
		HIHI = 0xFF;

		HIHI = 0xFF;





	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {

	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {

		u16 data = (tf->hob_data << 8) | tf->data;

		u8 data[2] = { tf->data, tf->hob_data };





		at91_ide_output_data(drive, NULL, &data, 2);

		at91_ide_output_data(drive, cmd, data, 2);

	}

	}





	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -234,11 +234,12 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	struct ide_taskfile *tf = &cmd->tf;

	struct ide_taskfile *tf = &cmd->tf;





	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data;

		u8 data[2];





		at91_ide_input_data(drive, NULL, &data, 2);

		at91_ide_input_data(drive, cmd, data, 2);

		tf->data = data & 0xff;



		tf->hob_data = (data >> 8) & 0xff;

		tf->data = data[0];

		tf->hob_data = data[1];

	}

	}





	/* be sure we're looking at the low order bits */

	/* be sure we're looking at the low order bits */

drivers/ide/ide-h8300.c

+10 −5
Original line number Original line Diff line number Diff line
@@ -54,8 +54,11 @@ static void h8300_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) 
	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)

	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;

		HIHI = 0xFF;





	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA)

	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {

		mm_outw((tf->hob_data << 8) | tf->data, io_ports->data_addr);

		u8 data[2] = { tf->data, tf->hob_data };



		h8300_output_data(drive, cmd, data, 2);

	}





	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

		outb(tf->hob_feature, io_ports->feature_addr);

		outb(tf->hob_feature, io_ports->feature_addr);
@@ -91,10 +94,12 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	struct ide_taskfile *tf = &cmd->tf;

	struct ide_taskfile *tf = &cmd->tf;





	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data = mm_inw(io_ports->data_addr);

		u8 data[2];



		h8300_input_data(drive, cmd, data, 2);





		tf->data = data & 0xff;

		tf->data = data[0];

		tf->hob_data = (data >> 8) & 0xff;

		tf->hob_data = data[1];

	}

	}





	/* be sure we're looking at the low order bits */

	/* be sure we're looking at the low order bits */

drivers/ide/ide-io-std.c

+6 −12
Original line number Original line Diff line number Diff line
@@ -91,12 +91,9 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) 
		HIHI = 0xFF;

		HIHI = 0xFF;





	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {

	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {

		u16 data = (tf->hob_data << 8) | tf->data;

		u8 data[2] = { tf->data, tf->hob_data };





		if (mmio)

		ide_output_data(drive, cmd, data, 2);

			writew(data, (void __iomem *)io_ports->data_addr);

		else

			outw(data, io_ports->data_addr);

	}

	}





	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)
@@ -145,15 +142,12 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	}

	}





	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data;

		u8 data[2];





		if (mmio)

		ide_input_data(drive, cmd, data, 2);

			data = readw((void __iomem *)io_ports->data_addr);

		else

			data = inw(io_ports->data_addr);





		tf->data = data & 0xff;

		tf->data = data[0];

		tf->hob_data = (data >> 8) & 0xff;

		tf->hob_data = data[1];

	}

	}





	/* be sure we're looking at the low order bits */

	/* be sure we're looking at the low order bits */

drivers/ide/ns87415.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -67,10 +67,12 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	struct ide_taskfile *tf = &cmd->tf;

	struct ide_taskfile *tf = &cmd->tf;





	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data = inw(io_ports->data_addr);

		u8 data[2];





		tf->data = data & 0xff;

		ide_input_data(drive, cmd, data, 2);

		tf->hob_data = (data >> 8) & 0xff;



		tf->data = data[0];

		tf->hob_data = data[1];

	}

	}





	/* be sure we're looking at the low order bits */

	/* be sure we're looking at the low order bits */

drivers/ide/scc_pata.c

+10 −6
Original line number Original line Diff line number Diff line
@@ -656,9 +656,11 @@ static void scc_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) 
	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)

	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;

		HIHI = 0xFF;





	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA)

	if (cmd->ftf_flags & IDE_FTFLAG_OUT_DATA) {

		out_be32((void *)io_ports->data_addr,

		u8 data[2] = { tf->data, tf->hob_data };

			 (tf->hob_data << 8) | tf->data);



		scc_output_data(drive, NULL, data, 2);

	}





	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

		scc_ide_outb(tf->hob_feature, io_ports->feature_addr);

		scc_ide_outb(tf->hob_feature, io_ports->feature_addr);
@@ -693,10 +695,12 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	struct ide_taskfile *tf = &cmd->tf;

	struct ide_taskfile *tf = &cmd->tf;





	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

	if (cmd->ftf_flags & IDE_FTFLAG_IN_DATA) {

		u16 data = (u16)in_be32((void *)io_ports->data_addr);

		u8 data[2];



		scc_input_data(drive, cmd, data, 2);





		tf->data = data & 0xff;

		tf->data = data[0];

		tf->hob_data = (data >> 8) & 0xff;

		tf->hob_data = data[1];

	}

	}





	/* be sure we're looking at the low order bits */

	/* be sure we're looking at the low order bits */