| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677 |
- From ffb9f18ad8f0e5e1d88c56478bf24e6464c96eee Mon Sep 17 00:00:00 2001
- From: Arend Van Spriel <arend.vanspriel@broadcom.com>
- Date: Thu, 6 Apr 2017 13:14:37 +0100
- Subject: [PATCH] brcmfmac: rename brcmf_fws_{de,}init to brcmf_fws{at,de}tach
- This is a non-functional change to align the fwsignal module to
- the naming pattern used throughout the driver.
- 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/bcdc.c | 4 ++--
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 6 +++---
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h | 4 ++--
- 3 files changed, 7 insertions(+), 7 deletions(-)
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
- @@ -420,7 +420,7 @@ brcmf_proto_bcdc_reset_if(struct brcmf_i
- static int
- brcmf_proto_bcdc_init_done(struct brcmf_pub *drvr)
- {
- - return brcmf_fws_init(drvr);
- + return brcmf_fws_attach(drvr);
- }
-
- int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
- @@ -464,7 +464,7 @@ fail:
-
- void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr)
- {
- - brcmf_fws_deinit(drvr);
- + brcmf_fws_detach(drvr);
- kfree(drvr->proto->pd);
- drvr->proto->pd = NULL;
- }
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
- @@ -2308,7 +2308,7 @@ static int brcmf_debugfs_fws_stats_read(
- }
- #endif
-
- -int brcmf_fws_init(struct brcmf_pub *drvr)
- +int brcmf_fws_attach(struct brcmf_pub *drvr)
- {
- struct brcmf_fws_info *fws;
- struct brcmf_if *ifp;
- @@ -2408,11 +2408,11 @@ int brcmf_fws_init(struct brcmf_pub *drv
- return 0;
-
- fail:
- - brcmf_fws_deinit(drvr);
- + brcmf_fws_detach(drvr);
- return rc;
- }
-
- -void brcmf_fws_deinit(struct brcmf_pub *drvr)
- +void brcmf_fws_detach(struct brcmf_pub *drvr)
- {
- struct brcmf_fws_info *fws = drvr->fws;
-
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
- @@ -18,8 +18,8 @@
- #ifndef FWSIGNAL_H_
- #define FWSIGNAL_H_
-
- -int brcmf_fws_init(struct brcmf_pub *drvr);
- -void brcmf_fws_deinit(struct brcmf_pub *drvr);
- +int brcmf_fws_attach(struct brcmf_pub *drvr);
- +void brcmf_fws_detach(struct brcmf_pub *drvr);
- bool brcmf_fws_queue_skbs(struct brcmf_fws_info *fws);
- bool brcmf_fws_fc_active(struct brcmf_fws_info *fws);
- void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb);
|
