Skip to contentSkip to conversation

wifi: rtw89: use readable return 0 in rtw89_mac_cfg_ppdu_status()

PATCH In review Ping-Ke Shih 2 participants 2 messages Feb 13, 2023 – Feb 15, 2023 Realtek wireless driver (rtw89)

lore
Share & tools
lore

Ping-Ke Shih

author maintainer
#0 lore raw

PATCH 1/1 wifi: rtw89: use readable return 0 in rtw89_mac_cfg_ppdu_status()

For normal (successful) flow, it must return 0. The original code uses 'return ret', and then we need to backward reference to initial value to know 'ret = 0'. Changing them to 'return 0', because it will be more readable and intuitive. This patch doesn't change logic at all.

Reported-by kernel test robot <[email protected]>
Reported-by Dan Carpenter <[email protected]>
Link https://lore.kernel.org/r/[email protected]/ open here
Signed-off-by Ping-Ke Shih <[email protected]>
---
 drivers/net/wireless/realtek/rtw89/mac.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +3 -3
index 5ab0590485e0d..60dd2287515fe 100644
@@ -4512,7 +4512,7 @@ EXPORT_SYMBOL(rtw89_mac_get_txpwr_cr);
 int rtw89_mac_cfg_ppdu_status(struct rtw89_dev *rtwdev, u8 mac_idx, bool enable)
 {
 	u32 reg = rtw89_mac_reg_by_idx(R_AX_PPDU_STAT, mac_idx);
-	int ret = 0;
+	int ret;
 
 	ret = rtw89_mac_check_mac_en(rtwdev, mac_idx, RTW89_CMAC_SEL);
 	if (ret)

@@ -4520,7 +4520,7 @@ int rtw89_mac_cfg_ppdu_status(struct rtw89_dev *rtwdev, u8 mac_idx, bool enable)
 
 	if (!enable) {
 		rtw89_write32_clr(rtwdev, reg, B_AX_PPDU_STAT_RPT_EN);
-		return ret;
+		return 0;
 	}
 
 	rtw89_write32(rtwdev, reg, B_AX_PPDU_STAT_RPT_EN |

@@ -4530,7 +4530,7 @@ int rtw89_mac_cfg_ppdu_status(struct rtw89_dev *rtwdev, u8 mac_idx, bool enable)
 	rtw89_write32_mask(rtwdev, R_AX_HW_RPT_FWD, B_AX_FWD_PPDU_STAT_MASK,
 			   RTW89_PRPT_DEST_HOST);
 
-	return ret;
+	return 0;
 }
 EXPORT_SYMBOL(rtw89_mac_cfg_ppdu_status);
Signature · 1 line
2.25.1
#1 lore raw
Quoted 9 lines · Ping-Ke Shih

For normal (successful) flow, it must return 0. The original code uses 'return ret', and then we need to backward reference to initial value to know 'ret = 0'. Changing them to 'return 0', because it will be more readable and intuitive. This patch doesn't change logic at all.

Reported-by kernel test robot <[email protected]>
Reported-by Dan Carpenter <[email protected]>
Link https://lore.kernel.org/r/[email protected]/ open here
Signed-off-by Ping-Ke Shih <[email protected]>

Patch applied to wireless-next.git, thanks.

210871887208 wifi: rtw89: use readable return 0 in rtw89_mac_cfg_ppdu_status()

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches