| Message ID | 20220830105016.287337-1-cui.jinpeng2@zte.com.cn (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2,linux-next] wifi: brcmfmac: remove redundant err variable | expand |
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
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