From 1bba5b2110b2bcef2705cb0d975182c422654383 Mon Sep 17 00:00:00 2001 From: Payal Kshirsagar Date: Sat, 30 Mar 2019 18:31:11 +0530 Subject: [PATCH] staging: rtl8723bs: Compress two lines into one line Challenge suggested by coccinelle. Return value directly without saving it in a variable and remove that variable. Signed-off-by: Payal Kshirsagar Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c index 0fd7a9ae40cb..4f2ad54af398 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c @@ -58,7 +58,7 @@ static u32 phy_CalculateBitShift(u32 BitMask) */ u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask) { - u32 ReturnValue = 0, OriginalValue, BitShift; + u32 OriginalValue, BitShift; #if (DISABLE_BB_RF == 1) return 0; @@ -68,9 +68,8 @@ u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask) OriginalValue = rtw_read32(Adapter, RegAddr); BitShift = phy_CalculateBitShift(BitMask); - ReturnValue = (OriginalValue & BitMask) >> BitShift; - return ReturnValue; + return (OriginalValue & BitMask) >> BitShift; } @@ -284,18 +283,16 @@ u32 PHY_QueryRFReg_8723B( u32 BitMask ) { - u32 Original_Value, Readback_Value, BitShift; + u32 Original_Value, BitShift; #if (DISABLE_BB_RF == 1) return 0; #endif Original_Value = phy_RFSerialRead_8723B(Adapter, eRFPath, RegAddr); - BitShift = phy_CalculateBitShift(BitMask); - Readback_Value = (Original_Value & BitMask) >> BitShift; - return Readback_Value; + return (Original_Value & BitMask) >> BitShift; } /** -- 2.45.2