openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Franky Lin 2011-12-16 18:36:52 -08:00 committed by John W. Linville
parent d08b6a3759
commit 1ae00421e7
4 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/brcm80211/brcmfmac/dhd.h
View File

@ -734,9 +734,6 @@ extern void brcmf_txcomplete(struct brcmf_pub *drvr, struct sk_buff *txp,
extern int brcmf_proto_cdc_query_dcmd(struct brcmf_pub *drvr, int ifidx,
uint cmd, void *buf, uint len);
/* OS independent layer functions */
extern int brcmf_os_proto_block(struct brcmf_pub *drvr);
extern int brcmf_os_proto_unblock(struct brcmf_pub *drvr);
#ifdef BCMDBG
extern int brcmf_write_to_file(struct brcmf_pub *drvr, const u8 *buf, int size);
#endif /* BCMDBG */

10
drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
View File

@ -284,7 +284,7 @@ brcmf_proto_dcmd(struct brcmf_pub *drvr, int ifidx, struct brcmf_dcmd *dcmd,
brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n");
return ret;
}
brcmf_os_proto_block(drvr);
mutex_lock(&drvr->proto_block);
brcmf_dbg(TRACE, "Enter\n");
@ -338,7 +338,7 @@ brcmf_proto_dcmd(struct brcmf_pub *drvr, int ifidx, struct brcmf_dcmd *dcmd,
prot->pending = false;
done:
brcmf_os_proto_unblock(drvr);
mutex_unlock(&drvr->proto_block);
return ret;
}
@ -470,19 +470,19 @@ int brcmf_proto_init(struct brcmf_pub *drvr)
brcmf_dbg(TRACE, "Enter\n");
brcmf_os_proto_block(drvr);
mutex_lock(&drvr->proto_block);
/* Get the device MAC address */
strcpy(buf, "cur_etheraddr");
ret = brcmf_proto_cdc_query_dcmd(drvr, 0, BRCMF_C_GET_VAR,
buf, sizeof(buf));
if (ret < 0) {
brcmf_os_proto_unblock(drvr);
mutex_unlock(&drvr->proto_block);
return ret;
}
memcpy(drvr->mac, buf, ETH_ALEN);
brcmf_os_proto_unblock(drvr);
mutex_unlock(&drvr->proto_block);
ret = brcmf_c_preinit_dcmds(drvr);

4
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
View File

@ -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;
}

19
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
View File

@ -1112,25 +1112,6 @@ void brcmf_detach(struct brcmf_pub *drvr)
}
}
int brcmf_os_proto_block(struct brcmf_pub *drvr)
{
if (drvr) {
mutex_lock(&drvr->proto_block);
return 1;
}
return 0;
}
int brcmf_os_proto_unblock(struct brcmf_pub *drvr)
{
if (drvr) {
mutex_unlock(&drvr->proto_block);
return 1;
}
return 0;
}
static int brcmf_get_pend_8021x_cnt(struct brcmf_pub *drvr)
{
return atomic_read(&drvr->pend_8021x_cnt);