diff options
Diffstat (limited to 'drivers/ide/ide-io-std.c')
-rw-r--r-- | drivers/ide/ide-io-std.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c index 66c27768e85b..481e221b233d 100644 --- a/drivers/ide/ide-io-std.c +++ b/drivers/ide/ide-io-std.c | |||
@@ -85,13 +85,11 @@ void ide_dev_select(ide_drive_t *drive) | |||
85 | } | 85 | } |
86 | EXPORT_SYMBOL_GPL(ide_dev_select); | 86 | EXPORT_SYMBOL_GPL(ide_dev_select); |
87 | 87 | ||
88 | void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | 88 | void ide_tf_load(ide_drive_t *drive, struct ide_taskfile *tf, u8 valid) |
89 | { | 89 | { |
90 | ide_hwif_t *hwif = drive->hwif; | 90 | ide_hwif_t *hwif = drive->hwif; |
91 | struct ide_io_ports *io_ports = &hwif->io_ports; | 91 | struct ide_io_ports *io_ports = &hwif->io_ports; |
92 | struct ide_taskfile *tf = &cmd->hob; | ||
93 | void (*tf_outb)(u8 addr, unsigned long port); | 92 | void (*tf_outb)(u8 addr, unsigned long port); |
94 | u8 valid = cmd->valid.out.hob; | ||
95 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; | 93 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; |
96 | 94 | ||
97 | if (mmio) | 95 | if (mmio) |
@@ -109,20 +107,6 @@ void ide_tf_load(ide_drive_t *drive, struct ide_cmd *cmd) | |||
109 | tf_outb(tf->lbam, io_ports->lbam_addr); | 107 | tf_outb(tf->lbam, io_ports->lbam_addr); |
110 | if (valid & IDE_VALID_LBAH) | 108 | if (valid & IDE_VALID_LBAH) |
111 | tf_outb(tf->lbah, io_ports->lbah_addr); | 109 | tf_outb(tf->lbah, io_ports->lbah_addr); |
112 | |||
113 | tf = &cmd->tf; | ||
114 | valid = cmd->valid.out.tf; | ||
115 | |||
116 | if (valid & IDE_VALID_FEATURE) | ||
117 | tf_outb(tf->feature, io_ports->feature_addr); | ||
118 | if (valid & IDE_VALID_NSECT) | ||
119 | tf_outb(tf->nsect, io_ports->nsect_addr); | ||
120 | if (valid & IDE_VALID_LBAL) | ||
121 | tf_outb(tf->lbal, io_ports->lbal_addr); | ||
122 | if (valid & IDE_VALID_LBAM) | ||
123 | tf_outb(tf->lbam, io_ports->lbam_addr); | ||
124 | if (valid & IDE_VALID_LBAH) | ||
125 | tf_outb(tf->lbah, io_ports->lbah_addr); | ||
126 | if (valid & IDE_VALID_DEVICE) | 110 | if (valid & IDE_VALID_DEVICE) |
127 | tf_outb(tf->device, io_ports->device_addr); | 111 | tf_outb(tf->device, io_ports->device_addr); |
128 | } | 112 | } |