diff options
Diffstat (limited to 'package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch b/package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch new file mode 100644 index 0000000000..13e5d52bd0 --- /dev/null +++ b/package/kernel/mac80211/patches/362-0003-brcmfmac-drop-brcmf_bus_detach-and-inline-its-code.patch @@ -0,0 +1,49 @@ +From bfa7295e5b4d32cdab28d4cdc3a9791f73aed089 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> +Date: Wed, 18 Jan 2017 11:48:53 +0100 +Subject: [PATCH] brcmfmac: drop brcmf_bus_detach and inline its code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Driver used to call brcmf_bus_detach only from one place and it already +contained a check for drvr not being NULL. We can get rid of this extra +function, call brcmf_bus_stop directly and simplify the code. +There also isn't brcmf_bus_attach function which one could expect so it +looks more consistent this way. + +Signed-off-by: Rafał Miłecki <rafal@milecki.pl> +Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> +Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +--- + drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 12 +----------- + 1 file changed, 1 insertion(+), 11 deletions(-) + +--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c ++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +@@ -1075,16 +1075,6 @@ void brcmf_bus_add_txhdrlen(struct devic + } + } + +-static void brcmf_bus_detach(struct brcmf_pub *drvr) +-{ +- brcmf_dbg(TRACE, "Enter\n"); +- +- if (drvr) { +- /* Stop the bus module */ +- brcmf_bus_stop(drvr->bus_if); +- } +-} +- + void brcmf_dev_reset(struct device *dev) + { + struct brcmf_bus *bus_if = dev_get_drvdata(dev); +@@ -1131,7 +1121,7 @@ void brcmf_detach(struct device *dev) + + brcmf_fws_deinit(drvr); + +- brcmf_bus_detach(drvr); ++ brcmf_bus_stop(drvr->bus_if); + + brcmf_proto_detach(drvr); + |