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

ide: use ATA_HOB 



Make use of ATA_HOB instead of hard-coded value in the tf_read() method.

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

drivers/ide/at91_ide.c

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	}



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

	ide_mm_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);

	ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)

		tf->feature = ide_mm_inb(io_ports->feature_addr);
@@ -258,7 +258,7 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
		tf->device = ide_mm_inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		ide_mm_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);

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



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

			tf->hob_feature = ide_mm_inb(io_ports->feature_addr);

drivers/ide/ide-h8300.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	}



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

	outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);

	outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)

		tf->feature = inb(io_ports->feature_addr);
@@ -114,7 +114,7 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
		tf->device = inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);

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



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

			tf->hob_feature = inb(io_ports->feature_addr);

drivers/ide/ide-io-std.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	}



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

	tf_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);

	tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)

		tf->feature = tf_inb(io_ports->feature_addr);
@@ -182,7 +182,7 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
		tf->device = tf_inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		tf_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);

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



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

			tf->hob_feature = tf_inb(io_ports->feature_addr);

drivers/ide/ns87415.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	}



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

	outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);

	outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)

		tf->feature = inb(io_ports->feature_addr);
@@ -90,7 +90,7 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
		tf->device = superio_ide_inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);

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



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

			tf->hob_feature = inb(io_ports->feature_addr);

drivers/ide/scc_pata.c

+2 −2
Original line number Diff line number Diff line
@@ -709,7 +709,7 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
	}



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

	scc_ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr);

	scc_ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);



	if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)

		tf->feature = scc_ide_inb(io_ports->feature_addr);
@@ -725,7 +725,7 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd) 
		tf->device = scc_ide_inb(io_ports->device_addr);



	if (cmd->tf_flags & IDE_TFLAG_LBA48) {

		scc_ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr);

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



		if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)

			tf->hob_feature = scc_ide_inb(io_ports->feature_addr);