* [PATCH v2 linux-next] wifi: brcmfmac: remove redundant err variable
@ 2022-08-30 10:50 cgel.zte
2022-08-30 11:35 ` Arend Van Spriel
0 siblings, 1 reply; 2+ messages in thread
From: cgel.zte @ 2022-08-30 10:50 UTC (permalink / raw)
To: aspriel, franky.lin, hante.meuleman, kvalo, davem, edumazet
Cc: kuba, pabeni, johannes.berg, alsi, a.fatoum, loic.poulain,
quic_vjakkam, prestwoj, colin.i.king, hdegoede, smoch,
cui.jinpeng2, linux-wireless, brcm80211-dev-list.pdl,
SHA-cyfmac-dev-list, netdev, linux-kernel, Zeal Robot
From: Jinpeng Cui <cui.jinpeng2@zte.com.cn>
Return value from brcmf_fil_iovar_data_set() and
brcmf_config_ap_mgmt_ie() directly instead of
taking this in another redundant variable.
Reported-by: Zeal Robot <zealci@zte.com.cn>
Signed-off-by: Jinpeng Cui <cui.jinpeng2@zte.com.cn>
---
.../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 7c72ea26a7d7..8a8c5a3bb2fb 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -3988,7 +3988,6 @@ brcmf_update_pmklist(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp)
struct brcmf_pmk_list_le *pmk_list;
int i;
u32 npmk;
- s32 err;
pmk_list = &cfg->pmk_list;
npmk = le32_to_cpu(pmk_list->npmk);
@@ -3997,10 +3996,8 @@ brcmf_update_pmklist(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp)
for (i = 0; i < npmk; i++)
brcmf_dbg(CONN, "PMK[%d]: %pM\n", i, &pmk_list->pmk[i].bssid);
- err = brcmf_fil_iovar_data_set(ifp, "pmkid_info", pmk_list,
+ return brcmf_fil_iovar_data_set(ifp, "pmkid_info", pmk_list,
sizeof(*pmk_list));
-
- return err;
}
static s32
@@ -5046,13 +5043,10 @@ brcmf_cfg80211_change_beacon(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_beacon_data *info)
{
struct brcmf_if *ifp = netdev_priv(ndev);
- s32 err;
brcmf_dbg(TRACE, "Enter\n");
- err = brcmf_config_ap_mgmt_ie(ifp->vif, info);
-
- return err;
+ return brcmf_config_ap_mgmt_ie(ifp->vif, info);
}
static int
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2 linux-next] wifi: brcmfmac: remove redundant err variable
2022-08-30 10:50 [PATCH v2 linux-next] wifi: brcmfmac: remove redundant err variable cgel.zte
@ 2022-08-30 11:35 ` Arend Van Spriel
0 siblings, 0 replies; 2+ messages in thread
From: Arend Van Spriel @ 2022-08-30 11:35 UTC (permalink / raw)
To: cgel.zte, franky.lin, hante.meuleman, kvalo, davem, edumazet
Cc: kuba, pabeni, johannes.berg, alsi, a.fatoum, loic.poulain,
quic_vjakkam, prestwoj, colin.i.king, hdegoede, smoch,
cui.jinpeng2, linux-wireless, brcm80211-dev-list.pdl,
SHA-cyfmac-dev-list, netdev, linux-kernel, Zeal Robot
On 8/30/2022 12:50 PM, cgel.zte@gmail.com wrote:
> From: Jinpeng Cui <cui.jinpeng2@zte.com.cn>
>
> Return value from brcmf_fil_iovar_data_set() and
> brcmf_config_ap_mgmt_ie() directly instead of
> taking this in another redundant variable.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Jinpeng Cui <cui.jinpeng2@zte.com.cn>
> ---
> .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 ++--------
> 1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> index 7c72ea26a7d7..8a8c5a3bb2fb 100644
> --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
> +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
[...]
> @@ -3997,10 +3996,8 @@ brcmf_update_pmklist(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp)
> for (i = 0; i < npmk; i++)
> brcmf_dbg(CONN, "PMK[%d]: %pM\n", i, &pmk_list->pmk[i].bssid);
>
> - err = brcmf_fil_iovar_data_set(ifp, "pmkid_info", pmk_list,
> + return brcmf_fil_iovar_data_set(ifp, "pmkid_info", pmk_list,
> sizeof(*pmk_list));
You should align the next line on the column after the opening brace.
Using the checkpatch script should report this.
> -
> - return err;
> }
>
> static s32
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-08-30 11:37 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-30 10:50 [PATCH v2 linux-next] wifi: brcmfmac: remove redundant err variable cgel.zte
2022-08-30 11:35 ` Arend Van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).