package/kernel/mac80211/patches/362-0004-brcmfmac-rename-brcmf_bus_start-function-to-brcmf_bu.patch

   1 From e8cd47501fa0c0a591bb07d5878dcc8d63d60e57 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:54 +0100
   4 Subject: [PATCH] brcmfmac: rename brcmf_bus_start function to
   5  brcmf_bus_started
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 This intends to make init/attach process slightly easier to follow.
  11
  12 What driver was doing in brcmf_bus_start wasn't bus specific at all and
  13 function brcmf_bus_stop wasn't undoing things done there. This function
  14 is supposed to be called by bus specific code when the bus is ready.
  15
  16 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  17 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  18 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  19 ---
  20  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h    | 2 +-
  21  drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +-
  22  drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c   | 2 +-
  23  drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c   | 2 +-
  24  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c   | 2 +-
  25  drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c    | 2 +-
  26  6 files changed, 6 insertions(+), 6 deletions(-)
  27
  28 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
  29 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
  30 @@ -238,7 +238,7 @@ void brcmf_txcomplete(struct device *dev
  31  /* Configure the "global" bus state used by upper layers */
  32  void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);
  33
  34 -int brcmf_bus_start(struct device *dev);
  35 +int brcmf_bus_started(struct device *dev);
  36  s32 brcmf_iovar_data_set(struct device *dev, char *name, void *data, u32 len);
  37  void brcmf_bus_add_txhdrlen(struct device *dev, uint len);
  38
  39 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
  40 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
  41 @@ -74,7 +74,7 @@ module_param_named(roamoff, brcmf_roamof
  42  MODULE_PARM_DESC(roamoff, "Do not use internal roaming engine");
  43
  44  #ifdef DEBUG
  45 -/* always succeed brcmf_bus_start() */
  46 +/* always succeed brcmf_bus_started() */
  47  static int brcmf_ignore_probe_fail;
  48  module_param_named(ignore_probe_fail, brcmf_ignore_probe_fail, int, 0);
  49  MODULE_PARM_DESC(ignore_probe_fail, "always succeed probe for debugging");
  50 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  51 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  52 @@ -966,7 +966,7 @@ static int brcmf_revinfo_read(struct seq
  53         return 0;
  54  }
  55
  56 -int brcmf_bus_start(struct device *dev)
  57 +int brcmf_bus_started(struct device *dev)
  58  {
  59         int ret = -1;
  60         struct brcmf_bus *bus_if = dev_get_drvdata(dev);
  61 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  62 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
  63 @@ -1572,7 +1572,7 @@ static int brcmf_pcie_attach_bus(struct
  64         if (ret) {
  65                 brcmf_err("brcmf_attach failed\n");
  66         } else {
  67 -               ret = brcmf_bus_start(&devinfo->pdev->dev);
  68 +               ret = brcmf_bus_started(&devinfo->pdev->dev);
  69                 if (ret)
  70                         brcmf_err("dongle is not responding\n");
  71         }
  72 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  73 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  74 @@ -4065,7 +4065,7 @@ static void brcmf_sdio_firmware_callback
  75
  76         sdio_release_host(sdiodev->func[1]);
  77
  78 -       err = brcmf_bus_start(dev);
  79 +       err = brcmf_bus_started(dev);
  80         if (err != 0) {
  81                 brcmf_err("dongle is not responding\n");
  82                 goto fail;
  83 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
  84 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
  85 @@ -1148,7 +1148,7 @@ static int brcmf_usb_bus_setup(struct br
  86         if (ret)
  87                 goto fail;
  88
  89 -       ret = brcmf_bus_start(devinfo->dev);
  90 +       ret = brcmf_bus_started(devinfo->dev);
  91         if (ret)
  92                 goto fail;
  93