diff options
author | Arend Van Spriel <arend.vanspriel@broadcom.com> | 2018-02-20 00:14:23 +0100 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2018-02-27 18:21:27 +0200 |
commit | de2a3027f6f15e2f6558dc4d178282ccc1f054db (patch) | |
tree | 8c0ba75d742d5651b853a725181f503909597790 /drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | |
parent | 0542503c4c164c65cd1567b0f2b3f887af6c81eb (diff) | |
download | op-kernel-dev-de2a3027f6f15e2f6558dc4d178282ccc1f054db.zip op-kernel-dev-de2a3027f6f15e2f6558dc4d178282ccc1f054db.tar.gz |
brcmfmac: remove brcmf_bus_started() from bus api
No longer needed to call this in bus layer so make it static and call
it in the last phase of brcmf_attach() instead.
Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c')
-rw-r--r-- | drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 9eab7a9..1904852 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c @@ -944,11 +944,10 @@ static int brcmf_revinfo_read(struct seq_file *s, void *data) return 0; } -int brcmf_bus_started(struct device *dev) +static int brcmf_bus_started(struct brcmf_pub *drvr) { int ret = -1; - struct brcmf_bus *bus_if = dev_get_drvdata(dev); - struct brcmf_pub *drvr = bus_if->drvr; + struct brcmf_bus *bus_if = drvr->bus_if; struct brcmf_if *ifp; struct brcmf_if *p2p_ifp; @@ -965,7 +964,7 @@ int brcmf_bus_started(struct device *dev) brcmf_bus_change_state(bus_if, BRCMF_BUS_UP); /* do bus specific preinit here */ - ret = brcmf_bus_preinit(ifp->drvr->bus_if); + ret = brcmf_bus_preinit(bus_if); if (ret < 0) goto fail; @@ -1085,7 +1084,12 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings) /* attach firmware event handler */ brcmf_fweh_attach(drvr); - return ret; + ret = brcmf_bus_started(drvr); + if (ret != 0) { + brcmf_err("dongle is not responding: err=%d\n", ret); + goto fail; + } + return 0; fail: brcmf_detach(dev); |