alim15x3: 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:
parent
2feecface7
commit
288911af12
|
@ -458,6 +458,7 @@ config BLK_DEV_AEC62XX
|
||||||
|
|
||||||
config BLK_DEV_ALI15X3
|
config BLK_DEV_ALI15X3
|
||||||
tristate "ALI M15x3 chipset support"
|
tristate "ALI M15x3 chipset support"
|
||||||
|
select IDE_TIMINGS
|
||||||
select BLK_DEV_IDEDMA_PCI
|
select BLK_DEV_IDEDMA_PCI
|
||||||
help
|
help
|
||||||
This driver ensures (U)DMA support for ALI 1533, 1543 and 1543C
|
This driver ensures (U)DMA support for ALI 1533, 1543 and 1543C
|
||||||
|
|
|
@ -69,7 +69,8 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
|
||||||
{
|
{
|
||||||
ide_hwif_t *hwif = HWIF(drive);
|
ide_hwif_t *hwif = HWIF(drive);
|
||||||
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
struct pci_dev *dev = to_pci_dev(hwif->dev);
|
||||||
int s_time, a_time, c_time;
|
struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);
|
||||||
|
int s_time = t->setup, a_time = t->active, c_time = t->cycle;
|
||||||
u8 s_clc, a_clc, r_clc;
|
u8 s_clc, a_clc, r_clc;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
|
int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
|
||||||
|
@ -78,13 +79,10 @@ static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
|
||||||
u8 cd_dma_fifo = 0;
|
u8 cd_dma_fifo = 0;
|
||||||
int unit = drive->select.b.unit & 1;
|
int unit = drive->select.b.unit & 1;
|
||||||
|
|
||||||
s_time = ide_pio_timings[pio].setup_time;
|
|
||||||
a_time = ide_pio_timings[pio].active_time;
|
|
||||||
if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8)
|
if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8)
|
||||||
s_clc = 0;
|
s_clc = 0;
|
||||||
if ((a_clc = (a_time * bus_speed + 999) / 1000) >= 8)
|
if ((a_clc = (a_time * bus_speed + 999) / 1000) >= 8)
|
||||||
a_clc = 0;
|
a_clc = 0;
|
||||||
c_time = ide_pio_timings[pio].cycle_time;
|
|
||||||
|
|
||||||
if (!(r_clc = (c_time * bus_speed + 999) / 1000 - a_clc - s_clc)) {
|
if (!(r_clc = (c_time * bus_speed + 999) / 1000 - a_clc - s_clc)) {
|
||||||
r_clc = 1;
|
r_clc = 1;
|
||||||
|
|
Loading…
Reference in New Issue