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

Commit d68bab50 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Bartlomiej Zolnierkiewicz
Browse files

tx493[89]ide: Remove big endian version of tx493[89]ide_tf_{load,read} 



Now tx493[89]ide_tf_{load,read} do not contain word I/O operations.
They are endian-free now.

Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>,
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 805ec58a

drivers/ide/tx4938ide.c

+2 −87
Original line number Diff line number Diff line
@@ -72,91 +72,6 @@ static void tx4938ide_set_pio_mode(ide_drive_t *drive, const u8 pio) 
#ifdef __BIG_ENDIAN



/* custom iops (independent from SWAP_IO_SPACE) */

static u8 tx4938ide_inb(unsigned long port)

{

	return __raw_readb((void __iomem *)port);

}



static void tx4938ide_outb(u8 value, unsigned long port)

{

	__raw_writeb(value, (void __iomem *)port);

}



static void tx4938ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &cmd->tf;

	u8 HIHI = cmd->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF;



	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;



	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

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

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)

		tx4938ide_outb(tf->hob_nsect, io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)

		tx4938ide_outb(tf->hob_lbal, io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)

		tx4938ide_outb(tf->hob_lbam, io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)

		tx4938ide_outb(tf->hob_lbah, io_ports->lbah_addr);



	if (cmd->tf_flags & IDE_TFLAG_OUT_FEATURE)

		tx4938ide_outb(tf->feature, io_ports->feature_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_NSECT)

		tx4938ide_outb(tf->nsect, io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAL)

		tx4938ide_outb(tf->lbal, io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAM)

		tx4938ide_outb(tf->lbam, io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAH)

		tx4938ide_outb(tf->lbah, io_ports->lbah_addr);



	if (cmd->tf_flags & IDE_TFLAG_OUT_DEVICE)

		tx4938ide_outb((tf->device & HIHI) | drive->select,

			       io_ports->device_addr);

}



static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &cmd->tf;



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

	tx4938ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)

		tf->error  = tx4938ide_inb(io_ports->feature_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)

		tf->nsect  = tx4938ide_inb(io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)

		tf->lbal   = tx4938ide_inb(io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAM)

		tf->lbam   = tx4938ide_inb(io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAH)

		tf->lbah   = tx4938ide_inb(io_ports->lbah_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_DEVICE)

		tf->device = tx4938ide_inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		tx4938ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)

			tf->hob_error = tx4938ide_inb(io_ports->feature_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)

			tf->hob_nsect = tx4938ide_inb(io_ports->nsect_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

			tf->hob_lbal  = tx4938ide_inb(io_ports->lbal_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)

			tf->hob_lbam  = tx4938ide_inb(io_ports->lbam_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)

			tf->hob_lbah  = tx4938ide_inb(io_ports->lbah_addr);

	}

}



static void tx4938ide_input_data_swap(ide_drive_t *drive, struct ide_cmd *cmd,

				void *buf, unsigned int len)

