| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1299486086-7325-4-git-send-email-marek.belisko@open-nandra.com>
Date: Mon, 7 Mar 2011 09:21:08 +0100
From: Marek Belisko <marek.belisko@...n-nandra.com>
To: gregkh@...e.de
Cc: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
Marek Belisko <marek.belisko@...n-nandra.com>
Subject: [PATCH 03/21] staging: ft1000: Fix coding style in dsp_reload function.
Signed-off-by: Marek Belisko <marek.belisko@...n-nandra.com>
---
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 57 +++++++++++++------------
1 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index ded13f2..53073d5 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -534,49 +534,52 @@ void card_send_command(struct ft1000_device *ft1000dev, void *ptempbuffer,
//-----------------------------------------------------------------------
int dsp_reload(struct ft1000_device *ft1000dev)
{
- u16 status;
- u16 tempword;
- u32 templong;
+ u16 status;
+ u16 tempword;
+ u32 templong;
struct ft1000_info *pft1000info;
- pft1000info = netdev_priv(ft1000dev->net);
+ pft1000info = netdev_priv(ft1000dev->net);
- pft1000info->CardReady = 0;
+ pft1000info->CardReady = 0;
- // Program Interrupt Mask register
- status = ft1000_write_register (ft1000dev, 0xffff, FT1000_REG_SUP_IMASK);
+ /* Program Interrupt Mask register */
+ status = ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_SUP_IMASK);
- status = ft1000_read_register (ft1000dev, &tempword, FT1000_REG_RESET);
- tempword |= ASIC_RESET_BIT;
- status = ft1000_write_register (ft1000dev, tempword, FT1000_REG_RESET);
- msleep(1000);
- status = ft1000_read_register (ft1000dev, &tempword, FT1000_REG_RESET);
- DEBUG("Reset Register = 0x%x\n", tempword);
+ status = ft1000_read_register(ft1000dev, &tempword, FT1000_REG_RESET);
+ tempword |= ASIC_RESET_BIT;
+ status = ft1000_write_register(ft1000dev, tempword, FT1000_REG_RESET);
+ msleep(1000);
+ status = ft1000_read_register(ft1000dev, &tempword, FT1000_REG_RESET);
+ DEBUG("Reset Register = 0x%x\n", tempword);
- // Toggle DSP reset
- card_reset_dsp (ft1000dev, 1);
- msleep(1000);
- card_reset_dsp (ft1000dev, 0);
- msleep(1000);
+ /* Toggle DSP reset */
+ card_reset_dsp(ft1000dev, 1);
+ msleep(1000);
+ card_reset_dsp(ft1000dev, 0);
+ msleep(1000);
- status = ft1000_write_register (ft1000dev, HOST_INTF_BE, FT1000_REG_SUP_CTRL);
+ status =
+ ft1000_write_register(ft1000dev, HOST_INTF_BE, FT1000_REG_SUP_CTRL);
- // Let's check for FEFE
- status = ft1000_read_dpram32 (ft1000dev, FT1000_MAG_DPRAM_FEFE_INDX, (u8 *)&templong, 4);
- DEBUG("templong (fefe) = 0x%8x\n", templong);
+ /* Let's check for FEFE */
+ status =
+ ft1000_read_dpram32(ft1000dev, FT1000_MAG_DPRAM_FEFE_INDX,
+ (u8 *) &templong, 4);
+ DEBUG("templong (fefe) = 0x%8x\n", templong);
- // call codeloader
- status = scram_dnldr(ft1000dev, pFileStart, FileLength);
+ /* call codeloader */
+ status = scram_dnldr(ft1000dev, pFileStart, FileLength);
if (status != STATUS_SUCCESS)
return -EIO;
- msleep(1000);
+ msleep(1000);
- DEBUG("dsp_reload returned\n");
- return 0;
+ DEBUG("dsp_reload returned\n");
+ return 0;
}
//---------------------------------------------------------------------------
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists