diff options
| author | Arend van Spriel <arend@broadcom.com> | 2014-05-27 14:56:16 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-29 21:08:11 +0400 |
| commit | f33d7a914125423e357693f972512fa9c94fd3aa (patch) | |
| tree | 80fdd468b7d8a46176b3d61310548eeb87fd73de /drivers/net/wireless/brcm80211/brcmfmac/usb.c | |
| parent | 5a394eba4bc7ec8741f59fcede6bd3d20ae6488c (diff) | |
| download | linux-f33d7a914125423e357693f972512fa9c94fd3aa.tar.xz | |
brcmfmac: remove .init() callback for internal bus interface
The .init() callback was the first function called by the common
bus function brcmf_bus_start(). Given that it is not really
necessary and the bus layer can call it before calling the
brcmf_bus_start() function.
Reviewed-by: Daniel (Deognyoun) Kim <dekim@broadcom.com>
Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/usb.c')
| -rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/usb.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c index 3ce0e7cfd027..1c846c54db23 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c @@ -1222,7 +1222,6 @@ error: static struct brcmf_bus_ops brcmf_usb_bus_ops = { .txdata = brcmf_usb_tx, - .init = brcmf_usb_up, .stop = brcmf_usb_down, .txctl = brcmf_usb_tx_ctlpkt, .rxctl = brcmf_usb_rx_ctlpkt, @@ -1263,6 +1262,12 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo) goto fail; } + ret = brcmf_usb_up(dev); + if (ret) { + brcmf_detach(dev); + goto fail; + } + ret = brcmf_bus_start(dev); if (ret) { brcmf_err("dongle is not responding\n"); |