{
@@ -190,8 +105,8 @@ static const struct ide_tp_ops tx4938ide_tp_ops = { 
	.write_devctl		= ide_write_devctl,



	.dev_select		= ide_dev_select,

	.tf_load		= tx4938ide_tf_load,

	.tf_read		= tx4938ide_tf_read,

	.tf_load		= ide_tf_load,

	.tf_read		= ide_tf_read,



	.input_data		= tx4938ide_input_data_swap,

	.output_data		= tx4938ide_output_data_swap,

drivers/ide/tx4939ide.c

+6 −93
Original line number Diff line number Diff line
@@ -434,96 +434,17 @@ static void tx4939ide_tf_load_fixup(ide_drive_t *drive) 
	tx4939ide_writew(sysctl, base, TX4939IDE_Sys_Ctl);

}



#ifdef __BIG_ENDIAN



/* custom iops (independent from SWAP_IO_SPACE) */

static u8 tx4939ide_inb(unsigned long port)

{

	return __raw_readb((void __iomem *)port);

}



static void tx4939ide_outb(u8 value, unsigned long port)

{

	__raw_writeb(value, (void __iomem *)port);

}



static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &cmd->tf;

	u8 HIHI = cmd->tf_flags & IDE_TFLAG_LBA48 ? 0xE0 : 0xEF;



	if (cmd->ftf_flags & IDE_FTFLAG_FLAGGED)

		HIHI = 0xFF;



	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_FEATURE)

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

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_NSECT)

		tx4939ide_outb(tf->hob_nsect, io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAL)

		tx4939ide_outb(tf->hob_lbal, io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAM)

		tx4939ide_outb(tf->hob_lbam, io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_HOB_LBAH)

		tx4939ide_outb(tf->hob_lbah, io_ports->lbah_addr);



	if (cmd->tf_flags & IDE_TFLAG_OUT_FEATURE)

		tx4939ide_outb(tf->feature, io_ports->feature_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_NSECT)

		tx4939ide_outb(tf->nsect, io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAL)

		tx4939ide_outb(tf->lbal, io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAM)

		tx4939ide_outb(tf->lbam, io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_OUT_LBAH)

		tx4939ide_outb(tf->lbah, io_ports->lbah_addr);



	if (cmd->tf_flags & IDE_TFLAG_OUT_DEVICE) {

		tx4939ide_outb((tf->device & HIHI) | drive->select,

			       io_ports->device_addr);

	ide_tf_load(drive, cmd);



	if (cmd->tf_flags & IDE_TFLAG_OUT_DEVICE)

		tx4939ide_tf_load_fixup(drive);

}

}



static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_hwif_t *hwif = drive->hwif;

	struct ide_io_ports *io_ports = &hwif->io_ports;

	struct ide_taskfile *tf = &cmd->tf;



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

	tx4939ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_ERROR)

		tf->error  = tx4939ide_inb(io_ports->feature_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_NSECT)

		tf->nsect  = tx4939ide_inb(io_ports->nsect_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAL)

		tf->lbal   = tx4939ide_inb(io_ports->lbal_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAM)

		tf->lbam   = tx4939ide_inb(io_ports->lbam_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_LBAH)

		tf->lbah   = tx4939ide_inb(io_ports->lbah_addr);

	if (cmd->tf_flags & IDE_TFLAG_IN_DEVICE)

		tf->device = tx4939ide_inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		tx4939ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_ERROR)

			tf->hob_error =	tx4939ide_inb(io_ports->feature_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_NSECT)

			tf->hob_nsect = tx4939ide_inb(io_ports->nsect_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAL)

			tf->hob_lbal  = tx4939ide_inb(io_ports->lbal_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAM)

			tf->hob_lbam  = tx4939ide_inb(io_ports->lbam_addr);

		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_LBAH)

			tf->hob_lbah  = tx4939ide_inb(io_ports->lbah_addr);

	}

}

#ifdef __BIG_ENDIAN



/* custom iops (independent from SWAP_IO_SPACE) */

static void tx4939ide_input_data_swap(ide_drive_t *drive, struct request *rq,

				void *buf, unsigned int len)

{
@@ -558,7 +479,7 @@ static const struct ide_tp_ops tx4939ide_tp_ops = { 


	.dev_select		= ide_dev_select,

	.tf_load		= tx4939ide_tf_load,

	.tf_read		= tx4939ide_tf_read,

	.tf_read		= ide_tf_read,



	.input_data		= tx4939ide_input_data_swap,

	.output_data		= tx4939ide_output_data_swap,
@@ -566,14 +487,6 @@ static const struct ide_tp_ops tx4939ide_tp_ops = { 


#else	/* __LITTLE_ENDIAN */



static void tx4939ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd)

{

	ide_tf_load(drive, cmd);



	if (cmd->tf_flags & IDE_TFLAG_OUT_DEVICE)

		tx4939ide_tf_load_fixup(drive);

}



static const struct ide_tp_ops tx4939ide_tp_ops = {

	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,