Skip to contentSkip to conversation

staging: rtlwifi: Compress two lines

PATCH Superseded Payal Kshirsagar 2 participants 15 messages Mar 31, 2019 Staging

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover staging: rtlwifi: Compress two lines

This patchset:
-Compresses two lines into one line that is to return a value sometimes it need not be stored in temporary return variable and removes unnecessary variables.

Payal Kshirsagar (7):
staging: rtlwifi: Compress two lines into one line
staging: rtlwifi: phydm: phydm.c: Compress two lines into one line
staging: rtlwifi: phydm: phydm_rainfo.c: Compress two lines into one
line
staging: rtlwifi: btcoexist: Compress two lines into one line
staging: rtlwifi: halmac: halmac_88xx: Compress two lines into one
line
staging: rtlwifi: halmac: Compress two lines into one line
staging: rtlwifi: halmac: halmac_api.c: Compress two lines into one
line

 drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c         |  5 +----
 .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c    |  5 +----
 .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c     |  5 +----
 drivers/staging/rtlwifi/halmac/halmac_api.c              |  7 ++-----
 drivers/staging/rtlwifi/phydm/phydm.c                    | 16 ++++------------
 drivers/staging/rtlwifi/phydm/phydm_rainfo.c             |  5 +----
 drivers/staging/rtlwifi/rtl8822be/phy.c                  | 12 ++++--------
 7 files changed, 14 insertions(+), 41 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/7 staging: rtlwifi: Compress two lines into one line

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/rtl8822be/phy.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/staging/rtlwifi/rtl8822be/phy.c +4 -8
index 048904d..4f69776 100644
@@ -1566,13 +1566,12 @@ _rtl8822be_phy_get_txpower_by_rate(struct ieee80211_hw *hw, u8 band, u8 path,
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
 	struct rtl_phy *rtlphy = &rtlpriv->phy;
 	u8 tx_num;
-	char tx_pwr_diff = 0;
 
 	if (band != BAND_ON_2_4G && band != BAND_ON_5G)
-		return tx_pwr_diff;
+		return 0;
 
 	if (path > RF90_PATH_B)
-		return tx_pwr_diff;
+		return 0;
 
 	if ((rate >= DESC_RATEMCS8 && rate <= DESC_RATEMCS15) ||
 	    (rate >= DESC_RATEVHT2SS_MCS0 && rate <= DESC_RATEVHT2SS_MCS9))
@@ -1580,11 +1579,8 @@ _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]
-							    [rate] &
-			     0xff);
-
-	return tx_pwr_diff;
+	return (char)(rtlphy->tx_power_by_rate_offset[band][path][tx_num]
+						     [rate] & 0xff);
 }
 
 u8 rtl8822be_get_txpower_index(struct ieee80211_hw *hw, u8 path, u8 rate,
Signature · 1 line
2.7.4
#2 lore raw

PATCH 2/7 staging: rtlwifi: phydm: phydm.c: Compress two lines into one line

In reply to Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variables.

---
 drivers/staging/rtlwifi/phydm/phydm.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/staging/rtlwifi/phydm/phydm.c +4 -12
index 473eeb6..09dbb96 100644
@@ -49,7 +49,7 @@ static void odm_update_power_training_state(struct phy_dm_struct *dm);
 /*Y = 10*log(X)*/
 s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 decimal_bit)
 {
-	s32 Y, integer = 0, decimal = 0;
+	s32 integer = 0, decimal = 0;
 	u32 i;
 
 	if (X == 0)
@@ -66,9 +66,7 @@ s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 decimal_bit)
 		}
 	}
 
-	Y = 3 * (integer - decimal_bit) + decimal; /* 10*log(x)=3*log2(x), */
-
-	return Y;
+	return 3 * (integer - decimal_bit) + decimal; /* 10*log(x)=3*log2(x), */;
 }
 
 s32 odm_sign_conversion(s32 value, u32 total_bit)
