2023-02-12 10:47:46

by Lu jicong

Subject: [PATCH] rtlwifi: reduce duplicate decision

This return can go in previous decision.

Signed-off-by: Lu jicong <[email protected]>
---
drivers/net/wireless/realtek/rtlwifi/efuse.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/efuse.c b/drivers/net/wireless/realtek/rtlwifi/efuse.c
index 2e945554ed6d..70c4e22fc426 100644
--- a/drivers/net/wireless/realtek/rtlwifi/efuse.c
+++ b/drivers/net/wireless/realtek/rtlwifi/efuse.c
@@ -1243,14 +1243,12 @@ int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,
rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
"EEPROM ID(%#x) is invalid!!\n", eeprom_id);
rtlefuse->autoload_failflag = true;
+ return 1;
} else {
rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
rtlefuse->autoload_failflag = false;
}

- if (rtlefuse->autoload_failflag)
- return 1;
-
rtlefuse->eeprom_vid = *(u16 *)&hwinfo[params[1]];
rtlefuse->eeprom_did = *(u16 *)&hwinfo[params[2]];
rtlefuse->eeprom_svid = *(u16 *)&hwinfo[params[3]];
--
2.30.2

2023-02-13 09:21:22

by Ping-Ke Shih

Subject: RE: [PATCH] rtlwifi: reduce duplicate decision

> -----Original Message-----
> From: Lu jicong <[email protected]>
> Sent: Sunday, February 12, 2023 6:47 PM
> To: Ping-Ke Shih <[email protected]>; [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]
> Cc: [email protected]; [email protected]; [email protected]; Lu jicong
> <[email protected]>
> Subject: [PATCH] rtlwifi: reduce duplicate decision

Need "wifi: " prefix.
Subject is too common. How about pointing out 'autoload' or something like that?


>
> This return can go in previous decision.
>
> Signed-off-by: Lu jicong <[email protected]>
> ---
> drivers/net/wireless/realtek/rtlwifi/efuse.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtlwifi/efuse.c
> b/drivers/net/wireless/realtek/rtlwifi/efuse.c
> index 2e945554ed6d..70c4e22fc426 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/efuse.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/efuse.c
> @@ -1243,14 +1243,12 @@ int rtl_get_hwinfo(struct ieee80211_hw *hw, struct rtl_priv *rtlpriv,
> rtl_dbg(rtlpriv, COMP_ERR, DBG_WARNING,
> "EEPROM ID(%#x) is invalid!!\n", eeprom_id);
> rtlefuse->autoload_failflag = true;
> + return 1;
> } else {
> rtl_dbg(rtlpriv, COMP_INIT, DBG_LOUD, "Autoload OK\n");
> rtlefuse->autoload_failflag = false;
> }
>
> - if (rtlefuse->autoload_failflag)
> - return 1;
> -

Honestly, I prefer the original version that looks more clear, and we don't need
to stir this chunk.

> rtlefuse->eeprom_vid = *(u16 *)&hwinfo[params[1]];
> rtlefuse->eeprom_did = *(u16 *)&hwinfo[params[2]];
> rtlefuse->eeprom_svid = *(u16 *)&hwinfo[params[3]];
> --
> 2.30.2