diff options
Diffstat (limited to 'drivers/ide/pci/alim15x3.c')
-rw-r--r-- | drivers/ide/pci/alim15x3.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c index ba0fb92b0417..5511c86733dc 100644 --- a/drivers/ide/pci/alim15x3.c +++ b/drivers/ide/pci/alim15x3.c | |||
@@ -295,7 +295,6 @@ static int ali_get_info (char *buffer, char **addr, off_t offset, int count) | |||
295 | 295 | ||
296 | static u8 ali15x3_tune_pio (ide_drive_t *drive, u8 pio) | 296 | static u8 ali15x3_tune_pio (ide_drive_t *drive, u8 pio) |
297 | { | 297 | { |
298 | ide_pio_data_t d; | ||
299 | ide_hwif_t *hwif = HWIF(drive); | 298 | ide_hwif_t *hwif = HWIF(drive); |
300 | struct pci_dev *dev = hwif->pci_dev; | 299 | struct pci_dev *dev = hwif->pci_dev; |
301 | int s_time, a_time, c_time; | 300 | int s_time, a_time, c_time; |
@@ -307,7 +306,7 @@ static u8 ali15x3_tune_pio (ide_drive_t *drive, u8 pio) | |||
307 | u8 cd_dma_fifo = 0; | 306 | u8 cd_dma_fifo = 0; |
308 | int unit = drive->select.b.unit & 1; | 307 | int unit = drive->select.b.unit & 1; |
309 | 308 | ||
310 | pio = ide_get_best_pio_mode(drive, pio, 5, &d); | 309 | pio = ide_get_best_pio_mode(drive, pio, 5); |
311 | s_time = ide_pio_timings[pio].setup_time; | 310 | s_time = ide_pio_timings[pio].setup_time; |
312 | a_time = ide_pio_timings[pio].active_time; | 311 | a_time = ide_pio_timings[pio].active_time; |
313 | if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8) | 312 | if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8) |
@@ -817,9 +816,9 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = { | |||
817 | .init_chipset = init_chipset_ali15x3, | 816 | .init_chipset = init_chipset_ali15x3, |
818 | .init_hwif = init_hwif_ali15x3, | 817 | .init_hwif = init_hwif_ali15x3, |
819 | .init_dma = init_dma_ali15x3, | 818 | .init_dma = init_dma_ali15x3, |
820 | .channels = 2, | ||
821 | .autodma = AUTODMA, | 819 | .autodma = AUTODMA, |
822 | .bootable = ON_BOARD, | 820 | .bootable = ON_BOARD, |
821 | .pio_mask = ATA_PIO5, | ||
823 | }; | 822 | }; |
824 | 823 | ||
825 | /** | 824 | /** |