summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
diff options
context:
space:
mode:
authorFranky Lin2011-12-17 03:36:52 +0100
committerJohn W. Linville2011-12-19 20:40:42 +0100
commit1ae00421e72da52d35e994244abf768ffc7dffc6 (patch)
treefce18865f2a137195a717d336c31e11d6af4d966 /drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
parentbrcm80211: fmac: unify common layer driver data structure (diff)
downloadkernel-qcow2-linux-1ae00421e72da52d35e994244abf768ffc7dffc6.tar.gz
kernel-qcow2-linux-1ae00421e72da52d35e994244abf768ffc7dffc6.tar.xz
kernel-qcow2-linux-1ae00421e72da52d35e994244abf768ffc7dffc6.zip
brcm80211: fmac: remove oneline proto block functions
brcmf_os_proto_block and brcmf_os_proto_unblock are oneline functions handling proto_block mutex. Place the mutex interface call inline to increase readability. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Reviewed-by: Arend van Spriel <arend@broadcom.com> Reviewed-by: Alwin Beukers <alwin@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 228b7edd9000..5e5a95446f51 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -804,7 +804,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
int scan_unassoc_time = 40;
int i;
- brcmf_os_proto_block(drvr);
+ mutex_lock(&drvr->proto_block);
/* Set Country code */
if (drvr->country_code[0] != 0) {
@@ -873,7 +873,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_pub *drvr)
0, true);
}
- brcmf_os_proto_unblock(drvr);
+ mutex_unlock(&drvr->proto_block);
return 0;
}