diff options
Diffstat (limited to 'drivers/ide/siimage.c')
-rw-r--r-- | drivers/ide/siimage.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/siimage.c b/drivers/ide/siimage.c index d95df528562f..97266958f744 100644 --- a/drivers/ide/siimage.c +++ b/drivers/ide/siimage.c | |||
@@ -229,19 +229,18 @@ static u8 sil_sata_udma_filter(ide_drive_t *drive) | |||
229 | 229 | ||
230 | /** | 230 | /** |
231 | * sil_set_pio_mode - set host controller for PIO mode | 231 | * sil_set_pio_mode - set host controller for PIO mode |
232 | * @hwif: port | ||
232 | * @drive: drive | 233 | * @drive: drive |
233 | * @pio: PIO mode number | ||
234 | * | 234 | * |
235 | * Load the timing settings for this device mode into the | 235 | * Load the timing settings for this device mode into the |
236 | * controller. | 236 | * controller. |
237 | */ | 237 | */ |
238 | 238 | ||
239 | static void sil_set_pio_mode(ide_drive_t *drive, u8 pio) | 239 | static void sil_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive) |
240 | { | 240 | { |
241 | static const u16 tf_speed[] = { 0x328a, 0x2283, 0x1281, 0x10c3, 0x10c1 }; | 241 | static const u16 tf_speed[] = { 0x328a, 0x2283, 0x1281, 0x10c3, 0x10c1 }; |
242 | static const u16 data_speed[] = { 0x328a, 0x2283, 0x1104, 0x10c3, 0x10c1 }; | 242 | static const u16 data_speed[] = { 0x328a, 0x2283, 0x1104, 0x10c3, 0x10c1 }; |
243 | 243 | ||
244 | ide_hwif_t *hwif = drive->hwif; | ||
245 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 244 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
246 | ide_drive_t *pair = ide_get_pair_dev(drive); | 245 | ide_drive_t *pair = ide_get_pair_dev(drive); |
247 | u32 speedt = 0; | 246 | u32 speedt = 0; |
@@ -249,6 +248,7 @@ static void sil_set_pio_mode(ide_drive_t *drive, u8 pio) | |||
249 | unsigned long addr = siimage_seldev(drive, 0x04); | 248 | unsigned long addr = siimage_seldev(drive, 0x04); |
250 | unsigned long tfaddr = siimage_selreg(hwif, 0x02); | 249 | unsigned long tfaddr = siimage_selreg(hwif, 0x02); |
251 | unsigned long base = (unsigned long)hwif->hwif_data; | 250 | unsigned long base = (unsigned long)hwif->hwif_data; |
251 | const u8 pio = drive->pio_mode - XFER_PIO_0; | ||
252 | u8 tf_pio = pio; | 252 | u8 tf_pio = pio; |
253 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; | 253 | u8 mmio = (hwif->host_flags & IDE_HFLAG_MMIO) ? 1 : 0; |
254 | u8 addr_mask = hwif->channel ? (mmio ? 0xF4 : 0x84) | 254 | u8 addr_mask = hwif->channel ? (mmio ? 0xF4 : 0x84) |