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

    diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    index 188a8e3..71c7c5d 100644
    --- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
    @@ -634,54 +634,53 @@ static void ft1000_reset_asic(struct net_device *dev)
    // TRUE (card reset successful)
    //
    //---------------------------------------------------------------------------
    -static int ft1000_reset_card (struct net_device *dev)
    +static int ft1000_reset_card(struct net_device *dev)
    {
    struct ft1000_info *info = netdev_priv(dev);
    - struct ft1000_device *ft1000dev = info->pFt1000Dev;
    - u16 tempword;
    + struct ft1000_device *ft1000dev = info->pFt1000Dev;
    + u16 tempword;
    struct prov_record *ptr;

    - DEBUG("ft1000_hw:ft1000_reset_card called.....\n");
    -
    - info->fCondResetPend = 1;
    - info->CardReady = 0;
    - info->fProvComplete = 0;
    + DEBUG("ft1000_hw:ft1000_reset_card called.....\n");

    - // Make sure we free any memory reserve for provisioning
    - while (list_empty(&info->prov_list) == 0) {
    - DEBUG("ft1000_hw:ft1000_reset_card:deleting provisioning record\n");
    - ptr = list_entry(info->prov_list.next, struct prov_record, list);
    - list_del(&ptr->list);
    - kfree(ptr->pprov_data);
    - kfree(ptr);
    - }
    + info->fCondResetPend = 1;
    + info->CardReady = 0;
    + info->fProvComplete = 0;

    - DEBUG("ft1000_hw:ft1000_reset_card: reset asic\n");
    - //reset ASIC
    - ft1000_reset_asic(dev);
    -
    - info->DSPResetNum++;
    + /* Make sure we free any memory reserve for provisioning */
    + while (list_empty(&info->prov_list) == 0) {
    + DEBUG("ft1000_reset_card:deleting provisioning record\n");
    + ptr =
    + list_entry(info->prov_list.next, struct prov_record, list);
    + list_del(&ptr->list);
    + kfree(ptr->pprov_data);
    + kfree(ptr);
    + }

    - DEBUG("ft1000_hw:ft1000_reset_card: call dsp_reload\n");
    - dsp_reload(ft1000dev);
    + DEBUG("ft1000_hw:ft1000_reset_card: reset asic\n");
    + ft1000_reset_asic(dev);

    - DEBUG("dsp reload successful\n");
    + info->DSPResetNum++;

    + DEBUG("ft1000_hw:ft1000_reset_card: call dsp_reload\n");
    + dsp_reload(ft1000dev);

    - mdelay(10);
    + DEBUG("dsp reload successful\n");

    - // Initialize DSP heartbeat area to ho
    - ft1000_write_dpram16(ft1000dev, FT1000_MAG_HI_HO, ho_mag, FT1000_MAG_HI_HO_INDX);
    - ft1000_read_dpram16(ft1000dev, FT1000_MAG_HI_HO, (u8 *)&tempword, FT1000_MAG_HI_HO_INDX);
    - DEBUG("ft1000_hw:ft1000_reset_card:hi_ho value = 0x%x\n", tempword);
    + mdelay(10);

    + /* Initialize DSP heartbeat area */
    + ft1000_write_dpram16(ft1000dev, FT1000_MAG_HI_HO, ho_mag,
    + FT1000_MAG_HI_HO_INDX);
    + ft1000_read_dpram16(ft1000dev, FT1000_MAG_HI_HO, (u8 *) &tempword,
    + FT1000_MAG_HI_HO_INDX);
    + DEBUG("ft1000_hw:ft1000_reset_card:hi_ho value = 0x%x\n", tempword);

    + info->CardReady = 1;

    - info->CardReady = 1;
    -
    - info->fCondResetPend = 0;
    - return TRUE;
    + info->fCondResetPend = 0;

    + return TRUE;
    }


    --
    1.7.1


    \
     
     \ /
      Last update: 2011-03-07 09:25    [W:0.035 / U:62.768 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site