@@ -1240,7 +1238,6 @@ u32 odm_convert_to_db(u32 value)
 {
 	u8 i;
 	u8 j;
-	u32 dB;
 
 	value = value & 0xFFFF;
 
@@ -1257,16 +1254,13 @@ u32 odm_convert_to_db(u32 value)
 			break;
 	}
 
-	dB = (i << 3) + j + 1;
-
-	return dB;
+	return (i << 3) + j + 1;
 }
 
 u32 odm_convert_to_linear(u32 value)
 {
 	u8 i;
 	u8 j;
-	u32 linear;
 
 	/* 1dB~96dB */
 
@@ -1275,9 +1269,7 @@ u32 odm_convert_to_linear(u32 value)
 	i = (u8)((value - 1) >> 3);
 	j = (u8)(value - 1) - (i << 3);
 
-	linear = db_invert_table[i][j];
-
-	return linear;
+	return db_invert_table[i][j];
 }
 
 /*
Signature · 1 line
2.7.4
#5 lore raw

PATCH 3/7 staging: rtlwifi: phydm: phydm_rainfo.c: Compress two lines into one line

In reply to Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtlwifi/phydm/phydm_rainfo.c +1 -4
index ed740a9..0f24bb2 100644
@@ -926,8 +926,6 @@ void odm_refresh_basic_rate_mask(void *dm_void) {}
 
 u8 phydm_rate_order_compute(void *dm_void, u8 rate_idx)
 {
-	u8 rate_order = 0;
-
 	if (rate_idx >= ODM_RATEVHTSS4MCS0) {
 		rate_idx -= ODM_RATEVHTSS4MCS0;
 		/**/
@@ -950,9 +948,8 @@ u8 phydm_rate_order_compute(void *dm_void, u8 rate_idx)
 		rate_idx -= ODM_RATEMCS8;
 		/**/
 	}
-	rate_order = rate_idx;
 
-	return rate_order;
+	return rate_idx;
 }
 
 static void phydm_ra_common_info_update(void *dm_void)
Signature · 1 line
2.7.4
#6 lore raw

PATCH 4/7 staging: rtlwifi: btcoexist: Compress two lines into one line

In reply to Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c +1 -4
index b519d18..dbb11c2 100644
@@ -456,7 +456,6 @@ static u32 halbtc_get_wifi_link_status(struct btc_coexist *btcoexist)
 	 */
 	struct rtl_priv *rtlpriv = btcoexist->adapter;
 	struct rtl_mac *mac = rtl_mac(rtlpriv);
-	u32 ret_val = 0;
 	u32 port_connected_status = 0, num_of_connected_port = 0;
 
 	if (mac->opmode == NL80211_IFTYPE_STATION &&
@@ -471,9 +470,7 @@ static u32 halbtc_get_wifi_link_status(struct btc_coexist *btcoexist)
 	}
 	/* TODO: P2P Connected Status */
 
-	ret_val = (num_of_connected_port << 16) | port_connected_status;
-
-	return ret_val;
+	return (num_of_connected_port << 16) | port_connected_status;
 }
 
 static bool halbtc_get(void *void_btcoexist, u8 get_type, void *out_buf)
Signature · 1 line
2.7.4
#7 lore raw

PATCH 5/7 staging: rtlwifi: halmac: halmac_88xx: Compress two lines into one line

