Commit 3071c12e authored by Marek Belisko's avatar Marek Belisko Committed by Greg Kroah-Hartman

staging: ft1000: Fix coding style in ft1000_reset_card function.

Signed-off-by: default avatarMarek Belisko <marek.belisko@open-nandra.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 84a60963
...@@ -634,7 +634,7 @@ static void ft1000_reset_asic(struct net_device *dev) ...@@ -634,7 +634,7 @@ static void ft1000_reset_asic(struct net_device *dev)
// TRUE (card reset successful) // 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_info *info = netdev_priv(dev);
struct ft1000_device *ft1000dev = info->pFt1000Dev; struct ft1000_device *ft1000dev = info->pFt1000Dev;
...@@ -647,17 +647,17 @@ static int ft1000_reset_card (struct net_device *dev) ...@@ -647,17 +647,17 @@ static int ft1000_reset_card (struct net_device *dev)
info->CardReady = 0; info->CardReady = 0;
info->fProvComplete = 0; info->fProvComplete = 0;
// Make sure we free any memory reserve for provisioning /* Make sure we free any memory reserve for provisioning */
while (list_empty(&info->prov_list) == 0) { while (list_empty(&info->prov_list) == 0) {
DEBUG("ft1000_hw:ft1000_reset_card:deleting provisioning record\n"); DEBUG("ft1000_reset_card:deleting provisioning record\n");
ptr = list_entry(info->prov_list.next, struct prov_record, list); ptr =
list_entry(info->prov_list.next, struct prov_record, list);
list_del(&ptr->list); list_del(&ptr->list);
kfree(ptr->pprov_data); kfree(ptr->pprov_data);
kfree(ptr); kfree(ptr);
} }
DEBUG("ft1000_hw:ft1000_reset_card: reset asic\n"); DEBUG("ft1000_hw:ft1000_reset_card: reset asic\n");
//reset ASIC
ft1000_reset_asic(dev); ft1000_reset_asic(dev);
info->DSPResetNum++; info->DSPResetNum++;
...@@ -667,21 +667,20 @@ static int ft1000_reset_card (struct net_device *dev) ...@@ -667,21 +667,20 @@ static int ft1000_reset_card (struct net_device *dev)
DEBUG("dsp reload successful\n"); DEBUG("dsp reload successful\n");
mdelay(10); mdelay(10);
// Initialize DSP heartbeat area to ho /* Initialize DSP heartbeat area */
ft1000_write_dpram16(ft1000dev, FT1000_MAG_HI_HO, ho_mag, FT1000_MAG_HI_HO_INDX); ft1000_write_dpram16(ft1000dev, FT1000_MAG_HI_HO, ho_mag,
ft1000_read_dpram16(ft1000dev, FT1000_MAG_HI_HO, (u8 *)&tempword, FT1000_MAG_HI_HO_INDX); 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); DEBUG("ft1000_hw:ft1000_reset_card:hi_ho value = 0x%x\n", tempword);
info->CardReady = 1; info->CardReady = 1;
info->fCondResetPend = 0; info->fCondResetPend = 0;
return TRUE;
return TRUE;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment