Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f9dd1a9 authored by Franky Lin's avatar Franky Lin Committed by Kalle Valo
Browse files

brcmfmac: move brcmf_fws_deinit to bcdc layer 



Move brcmf_fws_deinit into brcmf_proto_bcdc_detach since it is a bcdc
exclusive feature.

Signed-off-by: default avatarFranky Lin <franky.lin@broadcom.com>
Reviewed-by: default avatarArend Van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 62c50a34

drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c

+1 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) 


void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr)

{

	brcmf_fws_deinit(drvr);

	kfree(drvr->proto->pd);

	drvr->proto->pd = NULL;

}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c

+0 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include "p2p.h"

#include "cfg80211.h"

#include "fwil.h"

#include "fwsignal.h"

#include "feature.h"

#include "proto.h"

#include "pcie.h"
@@ -1034,10 +1033,6 @@ int brcmf_bus_started(struct device *dev) 
		brcmf_cfg80211_detach(drvr->config);

		drvr->config = NULL;

	}

	if (drvr->fws) {

		brcmf_proto_del_if(ifp->drvr, ifp);

		brcmf_fws_deinit(drvr);

	}

	brcmf_net_detach(ifp->ndev, false);

	if (p2p_ifp)

		brcmf_net_detach(p2p_ifp->ndev, false);
@@ -1103,8 +1098,6 @@ void brcmf_detach(struct device *dev) 


	brcmf_cfg80211_detach(drvr->config);



	brcmf_fws_deinit(drvr);



	brcmf_bus_stop(drvr->bus_if);



	brcmf_proto_detach(drvr);