lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: rtl8192e: Remove some redundant code

Browse Source 
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Mike McCormack
2010-09-08 22:03:30 +09:00
committed by Greg Kroah-Hartman
parent f8942e07a3
commit 49e57f2fc0
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/rtl8192e/r819xE_phy.c
View File

@@ -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 rtl8192_QueryBBReg(struct net_device* dev, u32 dwRegAddr, u32 dwBitMask)
{ {
u32 Ret = 0, OriginalValue, BitShift; u32 OriginalValue, BitShift;
OriginalValue = read_nic_dword(dev, dwRegAddr); OriginalValue = read_nic_dword(dev, dwRegAddr);
BitShift = rtl8192_CalculateBitShift(dwBitMask); BitShift = rtl8192_CalculateBitShift(dwBitMask);
Ret = (OriginalValue & dwBitMask) >> BitShift; return (OriginalValue & dwBitMask) >> BitShift;
return Ret;
} }
/****************************************************************************** /******************************************************************************
*function: This function read register from RF chip *function: This function read register from RF chip
@@ -1812,7 +1810,6 @@ static u32 phy_FwRFSerialRead(
RF90_RADIO_PATH_E eRFPath, RF90_RADIO_PATH_E eRFPath,
u32 Offset ) u32 Offset )
{ {
u32 retValue = 0;
u32 Data = 0; u32 Data = 0;
u8 time = 0; u8 time = 0;
//DbgPrint("FW RF CTRL\n\r"); //DbgPrint("FW RF CTRL\n\r");
@@ -1855,10 +1852,7 @@ static u32 phy_FwRFSerialRead(
else else
return 0; return 0;
} }
retValue = read_nic_dword(dev, RF_DATA); return read_nic_dword(dev, RF_DATA);
return retValue;
} /* phy_FwRFSerialRead */ } /* 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 rtl8192_BBConfig(struct net_device* dev)
{ {
RT_STATUS rtStatus = RT_STATUS_SUCCESS;
rtl8192_InitBBRFRegDef(dev); rtl8192_InitBBRFRegDef(dev);
//config BB&RF. As hardCode based initialization has not been well //config BB&RF. As hardCode based initialization has not been well
//implemented, so use file first.FIXME:should implement it for hardcode? //implemented, so use file first.FIXME:should implement it for hardcode?
rtStatus = rtl8192_BB_Config_ParaFile(dev); return rtl8192_BB_Config_ParaFile(dev);
return rtStatus;
} }
/****************************************************************************** /******************************************************************************