[PATCH 0/2] staging: rtlwifi: Remove return variable.

[PATCH 0/2] staging: rtlwifi: Remove return variable.

[Sanjana Sanikommu]

This patch series does the following in phy.c.
1. Remove return variable using ret.cocci
2. Remove unnecessary variable

Sanjana Sanikommu (2):
  staging: rtlwifi: Remove return variable
  staging: rtlwifi: Remove unused variable.

 drivers/staging/rtlwifi/rtl8822be/phy.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

-- 
2.17.1

[PATCH 1/2] staging: rtlwifi: Remove return variable

[Sanjana Sanikommu]

Remove return variable and return "return" value directly. Issue found by
Coccinelle using ret.cocci.

Signed-off-by: Sanjana Sanikommu <sanjana99reddy99@gmail.com>
---
 drivers/staging/rtlwifi/rtl8822be/phy.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/rtlwifi/rtl8822be/phy.c b/drivers/staging/rtlwifi/rtl8822be/phy.c
index 048904d783fc..aed315143cbb 100644
--- a/drivers/staging/rtlwifi/rtl8822be/phy.c
+++ b/drivers/staging/rtlwifi/rtl8822be/phy.c
@@ -219,10 +219,8 @@ bool rtl8822be_halmac_cb_init_bb_rf_register(struct rtl_priv *rtlpriv)
 	txpath = RF_MASK_A | RF_MASK_B;
 	rxpath = RF_MASK_A | RF_MASK_B;
 	tx2path = false;
-	ret = rtlpriv->phydm.ops->phydm_trx_mode(rtlpriv, txpath, rxpath,
+	return rtlpriv->phydm.ops->phydm_trx_mode(rtlpriv, txpath, rxpath,
 						 tx2path);
-
-	return ret;
 }
 
 static void _rtl8822be_phy_init_tx_power_by_rate(struct ieee80211_hw *hw)
@@ -1580,11 +1578,9 @@ _rtl8822be_phy_get_txpower_by_rate(struct ieee80211_hw *hw, u8 band, u8 path,
 	else
 		tx_num = RF_1TX;
 
-	tx_pwr_diff = (char)(rtlphy->tx_power_by_rate_offset[band][path][tx_num]
+	return (char)(rtlphy->tx_power_by_rate_offset[band][path][tx_num]
 							    [rate] &
 			     0xff);
-
-	return tx_pwr_diff;
 }
 
 u8 rtl8822be_get_txpower_index(struct ieee80211_hw *hw, u8 path, u8 rate,
@@ -1858,8 +1854,7 @@ static long _rtl8822be_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
 		offset = -8;
 		break;
 	}
-	pwrout_dbm = txpwridx / 2 + offset;
-	return pwrout_dbm;
+	return txpwridx / 2 + offset;
 }
 
 void rtl8822be_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
@@ -2218,6 +2213,5 @@ bool rtl8822be_phy_set_rf_power_state(struct ieee80211_hw *hw,
 
 	if (rfpwr_state == ppsc->rfpwr_state)
 		return bresult;
-	bresult = _rtl8822be_phy_set_rf_power_state(hw, rfpwr_state);
-	return bresult;
+	return _rtl8822be_phy_set_rf_power_state(hw, rfpwr_state);
 }
-- 
2.17.1

[PATCH 2/2] staging: rtlwifi: Remove unused variable.

[Sanjana Sanikommu]

Remove unused variable. This variable is
created unnecessarily for return type whose
use is removed using ret.cocci.

Signed-off-by: Sanjana Sanikommu <sanjana99reddy99@gmail.com>
---
 drivers/staging/rtlwifi/rtl8822be/phy.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/rtlwifi/rtl8822be/phy.c b/drivers/staging/rtlwifi/rtl8822be/phy.c
