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

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

drivers/staging/brcm80211/brcmsmac/bmac.c

+1 −1
Original line number Diff line number Diff line
@@ -982,7 +982,7 @@ int brcms_b_detach(struct brcms_c_info *wlc) 
	}



	/* Free shared phy state */

	wlc_phy_shared_detach(wlc_hw->phy_sh);

	kfree(wlc_hw->phy_sh);



	wlc_phy_shim_detach(wlc_hw->physhim);

drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c

+0 −7
Original line number Diff line number Diff line
@@ -506,13 +506,6 @@ shared_phy_t *wlc_phy_shared_attach(shared_phy_params_t *shp) 
	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,

			  char *vars, struct wiphy *wiphy)

{

drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ struct shared_phy_params { 




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,

				 char *vars, struct wiphy *wiphy);

extern void wlc_phy_detach(wlc_phy_t *ppi);

CRA Git | Maintained and supported by SUSTech CRA and CCSE