package/kernel/mac80211/patches/319-v4.12-0040-brcmfmac-rename-brcmf_fws_-de-init-to-brcmf_fws-at-d.patch

   1 From ffb9f18ad8f0e5e1d88c56478bf24e6464c96eee Mon Sep 17 00:00:00 2001
   2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
   3 Date: Thu, 6 Apr 2017 13:14:37 +0100
   4 Subject: [PATCH] brcmfmac: rename brcmf_fws_{de,}init to brcmf_fws{at,de}tach
   5
   6 This is a non-functional change to align the fwsignal module to
   7 the naming pattern used throughout the driver.
   8
   9 Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
  11 Reviewed-by: Franky Lin <franky.lin@broadcom.com>
  12 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c     | 4 ++--
  16  drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 6 +++---
  17  drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h | 4 ++--
  18  3 files changed, 7 insertions(+), 7 deletions(-)
  19
  20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  22 @@ -420,7 +420,7 @@ brcmf_proto_bcdc_reset_if(struct brcmf_i
  23  static int
  24  brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr)
  25  {
  26 -       return brcmf_fws_init(drvr);
  27 +       return brcmf_fws_attach(drvr);
  28  }
  29
  30  int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
  31 @@ -464,7 +464,7 @@ fail:
  32
  33  void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr)
  34  {
  35 -       brcmf_fws_deinit(drvr);
  36 +       brcmf_fws_detach(drvr);
  37         kfree(drvr->proto->pd);
  38         drvr->proto->pd = NULL;
  39  }
  40 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
  41 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
  42 @@ -2308,7 +2308,7 @@ static int brcmf_debugfs_fws_stats_read(
  43  }
  44  #endif
  45
  46 -int brcmf_fws_init(struct brcmf_pub *drvr)
  47 +int brcmf_fws_attach(struct brcmf_pub *drvr)
  48  {
  49         struct brcmf_fws_info *fws;
  50         struct brcmf_if *ifp;
  51 @@ -2408,11 +2408,11 @@ int brcmf_fws_init(struct brcmf_pub *drv
  52         return 0;
  53
  54  fail:
  55 -       brcmf_fws_deinit(drvr);
  56 +       brcmf_fws_detach(drvr);
  57         return rc;
  58  }
  59
  60 -void brcmf_fws_deinit(struct brcmf_pub *drvr)
  61 +void brcmf_fws_detach(struct brcmf_pub *drvr)
  62  {
  63         struct brcmf_fws_info *fws = drvr->fws;
  64
  65 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
  66 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
  67 @@ -18,8 +18,8 @@
  68  #ifndef FWSIGNAL_H_
  69  #define FWSIGNAL_H_
  70
  71 -int brcmf_fws_init(struct brcmf_pub *drvr);
  72 -void brcmf_fws_deinit(struct brcmf_pub *drvr);
  73 +int brcmf_fws_attach(struct brcmf_pub *drvr);
  74 +void brcmf_fws_detach(struct brcmf_pub *drvr);
  75  bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws);
  76  bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);
  77  void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb);