aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/ft1000
diff options
context:
space:
mode:
authorMarek Belisko <marek.belisko@open-nandra.com>2011-03-10 11:51:19 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-14 11:51:16 -0700
commit3071c12ea799db6d46ccb8ce42980e39c6e3447e (patch)
tree3752a10ac390638f9f7f25ec508228bf9a37b7a4 /drivers/staging/ft1000
parent84a60963e259263446c81776067957cac52afbfb (diff)
downloadkernel_samsung_smdk4412-3071c12ea799db6d46ccb8ce42980e39c6e3447e.tar.gz
kernel_samsung_smdk4412-3071c12ea799db6d46ccb8ce42980e39c6e3447e.tar.bz2
kernel_samsung_smdk4412-3071c12ea799db6d46ccb8ce42980e39c6e3447e.zip
staging: ft1000: Fix coding style in ft1000_reset_card function.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/ft1000')
-rw-r--r--drivers/staging/ft1000/ft1000-usb/ft1000_hw.c65
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 188a8e3af2b..71c7c5d92a6 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;
}