diff options
| author | Mike McCormack <mikem@ring3k.org> | 2010-09-08 22:03:30 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-08 21:21:20 -0700 |
| commit | 49e57f2fc0bc4ab2b83c7446ad3a43b3262f1d7a (patch) | |
| tree | 474fbf1f7cedf4ed7fb08ba4de2fc990fa745a9c /drivers/staging/rtl8192e | |
| parent | f8942e07a3db9d82e8fb11d3d494876b8bae9ff9 (diff) | |
| download | op-kernel-dev-49e57f2fc0bc4ab2b83c7446ad3a43b3262f1d7a.zip op-kernel-dev-49e57f2fc0bc4ab2b83c7446ad3a43b3262f1d7a.tar.gz | |
Staging: rtl8192e: Remove some redundant code
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192e')
| -rw-r--r-- | drivers/staging/rtl8192e/r819xE_phy.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/staging/rtl8192e/r819xE_phy.c b/drivers/staging/rtl8192e/r819xE_phy.c index 48e27bb..e64f83d 100644 --- a/drivers/staging/rtl8192e/r819xE_phy.c +++ b/drivers/staging/rtl8192e/r819xE_phy.c @@ -1489,13 +1489,11 @@ void rtl8192_setBBreg(struct net_device* dev, u32 dwRegAddr, u32 dwBitMask, u32 * ****************************************************************************/ u32 rtl8192_QueryBBReg(struct net_device* dev, u32 dwRegAddr, u32 dwBitMask) { - u32 Ret = 0, OriginalValue, BitShift; + u32 OriginalValue, BitShift; OriginalValue = read_nic_dword(dev, dwRegAddr); BitShift = rtl8192_CalculateBitShift(dwBitMask); - Ret = (OriginalValue & dwBitMask) >> BitShift; - - return Ret; + return (OriginalValue & dwBitMask) >> BitShift; } /****************************************************************************** *function: This function read register from RF chip @@ -1812,7 +1810,6 @@ static u32 phy_FwRFSerialRead( RF90_RADIO_PATH_E eRFPath, u32 Offset ) { - u32 retValue = 0; u32 Data = 0; u8 time = 0; //DbgPrint("FW RF CTRL\n\r"); @@ -1855,10 +1852,7 @@ static u32 phy_FwRFSerialRead( else return 0; } - retValue = read_nic_dword(dev, RF_DATA); - - return retValue; - + return read_nic_dword(dev, RF_DATA); } /* phy_FwRFSerialRead */ /****************************************************************************** @@ -2315,12 +2309,10 @@ static RT_STATUS rtl8192_BB_Config_ParaFile(struct net_device* dev) * ***************************************************************************/ RT_STATUS rtl8192_BBConfig(struct net_device* dev) { - RT_STATUS rtStatus = RT_STATUS_SUCCESS; rtl8192_InitBBRFRegDef(dev); //config BB&RF. As hardCode based initialization has not been well //implemented, so use file first.FIXME:should implement it for hardcode? - rtStatus = rtl8192_BB_Config_ParaFile(dev); - return rtStatus; + return rtl8192_BB_Config_ParaFile(dev); } /****************************************************************************** |