In reply to Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c +1 -4
index 979821e..5811787 100644
@@ -165,7 +165,6 @@ halmac_cfg_rx_aggregation_88xx_sdio(struct halmac_adapter *halmac_adapter,
 u8 halmac_reg_read_8_sdio_88xx(struct halmac_adapter *halmac_adapter,
 			       u32 halmac_offset)
 {
-	u8 value8;
 	void *driver_adapter = NULL;
 	struct halmac_api *halmac_api;
 	enum halmac_ret_status status = HALMAC_RET_SUCCESS;
@@ -190,9 +189,7 @@ u8 halmac_reg_read_8_sdio_88xx(struct halmac_adapter *halmac_adapter,
 		return status;
 	}
 
-	value8 = PLATFORM_SDIO_CMD52_READ(driver_adapter, halmac_offset);
-
-	return value8;
+	return PLATFORM_SDIO_CMD52_READ(driver_adapter, halmac_offset);
 }
 
 /**
Signature · 1 line
2.7.4
#8 lore raw

PATCH 6/7 staging: rtlwifi: halmac: Compress two lines into one line

In reply to Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c +1 -4
index 0bd6abd..0ae0d02 100644
@@ -192,7 +192,6 @@ halmac_cfg_rx_aggregation_88xx_usb(struct halmac_adapter *halmac_adapter,
 u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter *halmac_adapter,
 			      u32 halmac_offset)
 {
-	u8 value8;
 	void *driver_adapter = NULL;
 	struct halmac_api *halmac_api;
 
@@ -205,9 +204,7 @@ u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter *halmac_adapter,
 	driver_adapter = halmac_adapter->driver_adapter;
 	halmac_api = (struct halmac_api *)halmac_adapter->halmac_api;
 
-	value8 = PLATFORM_REG_READ_8(driver_adapter, halmac_offset);
-
-	return value8;
+	return PLATFORM_REG_READ_8(driver_adapter, halmac_offset);
 }
 
 /**
Signature · 1 line
2.7.4
#14 lore raw

PATCH 7/7 staging: rtlwifi: halmac: Compress two lines into one line

In reply to Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/halmac/halmac_api.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/staging/rtlwifi/halmac/halmac_api.c +2 -5
index e75eb42..be75731 100644
@@ -133,7 +133,6 @@ platform_reg_read_8_sdio(void *driver_adapter,
 			 struct halmac_platform_api *halmac_platform_api,
 			 u32 offset)
 {
-	u8 value8;
 	u32 halmac_offset = offset;
 	enum halmac_ret_status status = HALMAC_RET_SUCCESS;
 
@@ -146,10 +145,8 @@ platform_reg_read_8_sdio(void *driver_adapter,
 		return status;
 	}
 
-	value8 = halmac_platform_api->SDIO_CMD52_READ(driver_adapter,
-						      halmac_offset);
-
-	return value8;
+	return halmac_platform_api->SDIO_CMD52_READ(driver_adapter,
+						    halmac_offset);
 }
 
 static enum halmac_ret_status
Signature · 1 line
2.7.4
#9 lore raw

Re: [Outreachy kernel] [PATCH 6/7] staging: rtlwifi: halmac: Compress two lines into one line

In reply to Payal Kshirsagar

6 and 7 have the same subject line.

julia

Quoted 41 lines · Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c +1 -5
index 0bd6abd..0ae0d02 100644
@@ -192,7 +192,6 @@ halmac_cfg_rx_aggregation_88xx_usb(struct halmac_adapter *halmac_adapter,
 u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter *halmac_adapter,
 			      u32 halmac_offset)
 {
-	u8 value8;
 	void *driver_adapter = NULL;
 	struct halmac_api *halmac_api;
 
@@ -205,9 +204,7 @@ u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter *halmac_adapter,
 	driver_adapter = halmac_adapter->driver_adapter;
 	halmac_api = (struct halmac_api *)halmac_adapter->halmac_api;
 
-	value8 = PLATFORM_REG_READ_8(driver_adapter, halmac_offset);
-
-	return value8;
+	return PLATFORM_REG_READ_8(driver_adapter, halmac_offset);
 }
 
 /**
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/a94f301af01c055a8524ae77206fadd9f6e524eb.1554037161.git.payal.s.kshirsagar.98%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

#3 lore raw

Re: [Outreachy kernel] [PATCH 2/7] staging: rtlwifi: phydm: phydm.c: Compress two lines into one line

In reply to Payal Kshirsagar
Quoted 22 lines · Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variables.

---
 drivers/staging/rtlwifi/phydm/phydm.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
drivers/staging/rtlwifi/phydm/phydm.c +1 -1
index 473eeb6..09dbb96 100644
@@ -49,7 +49,7 @@ static void odm_update_power_training_state(struct phy_dm_struct *dm);
 /*Y = 10*log(X)*/
 s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 decimal_bit)
 {
-	s32 Y, integer = 0, decimal = 0;
+	s32 integer = 0, decimal = 0;
 	u32 i;
 
 	if (X == 0)

drivers/staging/rtlwifi/phydm/phydm.c s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 decimal_bit) · line 69

