diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:50 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-15 15:21:50 -0400 |
commit | ff07488346702f554aaeb6aae982540aa0302373 (patch) | |
tree | 1df71858ebc91390c34ffc9e71a1c8c4278a785d /drivers/ide/h8300 | |
parent | 0fd04dcc2ebb6ec9088c24b368b0ce1f42a98ef5 (diff) |
ide: remove drive->ctl
Remove drive->ctl (it is always equal to 0x08 after init time).
While at it:
* Use ATA_DEVCTL_OBS define.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/h8300')
-rw-r--r-- | drivers/ide/h8300/ide-h8300.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c index d5afc28eaae7..ae37ee58bae2 100644 --- a/drivers/ide/h8300/ide-h8300.c +++ b/drivers/ide/h8300/ide-h8300.c | |||
@@ -96,7 +96,7 @@ static void h8300_tf_read(ide_drive_t *drive, ide_task_t *task) | |||
96 | } | 96 | } |
97 | 97 | ||
98 | /* be sure we're looking at the low order bits */ | 98 | /* be sure we're looking at the low order bits */ |
99 | outb(drive->ctl & ~0x80, io_ports->ctl_addr); | 99 | outb(ATA_DEVCTL_OBS & ~0x80, io_ports->ctl_addr); |
100 | 100 | ||
101 | if (task->tf_flags & IDE_TFLAG_IN_NSECT) | 101 | if (task->tf_flags & IDE_TFLAG_IN_NSECT) |
102 | tf->nsect = inb(io_ports->nsect_addr); | 102 | tf->nsect = inb(io_ports->nsect_addr); |
@@ -110,7 +110,7 @@ static void h8300_tf_read(ide_drive_t *drive, ide_task_t *task) | |||
110 | tf->device = inb(io_ports->device_addr); | 110 | tf->device = inb(io_ports->device_addr); |
111 | 111 | ||
112 | if (task->tf_flags & IDE_TFLAG_LBA48) { | 112 | if (task->tf_flags & IDE_TFLAG_LBA48) { |
113 | outb(drive->ctl | 0x80, io_ports->ctl_addr); | 113 | outb(ATA_DEVCTL_OBS | 0x80, io_ports->ctl_addr); |
114 | 114 | ||
115 | if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) | 115 | if (task->tf_flags & IDE_TFLAG_IN_HOB_FEATURE) |
116 | tf->hob_feature = inb(io_ports->feature_addr); | 116 | tf->hob_feature = inb(io_ports->feature_addr); |