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

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
...@@ -464,6 +464,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) ...@@ -464,6 +464,7 @@ int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr) void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr)
{ {
brcmf_fws_deinit(drvr);
kfree(drvr->proto->pd); kfree(drvr->proto->pd);
drvr->proto->pd = NULL; drvr->proto->pd = NULL;
} }
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "p2p.h" #include "p2p.h"
#include "cfg80211.h" #include "cfg80211.h"
#include "fwil.h" #include "fwil.h"
#include "fwsignal.h"
#include "feature.h" #include "feature.h"
#include "proto.h" #include "proto.h"
#include "pcie.h" #include "pcie.h"
...@@ -1034,10 +1033,6 @@ int brcmf_bus_started(struct device *dev) ...@@ -1034,10 +1033,6 @@ int brcmf_bus_started(struct device *dev)
brcmf_cfg80211_detach(drvr->config); brcmf_cfg80211_detach(drvr->config);
drvr->config = NULL; drvr->config = NULL;
} }
if (drvr->fws) {
brcmf_proto_del_if(ifp->drvr, ifp);
brcmf_fws_deinit(drvr);
}
brcmf_net_detach(ifp->ndev, false); brcmf_net_detach(ifp->ndev, false);
if (p2p_ifp) if (p2p_ifp)
brcmf_net_detach(p2p_ifp->ndev, false); brcmf_net_detach(p2p_ifp->ndev, false);
...@@ -1103,8 +1098,6 @@ void brcmf_detach(struct device *dev) ...@@ -1103,8 +1098,6 @@ void brcmf_detach(struct device *dev)
brcmf_cfg80211_detach(drvr->config); brcmf_cfg80211_detach(drvr->config);
brcmf_fws_deinit(drvr);
brcmf_bus_stop(drvr->bus_if); brcmf_bus_stop(drvr->bus_if);
brcmf_proto_detach(drvr); brcmf_proto_detach(drvr);
......
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