Quoted 7 lines
drivers/staging/rtlwifi/phydm/phydm.c +1 -3
@@ -66,9 +66,7 @@ s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 decimal_bit)
 		}
 	}
 
-	Y = 3 * (integer - decimal_bit) + decimal; /* 10*log(x)=3*log2(x), */
-
-	return Y;
+	return 3 * (integer - decimal_bit) + decimal; /* 10*log(x)=3*log2(x), */;

Maybe this one would be better left as is, to keep the concepts of X and Y.

julia

Quoted 50 lines
drivers/staging/rtlwifi/phydm/phydm.c +2 -9
 }
 
 s32 odm_sign_conversion(s32 value, u32 total_bit)
@@ -1240,7 +1238,6 @@ u32 odm_convert_to_db(u32 value)
 {
 	u8 i;
 	u8 j;
-	u32 dB;
 
 	value = value & 0xFFFF;
 
@@ -1257,16 +1254,13 @@ u32 odm_convert_to_db(u32 value)
 			break;
 	}
 
-	dB = (i << 3) + j + 1;
-
-	return dB;
+	return (i << 3) + j + 1;
 }
 
 u32 odm_convert_to_linear(u32 value)
 {
 	u8 i;
 	u8 j;
-	u32 linear;
 
 	/* 1dB~96dB */
 
@@ -1275,9 +1269,7 @@ u32 odm_convert_to_linear(u32 value)
 	i = (u8)((value - 1) >> 3);
 	j = (u8)(value - 1) - (i << 3);
 
-	linear = db_invert_table[i][j];
-
-	return linear;
+	return db_invert_table[i][j];
 }
 
 /*
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/55923ff0f300b54cba51dbb2662efd80c4d882d4.1554037161.git.payal.s.kshirsagar.98%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

#10 lore raw

Re: [Outreachy kernel] [PATCH 6/7] staging: rtlwifi: halmac: Compress two lines into one line

In reply to Julia Lawall
Quoted 2 lines · Julia Lawall

6 and 7 have the same subject line.

What can I do now ?
Should I send them again in v2 or just have to send 7th only? Thanking
Payal

julia

Quoted 65 lines · Payal Kshirsagar
Quoted 7 lines

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variable.

---
 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c | 5
+----
>  1 file changed, 1 insertion(+), 4 deletions(-)
Quoted 2 lines

diff --git

a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c

drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c halmac_cfg_rx_aggregation_88xx_usb(struct

Quoted 4 lines

index 0bd6abd..0ae0d02 100644

drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c +0 -0
@@ -192,7 +192,6 @@ halmac_cfg_rx_aggregation_88xx_usb(struct

halmac_adapter *halmac_adapter,

drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter

Quoted 8 lines
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c +0 -1
 u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter *halmac_adapter,
                            u32 halmac_offset)
 {
-     u8 value8;
      void *driver_adapter = NULL;
      struct halmac_api *halmac_api;
 
@@ -205,9 +204,7 @@ u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter

*halmac_adapter,

Quoted 13 lines
drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c +1 -4
      driver_adapter = halmac_adapter->driver_adapter;
      halmac_api = (struct halmac_api *)halmac_adapter->halmac_api;
 
-     value8 = PLATFORM_REG_READ_8(driver_adapter, halmac_offset);
-
-     return value8;
+     return PLATFORM_REG_READ_8(driver_adapter, halmac_offset);
 }
 
 /**
--

2.7.4

Quoted 2 lines

--
You received this message because you are subscribed to the Google

Groups "outreachy-kernel" group.

Quoted 1 line

To unsubscribe from this group and stop receiving emails from it, send

an email to [email protected].

Quoted 2 lines

To post to this group, send email to [email protected]. To view this discussion on the web visit

https://groups.google.com/d/msgid/outreachy-kernel/a94f301af01c055a8524ae77206fadd9f6e524eb.1554037161.git.payal.s.kshirsagar.98%40gmail.com
.

Quoted 2 lines

For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected]. To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.1903311527480.2578%40hadrien
.
For more options, visit https://groups.google.com/d/optout.

#4 lore raw

Re: [Outreachy kernel] [PATCH 2/7] staging: rtlwifi: phydm: phydm.c: Compress two lines into one line

In reply to Julia Lawall
Quoted 33 lines · Julia Lawall

Review

Quoted 9 lines · Payal Kshirsagar

Challenge suggested by coccinelle.
Compresses two lines into one line and remove unnecessary variables.

---
 drivers/staging/rtlwifi/phydm/phydm.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)
(quoted diff) +0 -0

b/drivers/staging/rtlwifi/phydm/phydm.c

drivers/staging/rtlwifi/phydm/phydm.c static void odm_update_power_training_state(struct

Quoted 4 lines

index 473eeb6..09dbb96 100644

drivers/staging/rtlwifi/phydm/phydm.c +0 -0
@@ -49,7 +49,7 @@ static void odm_update_power_training_state(struct

phy_dm_struct *dm);

drivers/staging/rtlwifi/phydm/phydm.c s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32

Quoted 9 lines
drivers/staging/rtlwifi/phydm/phydm.c +1 -1
 /*Y = 10*log(X)*/
 s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 decimal_bit)
 {
-     s32 Y, integer = 0, decimal = 0;
+     s32 integer = 0, decimal = 0;
      u32 i;
 
      if (X == 0)
@@ -66,9 +66,7 @@ s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32

decimal_bit)

