0da9303e5b
It was described by Arend as: > This series is intended for 4.17 and includes following: > > * rework bus layer attach code. > * remove duplicate variable declaration. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From a7f4a80c0070b673d4a4ce94b99979ea6d0c6296 Mon Sep 17 00:00:00 2001
|
|
From: Arend Van Spriel <arend.vanspriel@broadcom.com>
|
|
Date: Tue, 20 Feb 2018 00:14:21 +0100
|
|
Subject: [PATCH] brcmfmac: usb: call brcmf_usb_up() during brcmf_bus_preinit()
|
|
|
|
By calling brcmf_usb_up() during brcmf_bus_preinit() it does not need
|
|
to be called in brcmf_usb_bus_setup().
|
|
|
|
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>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 7 ++-----
|
|
1 file changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
|
|
@@ -1146,8 +1146,9 @@ static int brcmf_usb_get_fwname(struct d
|
|
}
|
|
|
|
static const struct brcmf_bus_ops brcmf_usb_bus_ops = {
|
|
- .txdata = brcmf_usb_tx,
|
|
+ .preinit = brcmf_usb_up,
|
|
.stop = brcmf_usb_down,
|
|
+ .txdata = brcmf_usb_tx,
|
|
.txctl = brcmf_usb_tx_ctlpkt,
|
|
.rxctl = brcmf_usb_rx_ctlpkt,
|
|
.wowl_config = brcmf_usb_wowl_config,
|
|
@@ -1165,10 +1166,6 @@ static int brcmf_usb_bus_setup(struct br
|
|
return ret;
|
|
}
|
|
|
|
- ret = brcmf_usb_up(devinfo->dev);
|
|
- if (ret)
|
|
- goto fail;
|
|
-
|
|
ret = brcmf_bus_started(devinfo->dev);
|
|
if (ret)
|
|
goto fail;
|