From: Mahati Chamarthy Date: Sun, 21 Sep 2014 13:17:46 +0000 (+0530) Subject: Staging: rtl8192e: rtl8192e: Merges two lines of code and removes unused variable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a5310dc66906d2e7dc3ab6688541df1da491c578;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Staging: rtl8192e: rtl8192e: Merges two lines of code and removes unused variable This patch merges an assignment with an immediately following return of the assigned variable. It also removes a variable that becomes unused due to this transformation. The following Coccinelle semantic patch was used to make this transformation: @@ expression ret; identifier f; @@ -ret = +return f(...); -return ret; @@ identifier ret; type t; identifier c; @@ -t ret = c; ... when != ret when strict Signed-off-by: Mahati Chamarthy Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c index f0b150fcc69f..a1ecdff2b627 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c @@ -85,12 +85,9 @@ void PHY_SetRF8256Bandwidth(struct net_device *dev, bool PHY_RF8256_Config(struct net_device *dev) { struct r8192_priv *priv = rtllib_priv(dev); - bool rtStatus = true; priv->NumTotalRFPath = RTL819X_TOTAL_RF_PATH; - rtStatus = phy_RF8256_Config_ParaFile(dev); - - return rtStatus; + return phy_RF8256_Config_ParaFile(dev); } bool phy_RF8256_Config_ParaFile(struct net_device *dev)