drivers/staging/rtlwifi/phydm/phydm.c s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 · line 69

Quoted 4 lines
drivers/staging/rtlwifi/phydm/phydm.c +0 -1
              }
      }
 
-     Y = 3 * (integer - decimal_bit) + decimal; /* 10*log(x)=3*log2(x),
Quoted 9 lines

*/

drivers/staging/rtlwifi/phydm/phydm.c s32 odm_pwdb_conversion(s32 X, u32 total_bit, u32 decimal_bit)

Quoted 3 lines
drivers/staging/rtlwifi/phydm/phydm.c +1 -2
-
-     return Y;
+     return 3 * (integer - decimal_bit) + decimal; /*

10*log(x)=3*log2(x), */;

Maybe this one would be better left as is, to keep the concepts of X and Y.

Okay I will drop this one.
Thanks
Payal

julia

Quoted 67 lines
Quoted 44 lines
drivers/staging/rtlwifi/phydm/phydm.c +2 -9
 }
 
 s32 odm_sign_conversion(s32 value, u32 total_bit)
@@ -1240,7 +1238,6 @@ u32 odm_convert_to_db(u32 value)
 {
      u8 i;
      u8 j;
-     u32 dB;
 
      value = value & 0xFFFF;
 
@@ -1257,16 +1254,13 @@ u32 odm_convert_to_db(u32 value)
                      break;
      }
 
