package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch

   1 From bfa7295e5b4d32cdab28d4cdc3a9791f73aed089 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Wed, 18 Jan 2017 11:48:53 +0100
   4 Subject: [PATCH] brcmfmac: drop brcmf_bus_detach and inline its code
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Driver used to call brcmf_bus_detach only from one place and it already
  10 contained a check for drvr not being NULL. We can get rid of this extra
  11 function, call brcmf_bus_stop directly and simplify the code.
  12 There also isn't brcmf_bus_attach function which one could expect so it
  13 looks more consistent this way.
  14
  15 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  16 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  17 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  18 ---
  19  drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 12 +-----------
  20  1 file changed, 1 insertion(+), 11 deletions(-)
  21
  22 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  23 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  24 @@ -1075,16 +1075,6 @@ void brcmf_bus_add_txhdrlen(struct devic
  25         }
  26  }
  27
  28 -static void brcmf_bus_detach(struct brcmf_pub *drvr)
  29 -{
  30 -       brcmf_dbg(TRACE, "Enter\n");
  31 -
  32 -       if (drvr) {
  33 -               /* Stop the bus module */
  34 -               brcmf_bus_stop(drvr->bus_if);
  35 -       }
  36 -}
  37 -
  38  void brcmf_dev_reset(struct device *dev)
  39  {
  40         struct brcmf_bus *bus_if = dev_get_drvdata(dev);
  41 @@ -1131,7 +1121,7 @@ void brcmf_detach(struct device *dev)
  42
  43         brcmf_fws_deinit(drvr);
  44
  45 -       brcmf_bus_detach(drvr);
  46 +       brcmf_bus_stop(drvr->bus_if);
  47
  48         brcmf_proto_detach(drvr);
  49