aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2009-03-31 14:15:29 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-31 14:15:29 -0400
commit4d74c3fcf2b90487eacec511bc8c07177711c81c (patch)
tree737b20b97f073b0275fcd9267fe09dc3126250af /drivers/ide
parent47ab834854d4639fedf2ed2f21b41297f2abe1a7 (diff)
ide: use ATA_HOB
Make use of ATA_HOB instead of hard-coded value in the tf_read() method. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/at91_ide.c4
-rw-r--r--drivers/ide/ide-h8300.c4
-rw-r--r--drivers/ide/ide-io-std.c4
-rw-r--r--drivers/ide/ns87415.c4
-rw-r--r--drivers/ide/scc_pata.c4
-rw-r--r--drivers/ide/tx4938ide.c4
-rw-r--r--drivers/ide/tx4939ide.c4
7 files changed, 14 insertions, 14 deletions
diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 6bb45a2b24c2..8fc6ae958b0b 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -242,7 +242,7 @@ static void at91_ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
242 } 242 }
243 243
244 /* be sure we're looking at the low order bits */ 244 /* be sure we're looking at the low order bits */
245 ide_mm_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); 245 ide_mm_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
246 246
247 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) 247 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
248 tf->feature = ide_mm_inb(io_ports->feature_addr); 248 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)
258 tf->device = ide_mm_inb(io_ports->device_addr); 258 tf->device = ide_mm_inb(io_ports->device_addr);
259 259
260 if (cmd->tf_flags & IDE_TFLAG_LBA48) { 260 if (cmd->tf_flags & IDE_TFLAG_LBA48) {
261 ide_mm_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); 261 ide_mm_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
262 262
263 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) 263 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
264 tf->hob_feature = ide_mm_inb(io_ports->feature_addr); 264 tf->hob_feature = ide_mm_inb(io_ports->feature_addr);
diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index ff8339ed59ab..7492f28d1290 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -98,7 +98,7 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
98 } 98 }
99 99
100 /* be sure we're looking at the low order bits */ 100 /* be sure we're looking at the low order bits */
101 outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); 101 outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
102 102
103 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) 103 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
104 tf->feature = inb(io_ports->feature_addr); 104 tf->feature = inb(io_ports->feature_addr);
@@ -114,7 +114,7 @@ static void h8300_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
114 tf->device = inb(io_ports->device_addr); 114 tf->device = inb(io_ports->device_addr);
115 115
116 if (cmd->tf_flags & IDE_TFLAG_LBA48) { 116 if (cmd->tf_flags & IDE_TFLAG_LBA48) {
117 outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); 117 outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
118 118
119 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) 119 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
120 tf->hob_feature = inb(io_ports->feature_addr); 120 tf->hob_feature = inb(io_ports->feature_addr);
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
index 2d9c6dc3f956..3a867e49a0af 100644
--- a/drivers/ide/ide-io-std.c
+++ b/drivers/ide/ide-io-std.c
@@ -166,7 +166,7 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
166 } 166 }
167 167
168 /* be sure we're looking at the low order bits */ 168 /* be sure we're looking at the low order bits */
169 tf_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); 169 tf_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
170 170
171 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) 171 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
172 tf->feature = tf_inb(io_ports->feature_addr); 172 tf->feature = tf_inb(io_ports->feature_addr);
@@ -182,7 +182,7 @@ void ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
182 tf->device = tf_inb(io_ports->device_addr); 182 tf->device = tf_inb(io_ports->device_addr);
183 183
184 if (cmd->tf_flags & IDE_TFLAG_LBA48) { 184 if (cmd->tf_flags & IDE_TFLAG_LBA48) {
185 tf_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); 185 tf_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
186 186
187 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) 187 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
188 tf->hob_feature = tf_inb(io_ports->feature_addr); 188 tf->hob_feature = tf_inb(io_ports->feature_addr);
diff --git a/drivers/ide/ns87415.c b/drivers/ide/ns87415.c
index cbc1d1110385..13a9e00efa13 100644
--- a/drivers/ide/ns87415.c
+++ b/drivers/ide/ns87415.c
@@ -74,7 +74,7 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
74 } 74 }
75 75
76 /* be sure we're looking at the low order bits */ 76 /* be sure we're looking at the low order bits */
77 outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); 77 outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
78 78
79 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) 79 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
80 tf->feature = inb(io_ports->feature_addr); 80 tf->feature = inb(io_ports->feature_addr);
@@ -90,7 +90,7 @@ static void superio_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
90 tf->device = superio_ide_inb(io_ports->device_addr); 90 tf->device = superio_ide_inb(io_ports->device_addr);
91 91
92 if (cmd->tf_flags & IDE_TFLAG_LBA48) { 92 if (cmd->tf_flags & IDE_TFLAG_LBA48) {
93 outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); 93 outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
94 94
95 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) 95 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
96 tf->hob_feature = inb(io_ports->feature_addr); 96 tf->hob_feature = inb(io_ports->feature_addr);
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 542419ffa9b7..6e47eac1cd7f 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -709,7 +709,7 @@ static void scc_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
709 } 709 }
710 710
711 /* be sure we're looking at the low order bits */ 711 /* be sure we're looking at the low order bits */
712 scc_ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); 712 scc_ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
713 713
714 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) 714 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
715 tf->feature = scc_ide_inb(io_ports->feature_addr); 715 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)
725 tf->device = scc_ide_inb(io_ports->device_addr); 725 tf->device = scc_ide_inb(io_ports->device_addr);
726 726
727 if (cmd->tf_flags & IDE_TFLAG_LBA48) { 727 if (cmd->tf_flags & IDE_TFLAG_LBA48) {
728 scc_ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); 728 scc_ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
729 729
730 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) 730 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
731 tf->hob_feature = scc_ide_inb(io_ports->feature_addr); 731 tf->hob_feature = scc_ide_inb(io_ports->feature_addr);
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 657a61890b1c..1c4a78ac1a20 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -142,7 +142,7 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
142 } 142 }
143 143
144 /* be sure we're looking at the low order bits */ 144 /* be sure we're looking at the low order bits */
145 tx4938ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); 145 tx4938ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
146 146
147 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) 147 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
148 tf->feature = tx4938ide_inb(io_ports->feature_addr); 148 tf->feature = tx4938ide_inb(io_ports->feature_addr);
@@ -158,7 +158,7 @@ static void tx4938ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
158 tf->device = tx4938ide_inb(io_ports->device_addr); 158 tf->device = tx4938ide_inb(io_ports->device_addr);
159 159
160 if (cmd->tf_flags & IDE_TFLAG_LBA48) { 160 if (cmd->tf_flags & IDE_TFLAG_LBA48) {
161 tx4938ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); 161 tx4938ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
162 162
163 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) 163 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
164 tf->hob_feature = 164 tf->hob_feature =
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index faf0d97b9ce8..77aee5b2ce95 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -509,7 +509,7 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
509 } 509 }
510 510
511 /* be sure we're looking at the low order bits */ 511 /* be sure we're looking at the low order bits */
512 tx4939ide_outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); 512 tx4939ide_outb(ATA_DEVCTL_OBS, io_ports->ctl_addr);
513 513
514 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE) 514 if (cmd->tf_flags & IDE_TFLAG_IN_FEATURE)
515 tf->feature = tx4939ide_inb(io_ports->feature_addr); 515 tf->feature = tx4939ide_inb(io_ports->feature_addr);
@@ -525,7 +525,7 @@ static void tx4939ide_tf_read(ide_drive_t *drive, struct ide_cmd *cmd)
525 tf->device = tx4939ide_inb(io_ports->device_addr); 525 tf->device = tx4939ide_inb(io_ports->device_addr);
526 526
527 if (cmd->tf_flags & IDE_TFLAG_LBA48) { 527 if (cmd->tf_flags & IDE_TFLAG_LBA48) {
528 tx4939ide_outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); 528 tx4939ide_outb(ATA_HOB | ATA_DEVCTL_OBS, io_ports->ctl_addr);
529 529
530 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) 530 if (cmd->tf_flags & IDE_TFLAG_IN_HOB_FEATURE)
531 tf->hob_feature = 531 tf->hob_feature =