-     dB = (i << 3) + j + 1;
-
-     return dB;
+     return (i << 3) + j + 1;
 }
 
 u32 odm_convert_to_linear(u32 value)
 {
      u8 i;
      u8 j;
-     u32 linear;
 
      /* 1dB~96dB */
 
@@ -1275,9 +1269,7 @@ u32 odm_convert_to_linear(u32 value)
      i = (u8)((value - 1) >> 3);
      j = (u8)(value - 1) - (i << 3);
 
-     linear = db_invert_table[i][j];
-
-     return linear;
+     return db_invert_table[i][j];
 }
 
 /*
--

2.7.4

Quoted 2 lines

--
You received this message because you are subscribed to the Google

Groups "outreachy-kernel" group.

Quoted 1 line

To unsubscribe from this group and stop receiving emails from it, send

an email to [email protected].

Quoted 2 lines

To post to this group, send email to [email protected]. To view this discussion on the web visit

https://groups.google.com/d/msgid/outreachy-kernel/55923ff0f300b54cba51dbb2662efd80c4d882d4.1554037161.git.payal.s.kshirsagar.98%40gmail.com
.

Quoted 2 lines

For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected]. To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.1903311530210.2578%40hadrien
.
For more options, visit https://groups.google.com/d/optout.

#11 lore raw

Re: [Outreachy kernel] [PATCH 6/7] staging: rtlwifi: halmac: Compress two lines into one line

In reply to Payal Kshirsagar
Quoted 8 lines · Payal Kshirsagar

On Sun, Mar 31, 2019, 6:58 PM Julia Lawall <[email protected]> wrote:
6 and 7 have the same subject line.

What can I do now ?
Should I send them again in v2 or just have to send 7th only?

If you make any change in a series, you should always send the entire series again.

The only exception is when Greg has applied some of the patches in the series.

julia

Quoted 91 lines

Thanking
Payal

      julia

      On Sun, 31 Mar 2019, Payal Kshirsagar wrote:

      > Challenge suggested by coccinelle.
      > Compresses two lines into one line and remove unnecessary
      variable.
      >
      > Signed-off-by: Payal Kshirsagar
      <[email protected]>
      > ---
      > 
      drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      | 5 +----
      >  1 file changed, 1 insertion(+), 4 deletions(-)
      >
      > diff --git
      a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      > index 0bd6abd..0ae0d02 100644
      > ---
      a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      > +++
      b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      > @@ -192,7 +192,6 @@ halmac_cfg_rx_aggregation_88xx_usb(struct
      halmac_adapter *halmac_adapter,
      >  u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter
      *halmac_adapter,
      >                             u32 halmac_offset)
      >  {
      > -     u8 value8;
      >       void *driver_adapter = NULL;
      >       struct halmac_api *halmac_api;
      >
      > @@ -205,9 +204,7 @@ u8 halmac_reg_read_8_usb_88xx(struct
      halmac_adapter *halmac_adapter,
      >       driver_adapter = halmac_adapter->driver_adapter;
      >       halmac_api = (struct halmac_api
      *)halmac_adapter->halmac_api;
      >
      > -     value8 = PLATFORM_REG_READ_8(driver_adapter,
      halmac_offset);
      > -
      > -     return value8;
      > +     return PLATFORM_REG_READ_8(driver_adapter,
      halmac_offset);
      >  }
      >
      >  /**
      > --
      > 2.7.4
      >
      > --
      > You received this message because you are subscribed to the
      Google Groups "outreachy-kernel" group.
      > To unsubscribe from this group and stop receiving emails from
      it, send an email to
      [email protected].
      > To post to this group, send email to
      [email protected].
      > To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/a94f301af01c055a8524ae77
      206fadd9f6e524eb.1554037161.git.payal.s.kshirsagar.98%40gmail.com.
      > For more options, visit https://groups.google.com/d/optout.
      >

      --
      You received this message because you are subscribed to the
      Google Groups "outreachy-kernel" group.
      To unsubscribe from this group and stop receiving emails from
      it, send an email to
      [email protected].
      To post to this group, send email to
      [email protected].
      To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.19033115
      27480.2578%40hadrien.
      For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups
"outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/CANTOzWE1am3xofByCG%2BdF NmwgyivZwGxtZjLHWXazT5NkLP%3DEQ%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.

#12 lore raw

Re: [Outreachy kernel] [PATCH 6/7] staging: rtlwifi: halmac: Compress two lines into one line

Quoted 10 lines · Julia Lawall
Quoted 6 lines · Payal Kshirsagar

On Sun, Mar 31, 2019, 6:58 PM Julia Lawall <[email protected]> wrote:
6 and 7 have the same subject line.

Quoted 9 lines
Quoted 2 lines

What can I do now ?
Should I send them again in v2 or just have to send 7th only?

If you make any change in a series, you should always send the entire series again.

The only exception is when Greg has applied some of the patches in the series.

Would I send this patchset by dropping 2nd patch of this series. Thanks in advance,
payal

Quoted 108 lines

julia

Quoted 56 lines

Thanking
Payal

      julia

      On Sun, 31 Mar 2019, Payal Kshirsagar wrote:

      > Challenge suggested by coccinelle.
      > Compresses two lines into one line and remove unnecessary
      variable.
      >
      > Signed-off-by: Payal Kshirsagar
      <[email protected]>
      > ---
      >
      drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      | 5 +----
      >  1 file changed, 1 insertion(+), 4 deletions(-)
      >
      > diff --git
      a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      > index 0bd6abd..0ae0d02 100644
      > ---
      a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      > +++
      b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
      > @@ -192,7 +192,6 @@ halmac_cfg_rx_aggregation_88xx_usb(struct
      halmac_adapter *halmac_adapter,
      >  u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter
      *halmac_adapter,
      >                             u32 halmac_offset)
      >  {
      > -     u8 value8;
      >       void *driver_adapter = NULL;
      >       struct halmac_api *halmac_api;
      >
      > @@ -205,9 +204,7 @@ u8 halmac_reg_read_8_usb_88xx(struct
      halmac_adapter *halmac_adapter,
      >       driver_adapter = halmac_adapter->driver_adapter;
      >       halmac_api = (struct halmac_api
      *)halmac_adapter->halmac_api;
      >
      > -     value8 = PLATFORM_REG_READ_8(driver_adapter,
      halmac_offset);
      > -
      > -     return value8;
      > +     return PLATFORM_REG_READ_8(driver_adapter,
      halmac_offset);
      >  }
      >
      >  /**
      > --
      > 2.7.4
      >
      > --
Quoted 8 lines
      > You received this message because you are subscribed to the
      Google Groups "outreachy-kernel" group.
      > To unsubscribe from this group and stop receiving emails from
      it, send an email to
      [email protected].
      > To post to this group, send email to
      [email protected].
      > To view this discussion on the web visithttps://

groups.google.com/d/msgid/outreachy-kernel/a94f301af01c055a8524ae77

Quoted 4 lines

206fadd9f6e524eb.1554037161.git.payal.s.kshirsagar.98%40gmail.com. > For more options, visit https://groups.google.com/d/optout.
>

Quoted 9 lines

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visithttps://

groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.19033115

Quoted 10 lines

27480.2578%40hadrien.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected]. To view this discussion on the web visithttps://

groups.google.com/d/msgid/outreachy-kernel/CANTOzWE1am3xofByCG%2BdF

Quoted 4 lines

NmwgyivZwGxtZjLHWXazT5NkLP%3DEQ%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected]. To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.1903311538220.2578%40hadrien
.
For more options, visit https://groups.google.com/d/optout.

#13 lore raw

Re: [Outreachy kernel] [PATCH 6/7] staging: rtlwifi: halmac: Compress two lines into one line

Quoted 21 lines · Payal Kshirsagar

On Sun, 31 Mar 2019 at 19:09, Julia Lawall <[email protected]> wrote:

On Sun, 31 Mar 2019, Payal Kshirsagar wrote:

>
>
> On Sun, Mar 31, 2019, 6:58 PM Julia Lawall <[email protected]> wrote:
>       6 and 7 have the same subject line.
>
>
> What can I do now ?
> Should I send them again in v2 or just have to send 7th only?

If you make any change in a series, you should always send the entire
series again.

Quoted 6 lines

The only exception is when Greg has applied some of the patches in the
series.

Would I send this patchset by dropping 2nd patch of this series.

I didn't actually ask you to drop any complete patches, only one of the changes in a patch.

julia

Quoted 141 lines

Thanks in advance,
payal

julia

> Thanking
> Payal
>
>       julia
>
>       On Sun, 31 Mar 2019, Payal Kshirsagar wrote:
>
>       > Challenge suggested by coccinelle.
>       > Compresses two lines into one line and remove
unnecessary
>       variable.
>       >
>       > Signed-off-by: Payal Kshirsagar
>       <[email protected]>
>       > ---
>       >
>
 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
>       | 5 +----
>       >  1 file changed, 1 insertion(+), 4 deletions(-)
>       >
>       > diff --git
>
 a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
>
 b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
>       > index 0bd6abd..0ae0d02 100644
>       > ---
>
 a/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
>       > +++
>
 b/drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c
>       > @@ -192,7 +192,6 @@
halmac_cfg_rx_aggregation_88xx_usb(struct
>       halmac_adapter *halmac_adapter,
>       >  u8 halmac_reg_read_8_usb_88xx(struct halmac_adapter
>       *halmac_adapter,
>       >                             u32 halmac_offset)
>       >  {
>       > -     u8 value8;
>       >       void *driver_adapter = NULL;
>       >       struct halmac_api *halmac_api;
>       >
>       > @@ -205,9 +204,7 @@ u8
halmac_reg_read_8_usb_88xx(struct
>       halmac_adapter *halmac_adapter,
>       >       driver_adapter = halmac_adapter->driver_adapter;
>       >       halmac_api = (struct halmac_api
>       *)halmac_adapter->halmac_api;
>       >
>       > -     value8 = PLATFORM_REG_READ_8(driver_adapter,
>       halmac_offset);
>       > -
>       > -     return value8;
>       > +     return PLATFORM_REG_READ_8(driver_adapter,
>       halmac_offset);
>       >  }
>       >
>       >  /**
>       > --
>       > 2.7.4
>       >
>       > --
>       > You received this message because you are subscribed
to the
>       Google Groups "outreachy-kernel" group.
>       > To unsubscribe from this group and stop receiving
emails from
>       it, send an email to
>       [email protected].
>       > To post to this group, send email to
>       [email protected].
>       > To view this discussion on the webvisithttps://groups.google.com/d/msgid/outreachy-kernel/a94f301af01c055a852 4ae77
>
 206fadd9f6e524eb.1554037161.git.payal.s.kshirsagar.98%40gmail.com.
>       > For more options, visit
https://groups.google.com/d/optout.
>       >
>
>       --
>       You received this message because you are subscribed to
the
>       Google Groups "outreachy-kernel" group.
>       To unsubscribe from this group and stop receiving emails
from
>       it, send an email to
>       [email protected].
>       To post to this group, send email to
>       [email protected].
>       To view this discussion on the webvisithttps://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.190 33115
>       27480.2578%40hadrien.
>       For more options, visit
https://groups.google.com/d/optout.
>
> --
> You received this message because you are subscribed to the
Google Groups
> "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from
it, send an
> email to [email protected].
> To post to this group, send email to
[email protected].
> To view this discussion on the webvisithttps://groups.google.com/d/msgid/outreachy-kernel/CANTOzWE1am3xofByCG %2BdF
> NmwgyivZwGxtZjLHWXazT5NkLP%3DEQ%40mail.gmail.com.
> For more options, visit https://groups.google.com/d/optout.
>
>

--
You received this message because you are subscribed to the
Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from
it, send an email to
[email protected].
To post to this group, send email to
[email protected].
To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/alpine.DEB.2.21.19033115 38220.2578%40hadrien.
For more options, visit https://groups.google.com/d/optout.

--
You received this message because you are subscribed to the Google Groups
"outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/CANTOzWFTsR7vmzAn-ypO%2B WSzJAdQ5bJ%2BOSFautYj0RBGqDAvzA%40mail.gmail.com.
For more options, visit https://groups.google.com/d/optout.