Commit d8e186ce authored by Mahati Chamarthy's avatar Mahati Chamarthy Committed by Greg Kroah-Hartman

Staging: rtl8192e: rtl8192e: Merge two lines and remove unused variable

This patch merges an assignment with an immediately following return of
the assigned variable. It also removes variables that became unused due to this transformation.
The following Coccinelle semantic patch was used to make this transformation:

@r@
identifier ret;
identifier f;
@@

-ret =
+return
     f(...);
-return ret;

@@
identifier r.ret;
expression e1;
type t;
@@

(
-t ret = e1;
|
-t ret;
)
 ... when != ret
     when strict
Signed-off-by: default avatarMahati Chamarthy <mahati.chamarthy@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bfcc6be5
...@@ -286,7 +286,6 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, enum rf90_radio_path eRFPath, ...@@ -286,7 +286,6 @@ u32 rtl8192_phy_QueryRFReg(struct net_device *dev, enum rf90_radio_path eRFPath,
static u32 phy_FwRFSerialRead(struct net_device *dev, static u32 phy_FwRFSerialRead(struct net_device *dev,
enum rf90_radio_path eRFPath, u32 Offset) enum rf90_radio_path eRFPath, u32 Offset)
{ {
u32 retValue = 0;
u32 Data = 0; u32 Data = 0;
u8 time = 0; u8 time = 0;
...@@ -306,9 +305,7 @@ static u32 phy_FwRFSerialRead(struct net_device *dev, ...@@ -306,9 +305,7 @@ static u32 phy_FwRFSerialRead(struct net_device *dev,
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 */
...@@ -606,11 +603,8 @@ static bool rtl8192_BB_Config_ParaFile(struct net_device *dev) ...@@ -606,11 +603,8 @@ static bool rtl8192_BB_Config_ParaFile(struct net_device *dev)
} }
bool rtl8192_BBConfig(struct net_device *dev) bool rtl8192_BBConfig(struct net_device *dev)
{ {
bool rtStatus = true;
rtl8192_InitBBRFRegDef(dev); rtl8192_InitBBRFRegDef(dev);
rtStatus = rtl8192_BB_Config_ParaFile(dev); return rtl8192_BB_Config_ParaFile(dev);
return rtStatus;
} }
void rtl8192_phy_getTxPower(struct net_device *dev) void rtl8192_phy_getTxPower(struct net_device *dev)
......
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