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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-16 20:33:38 +02:00
Родитель 713a590dea
Коммит 3f847571a1
2 изменённых файлов: 3 добавлений и 1 удалений

Просмотреть файл

@ -703,6 +703,7 @@ config BLK_DEV_SIS5513
config BLK_DEV_SL82C105 config BLK_DEV_SL82C105
tristate "Winbond SL82c105 support" tristate "Winbond SL82c105 support"
depends on (PPC || ARM) depends on (PPC || ARM)
select IDE_TIMINGS
select BLK_DEV_IDEDMA_PCI select BLK_DEV_IDEDMA_PCI
help help
If you have a Winbond SL82c105 IDE controller, say Y here to enable If you have a Winbond SL82c105 IDE controller, say Y here to enable

Просмотреть файл

@ -47,10 +47,11 @@
*/ */
static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio) 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; unsigned int cmd_on, cmd_off;
u8 iordy = 0; 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; cmd_off = (ide_pio_cycle_time(drive, pio) - 30 * cmd_on + 29) / 30;
if (cmd_on == 0) if (cmd_on == 0)