lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cy82c693: convert to use ide_timing_find_mode()

Browse Source 
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
parent 86a0e12fcb
commit 713a590dea
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/ide/Kconfig
View File

@@ -510,6 +510,7 @@ config BLK_DEV_TRIFLEX
config BLK_DEV_CY82C693 config BLK_DEV_CY82C693
tristate "CY82C693 chipset support" tristate "CY82C693 chipset support"
select IDE_TIMINGS
select BLK_DEV_IDEDMA_PCI select BLK_DEV_IDEDMA_PCI
help help
This driver adds detection and support for the CY82C693 chipset This driver adds detection and support for the CY82C693 chipset

9
drivers/ide/pci/cy82c693.c
View File

@@ -133,6 +133,7 @@ static int calc_clk(int time, int bus_speed)
*/ */
static void compute_clocks(u8 pio, pio_clocks_t *p_pclk) static void compute_clocks(u8 pio, pio_clocks_t *p_pclk)
{ {
struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);
int clk1, clk2; int clk1, clk2;
int bus_speed = ide_pci_clk ? ide_pci_clk : 33; int bus_speed = ide_pci_clk ? ide_pci_clk : 33;
@@ -141,15 +142,13 @@ static void compute_clocks(u8 pio, pio_clocks_t *p_pclk)
*/ */
/* let's calc the address setup time clocks */ /* let's calc the address setup time clocks */
p_pclk->address_time = (u8)calc_clk(ide_pio_timings[pio].setup_time, bus_speed); p_pclk->address_time = (u8)calc_clk(t->setup, bus_speed);
/* let's calc the active and recovery time clocks */ /* let's calc the active and recovery time clocks */
clk1 = calc_clk(ide_pio_timings[pio].active_time, bus_speed); clk1 = calc_clk(t->active, bus_speed);
/* calc recovery timing */ /* calc recovery timing */
clk2 = ide_pio_timings[pio].cycle_time - clk2 = t->cycle - t->active - t->setup;
ide_pio_timings[pio].active_time -
ide_pio_timings[pio].setup_time;
clk2 = calc_clk(clk2, bus_speed); clk2 = calc_clk(clk2, bus_speed);