index aed315143cbb..ececfed7b35a 100644
--- a/drivers/staging/rtlwifi/rtl8822be/phy.c
+++ b/drivers/staging/rtlwifi/rtl8822be/phy.c
@@ -1840,7 +1840,6 @@ static long _rtl8822be_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
 					    u8 txpwridx)
 {
 	long offset;
-	long pwrout_dbm;
 
 	switch (wirelessmode) {
 	case WIRELESS_MODE_B:
-- 
2.17.1

Re: [PATCH 2/2] staging: rtlwifi: Remove unused variable.

[Greg KH]

On Thu, Mar 28, 2019 at 08:40:07PM +0530, Sanjana Sanikommu wrote:
> Remove unused variable. This variable is
> created unnecessarily for return type whose
> use is removed using ret.cocci.
> 
> Signed-off-by: Sanjana Sanikommu <sanjana99reddy99@gmail.com>
> ---
>  drivers/staging/rtlwifi/rtl8822be/phy.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/staging/rtlwifi/rtl8822be/phy.c b/drivers/staging/rtlwifi/rtl8822be/phy.c
> index aed315143cbb..ececfed7b35a 100644
> --- a/drivers/staging/rtlwifi/rtl8822be/phy.c
> +++ b/drivers/staging/rtlwifi/rtl8822be/phy.c
> @@ -1840,7 +1840,6 @@ static long _rtl8822be_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
>  					    u8 txpwridx)
>  {
>  	long offset;
> -	long pwrout_dbm;

Did you just cause this warning to happen with patch 1/2?  That's not
ok, please put this together with that patch, you can not have any
commit break the build, or add new build warnings.

thanks,

greg k-h

Re: [PATCH 2/2] staging: rtlwifi: Remove unused variable.

[Sanjana Sanikommu]

[-- Attachment #1: Type: text/plain, Size: 1194 bytes --]

On Thu, 28 Mar 2019, 21:38 Greg KH, <gregkh@linuxfoundation.org> wrote:

> On Thu, Mar 28, 2019 at 08:40:07PM +0530, Sanjana Sanikommu wrote:
> > Remove unused variable. This variable is
> > created unnecessarily for return type whose
> > use is removed using ret.cocci.
> >
> > Signed-off-by: Sanjana Sanikommu <sanjana99reddy99@gmail.com>
> > ---
> >  drivers/staging/rtlwifi/rtl8822be/phy.c | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/staging/rtlwifi/rtl8822be/phy.c
> b/drivers/staging/rtlwifi/rtl8822be/phy.c
> > index aed315143cbb..ececfed7b35a 100644
> > --- a/drivers/staging/rtlwifi/rtl8822be/phy.c
> > +++ b/drivers/staging/rtlwifi/rtl8822be/phy.c
> > @@ -1840,7 +1840,6 @@ static long _rtl8822be_phy_txpwr_idx_to_dbm(struct
> ieee80211_hw *hw,
> >                                           u8 txpwridx)
> >  {
> >       long offset;
> > -     long pwrout_dbm;
>
> Did you just cause this warning to happen with patch 1/2?  That's not
> ok, please put this together with that patch, you can not have any
> commit break the build, or add new build warnings.
>

    I will put them together in one patch and send as v2
     Sanjana

>
> thanks,
>
> greg k-h
>

[-- Attachment #2: Type: text/html, Size: 2004 bytes --]

[PATCH v2] staging: rtlwifi: Remove return variable.

[Sanjana Sanikommu]

Remove return variable and return "return" value directly. Issue found by
Coccinelle using ret.cocci.

Signed-off-by: Sanjana Sanikommu <sanjana99reddy99@gmail.com>
---
Changes in v2:
Merge 2 patches to one i.e remove unnecessary
variable is merged to [PATCH 1/2].
Remove patch series.
 drivers/staging/rtlwifi/rtl8822be/phy.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/rtlwifi/rtl8822be/phy.c b/drivers/staging/rtlwifi/rtl8822be/phy.c
index 048904d783fc..ececfed7b35a 100644
--- a/drivers/staging/rtlwifi/rtl8822be/phy.c
+++ b/drivers/staging/rtlwifi/rtl8822be/phy.c
@@ -219,10 +219,8 @@ bool rtl8822be_halmac_cb_init_bb_rf_register(struct rtl_priv *rtlpriv)
 	txpath = RF_MASK_A | RF_MASK_B;
 	rxpath = RF_MASK_A | RF_MASK_B;
 	tx2path = false;
-	ret = rtlpriv->phydm.ops->phydm_trx_mode(rtlpriv, txpath, rxpath,
+	return rtlpriv->phydm.ops->phydm_trx_mode(rtlpriv, txpath, rxpath,
 						 tx2path);
-
-	return ret;
 }
 
 static void _rtl8822be_phy_init_tx_power_by_rate(struct ieee80211_hw *hw)
@@ -1580,11 +1578,9 @@ _rtl8822be_phy_get_txpower_by_rate(struct ieee80211_hw *hw, u8 band, u8 path,
 	else
 		tx_num = RF_1TX;
 
-	tx_pwr_diff = (char)(rtlphy->tx_power_by_rate_offset[band][path][tx_num]
+	return (char)(rtlphy->tx_power_by_rate_offset[band][path][tx_num]
 							    [rate] &
 			     0xff);
-
-	return tx_pwr_diff;
 }
 
 u8 rtl8822be_get_txpower_index(struct ieee80211_hw *hw, u8 path, u8 rate,
@@ -1844,7 +1840,6 @@ static long _rtl8822be_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
 					    u8 txpwridx)
 {
 	long offset;
-	long pwrout_dbm;
 
 	switch (wirelessmode) {
 	case WIRELESS_MODE_B:
@@ -1858,8 +1853,7 @@ static long _rtl8822be_phy_txpwr_idx_to_dbm(struct ieee80211_hw *hw,
 		offset = -8;
 		break;
 	}
-	pwrout_dbm = txpwridx / 2 + offset;
-	return pwrout_dbm;
+	return txpwridx / 2 + offset;
 }
 
 void rtl8822be_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation)
@@ -2218,6 +2212,5 @@ bool rtl8822be_phy_set_rf_power_state(struct ieee80211_hw *hw,
 
 	if (rfpwr_state == ppsc->rfpwr_state)
 		return bresult;
-	bresult = _rtl8822be_phy_set_rf_power_state(hw, rfpwr_state);
-	return bresult;
+	return _rtl8822be_phy_set_rf_power_state(hw, rfpwr_state);
 }
-- 
2.17.1