diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 20:33:38 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-16 20:33:38 +0200 |
| commit | 3f847571a1cf845a338bcd352f31240b3615f40d (patch) | |
| tree | c4f680fa4ef0e95d86a804d65a3e557374a3b016 /drivers/ide | |
| parent | 713a590dea9a61e84f2837e75c5e9429d95908b5 (diff) | |
| download | linux-3f847571a1cf845a338bcd352f31240b3615f40d.tar.gz linux-3f847571a1cf845a338bcd352f31240b3615f40d.tar.bz2 linux-3f847571a1cf845a338bcd352f31240b3615f40d.zip | |
sl82c105: convert to use ide_timing_find_mode()
There should be no functional changes caused by this patch.
Acked-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/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ide/pci/sl82c105.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 7446db649064..5f4d6ea379f6 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig @@ -703,6 +703,7 @@ config BLK_DEV_SIS5513 config BLK_DEV_SL82C105 tristate "Winbond SL82c105 support" depends on (PPC || ARM) + select IDE_TIMINGS select BLK_DEV_IDEDMA_PCI help If you have a Winbond SL82c105 IDE controller, say Y here to enable diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c index ce84fa045d39..6efbde297174 100644 --- a/drivers/ide/pci/sl82c105.c +++ b/drivers/ide/pci/sl82c105.c @@ -47,10 +47,11 @@ */ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio) { + struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio); unsigned int cmd_on, cmd_off; u8 iordy = 0; - cmd_on = (ide_pio_timings[pio].active_time + 29) / 30; + cmd_on = (t->active + 29) / 30; cmd_off = (ide_pio_cycle_time(drive, pio) - 30 * cmd_on + 29) / 30; if (cmd_on == 0) |