lkml.org 
[lkml]   [2008]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 14/21] cy82c693: convert to use ide_timing_find_mode()
    There should be no functional changes caused by this patch.

    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    ---
    drivers/ide/Kconfig | 1 +
    drivers/ide/pci/cy82c693.c | 9 ++++-----
    2 files changed, 5 insertions(+), 5 deletions(-)

    Index: b/drivers/ide/Kconfig
    ===================================================================
    --- a/drivers/ide/Kconfig
    +++ b/drivers/ide/Kconfig
    @@ -510,6 +510,7 @@ config BLK_DEV_TRIFLEX

    config BLK_DEV_CY82C693
    tristate "CY82C693 chipset support"
    + select IDE_TIMINGS
    select BLK_DEV_IDEDMA_PCI
    help
    This driver adds detection and support for the CY82C693 chipset
    Index: b/drivers/ide/pci/cy82c693.c
    ===================================================================
    --- a/drivers/ide/pci/cy82c693.c
    +++ b/drivers/ide/pci/cy82c693.c
    @@ -133,6 +133,7 @@ static int calc_clk(int time, int bus_sp
    */
    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 bus_speed = ide_pci_clk ? ide_pci_clk : 33;

    @@ -141,15 +142,13 @@ static void compute_clocks(u8 pio, pio_c
    */

    /* 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 */
    - clk1 = calc_clk(ide_pio_timings[pio].active_time, bus_speed);
    + clk1 = calc_clk(t->active, bus_speed);

    /* calc recovery timing */
    - clk2 = ide_pio_timings[pio].cycle_time -
    - ide_pio_timings[pio].active_time -
    - ide_pio_timings[pio].setup_time;
    + clk2 = t->cycle - t->active - t->setup;

    clk2 = calc_clk(clk2, bus_speed);


    \
     
     \ /
      Last update: 2008-05-28 23:51    [W:0.021 / U:63.272 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site