lkml.org 
[lkml]   [2011]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 04/21] staging: ft1000: Fix coding style in ft1000_reset_asic function.
    Date
    Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
    ---
    drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 37 +++++++++++++------------
    1 files changed, 19 insertions(+), 18 deletions(-)

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index 53073d5..188a8e3 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -593,32 +593,33 @@ int dsp_reload(struct ft1000_device *ft1000dev)
    // none
    //
    //---------------------------------------------------------------------------
    -static void ft1000_reset_asic (struct net_device *dev)
    +static void ft1000_reset_asic(struct net_device *dev)
    {
    struct ft1000_info *info = netdev_priv(dev);
    - struct ft1000_device *ft1000dev = info->pFt1000Dev;
    - u16 tempword;
    -
    - DEBUG("ft1000_hw:ft1000_reset_asic called\n");
    + struct ft1000_device *ft1000dev = info->pFt1000Dev;
    + u16 tempword;

    - info->ASICResetNum++;
    + DEBUG("ft1000_hw:ft1000_reset_asic called\n");

    - // Let's use the register provided by the Magnemite ASIC to reset the
    - // ASIC and DSP.
    - ft1000_write_register(ft1000dev, (DSP_RESET_BIT | ASIC_RESET_BIT), FT1000_REG_RESET );
    + info->ASICResetNum++;

    - mdelay(1);
    + /* Let's use the register provided by the Magnemite ASIC to reset the
    + * ASIC and DSP.
    + */
    + ft1000_write_register(ft1000dev, (DSP_RESET_BIT | ASIC_RESET_BIT),
    + FT1000_REG_RESET);

    - // set watermark to -1 in order to not generate an interrrupt
    - ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_MAG_WATERMARK);
    + mdelay(1);

    - // clear interrupts
    - ft1000_read_register (ft1000dev, &tempword, FT1000_REG_SUP_ISR);
    - DEBUG("ft1000_hw: interrupt status register = 0x%x\n",tempword);
    - ft1000_write_register (ft1000dev, tempword, FT1000_REG_SUP_ISR);
    - ft1000_read_register (ft1000dev, &tempword, FT1000_REG_SUP_ISR);
    - DEBUG("ft1000_hw: interrupt status register = 0x%x\n",tempword);
    + /* set watermark to -1 in order to not generate an interrrupt */
    + ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_MAG_WATERMARK);

    + /* clear interrupts */
    + ft1000_read_register(ft1000dev, &tempword, FT1000_REG_SUP_ISR);
    + DEBUG("ft1000_hw: interrupt status register = 0x%x\n", tempword);
    + ft1000_write_register(ft1000dev, tempword, FT1000_REG_SUP_ISR);
    + ft1000_read_register(ft1000dev, &tempword, FT1000_REG_SUP_ISR);
    + DEBUG("ft1000_hw: interrupt status register = 0x%x\n", tempword);
    }


    --
    1.7.1


    \
     
     \ /
      Last update: 2011-03-10 11:59    [W:0.021 / U:119.860 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site