hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: brcm80211: removed 'enforce_mutex' parameter in fullmac 

Parameter was always called with the value 'true'.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen 2011-10-02 10:14:42 -07:00 committed by Greg Kroah-Hartman
parent 9ee777a558
commit 8ff3a89684
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/brcm80211/brcmfmac/dhd_bus.h
View File

@ -35,10 +35,10 @@ extern void brcmf_bus_unregister(void);
extern struct device *brcmf_bus_get_device(struct brcmf_bus *bus); extern struct device *brcmf_bus_get_device(struct brcmf_bus *bus);
/* Stop bus module: clear pending frames, disable data flow */ /* Stop bus module: clear pending frames, disable data flow */
extern void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex); extern void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus);
/* Initialize bus module: prepare for communication w/dongle */ /* Initialize bus module: prepare for communication w/dongle */
extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex); extern int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr);
/* Send a data frame to the dongle. Callee disposes of txp. */ /* Send a data frame to the dongle. Callee disposes of txp. */
extern int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *txp); extern int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *txp);

4
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View File

@ -1093,7 +1093,7 @@ int brcmf_bus_start(struct brcmf_pub *drvr)
brcmf_dbg(TRACE, "\n"); brcmf_dbg(TRACE, "\n");
/* Bring up the bus */ /* Bring up the bus */
ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub, true); ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub);
if (ret != 0) { if (ret != 0) {
brcmf_dbg(ERROR, "brcmf_sdbrcm_bus_init failed %d\n", ret); brcmf_dbg(ERROR, "brcmf_sdbrcm_bus_init failed %d\n", ret);
return ret; return ret;
@ -1217,7 +1217,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr)
brcmf_proto_stop(&drvr_priv->pub); brcmf_proto_stop(&drvr_priv->pub);
/* Stop the bus module */ /* Stop the bus module */
brcmf_sdbrcm_bus_stop(drvr_priv->pub.bus, true); brcmf_sdbrcm_bus_stop(drvr_priv->pub.bus);
} }
} }
} }

23
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -2720,7 +2720,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
if (brcmf_sdbrcm_dpc(bus)) if (brcmf_sdbrcm_dpc(bus))
complete(&bus->dpc_wait); complete(&bus->dpc_wait);
} else { } else {
brcmf_sdbrcm_bus_stop(bus, true); brcmf_sdbrcm_bus_stop(bus);
} }
} else } else
break; break;
@ -2736,8 +2736,9 @@ static void brcmf_sdbrcm_dpc_tasklet(unsigned long data)
if (bus->drvr->busstate != BRCMF_BUS_DOWN) { if (bus->drvr->busstate != BRCMF_BUS_DOWN) {
if (brcmf_sdbrcm_dpc(bus)) if (brcmf_sdbrcm_dpc(bus))
tasklet_schedule(&bus->tasklet); tasklet_schedule(&bus->tasklet);
} else } else {
brcmf_sdbrcm_bus_stop(bus, true); brcmf_sdbrcm_bus_stop(bus);
}
} }
static void brcmf_sdbrcm_sched_dpc(struct brcmf_bus *bus) static void brcmf_sdbrcm_sched_dpc(struct brcmf_bus *bus)
@ -3639,7 +3640,7 @@ brcmf_sdbrcm_download_firmware(struct brcmf_bus *bus)
return ret; return ret;
} }
void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex) void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
{ {
u32 local_hostintmask; u32 local_hostintmask;
u8 saveclk; u8 saveclk;
@ -3648,8 +3649,7 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex)
brcmf_dbg(TRACE, "Enter\n"); brcmf_dbg(TRACE, "Enter\n");
if (enforce_mutex) down(&bus->sdsem);
down(&bus->sdsem);
bus_wake(bus); bus_wake(bus);
@ -3720,11 +3720,10 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex)
bus->rxskip = false; bus->rxskip = false;
bus->tx_seq = bus->rx_seq = 0; bus->tx_seq = bus->rx_seq = 0;
if (enforce_mutex) up(&bus->sdsem);
up(&bus->sdsem);
} }
int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr)
{ {
struct brcmf_bus *bus = drvr->bus; struct brcmf_bus *bus = drvr->bus;
unsigned long timeout; unsigned long timeout;
@ -3748,8 +3747,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
bus->drvr->tickcnt = 0; bus->drvr->tickcnt = 0;
brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS); brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS);
if (enforce_mutex) down(&bus->sdsem);
down(&bus->sdsem);
/* Make sure backplane clock is on, needed to generate F2 interrupt */ /* Make sure backplane clock is on, needed to generate F2 interrupt */
brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false); brcmf_sdbrcm_clkctl(bus, CLK_AVAIL, false);
@ -3822,8 +3820,7 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex)
brcmf_sdbrcm_clkctl(bus, CLK_NONE, false); brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);
exit: exit:
if (enforce_mutex) up(&bus->sdsem);
up(&bus->sdsem);
return ret; return ret;
} }