Commit 202a208b authored by Henry Ptasinski's avatar Henry Ptasinski Committed by Greg Kroah-Hartman

staging: brcm80211: flatten wlc_phy_shared_detach()

wlc_phy_shared_detach() is an unnecessary level of indirection to just
call kfree(), so replace the function with kfree().
Signed-off-by: default avatarHenry Ptasinski <henryp@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent aa51bffb
...@@ -982,7 +982,7 @@ int brcms_b_detach(struct brcms_c_info *wlc) ...@@ -982,7 +982,7 @@ int brcms_b_detach(struct brcms_c_info *wlc)
} }
/* Free shared phy state */ /* Free shared phy state */
wlc_phy_shared_detach(wlc_hw->phy_sh); kfree(wlc_hw->phy_sh);
wlc_phy_shim_detach(wlc_hw->physhim); wlc_phy_shim_detach(wlc_hw->physhim);
......
...@@ -506,13 +506,6 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp) ...@@ -506,13 +506,6 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp)
return sh; return sh;
} }
void wlc_phy_shared_detach(shared_phy_t *phy_sh)
{
if (phy_sh) {
kfree(phy_sh);
}
}
wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype,
char *vars, struct wiphy *wiphy) char *vars, struct wiphy *wiphy)
{ {
......
...@@ -177,7 +177,6 @@ struct shared_phy_params { ...@@ -177,7 +177,6 @@ struct shared_phy_params {
extern shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp); extern shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp);
extern void wlc_phy_shared_detach(shared_phy_t *phy_sh);
extern wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype, extern wlc_phy_t *wlc_phy_attach(shared_phy_t *sh, void *regs, int bandtype,
char *vars, struct wiphy *wiphy); char *vars, struct wiphy *wiphy);
extern void wlc_phy_detach(wlc_phy_t *ppi); extern void wlc_phy_detach(wlc_phy_t *ppi);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment