All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arend van Spriel <arend.vanspriel@broadcom.com>
To: Kalle Valo <kvalo@codeaurora.org>
Cc: linux-wireless@vger.kernel.org,
	Arend van Spriel <arend.vanspriel@broadcom.com>
Subject: [PATCH 4/8] brcmfmac: usb: call brcmf_usb_up() during brcmf_bus_preinit()
Date: Tue, 20 Feb 2018 00:14:21 +0100	[thread overview]
Message-ID: <1519082065-10128-5-git-send-email-arend.vanspriel@broadcom.com> (raw)
In-Reply-To: <1519082065-10128-1-git-send-email-arend.vanspriel@broadcom.com>

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>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index b27170c..d22cd166 100644
--- 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 device *dev, u32 chip, u32 chiprev,
 }
 
 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 brcmf_usbdev_info *devinfo)
 		return ret;
 	}
 
-	ret = brcmf_usb_up(devinfo->dev);
-	if (ret)
-		goto fail;
-
 	ret = brcmf_bus_started(devinfo->dev);
 	if (ret)
 		goto fail;
-- 
1.9.1

  parent reply	other threads:[~2018-02-19 23:14 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-19 23:14 [PATCH 0/8] brcmfmac: cleanup and some rework Arend van Spriel
2018-02-19 23:14 ` [PATCH 1/8] brcmfmac: move brcmf_bus_preinit() call just after changing bus state Arend van Spriel
2018-02-27 16:23   ` [1/8] " Kalle Valo
2018-02-19 23:14 ` [PATCH 2/8] brcmfmac: move allocation of control rx buffer to brcmf_sdio_bus_preinit() Arend van Spriel
2018-02-19 23:14 ` [PATCH 3/8] brcmfmac: call brcmf_attach() just before calling brcmf_bus_started() Arend van Spriel
2018-02-19 23:14 ` Arend van Spriel [this message]
2018-02-19 23:14 ` [PATCH 5/8] brcmfmac: move brcmf_attach() function in core.c Arend van Spriel
2018-02-19 23:14 ` [PATCH 6/8] brcmfmac: remove brcmf_bus_started() from bus api Arend van Spriel
2018-02-19 23:14 ` [PATCH 7/8] brcmfmac: change log level for some low-level sdio functions Arend van Spriel
2018-02-19 23:14 ` [PATCH 8/8] brcmfmac: remove duplicate pointer variable from brcmf_sdio_firmware_callback() Arend van Spriel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1519082065-10128-5-git-send-email-arend.vanspriel@broadcom.com \
    --to=arend.vanspriel@broadcom.com \
    --cc=kvalo@codeaurora.org \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.