Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ff3a896 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed 'enforce_mutex' parameter in fullmac 



Parameter was always called with the value 'true'.

Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarFranky Lin <frankyl@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9ee777a5

drivers/staging/brcm80211/brcmfmac/dhd_bus.h

+2 −2
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ extern void brcmf_bus_unregister(void); 
extern struct device *brcmf_bus_get_device(struct brcmf_bus *bus);



/* 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 */

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. */

extern int brcmf_sdbrcm_bus_txdata(struct brcmf_bus *bus, struct sk_buff *txp);

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -1093,7 +1093,7 @@ int brcmf_bus_start(struct brcmf_pub *drvr) 
	brcmf_dbg(TRACE, "\n");



	/* Bring up the bus */

	ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub, true);

	ret = brcmf_sdbrcm_bus_init(&drvr_priv->pub);

	if (ret != 0) {

		brcmf_dbg(ERROR, "brcmf_sdbrcm_bus_init failed %d\n", ret);

		return ret;
@@ -1217,7 +1217,7 @@ static void brcmf_bus_detach(struct brcmf_pub *drvr) 
			brcmf_proto_stop(&drvr_priv->pub);



			/* Stop the bus module */

			brcmf_sdbrcm_bus_stop(drvr_priv->pub.bus, true);

			brcmf_sdbrcm_bus_stop(drvr_priv->pub.bus);

		}

	}

}

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+10 −13
Original line number Diff line number Diff line
@@ -2720,7 +2720,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data) 
				if (brcmf_sdbrcm_dpc(bus))

					complete(&bus->dpc_wait);

			} else {

				brcmf_sdbrcm_bus_stop(bus, true);

				brcmf_sdbrcm_bus_stop(bus);

			}

		} else

			break;
@@ -2736,8 +2736,9 @@ static void brcmf_sdbrcm_dpc_tasklet(unsigned long data) 
	if (bus->drvr->busstate != BRCMF_BUS_DOWN) {

		if (brcmf_sdbrcm_dpc(bus))

			tasklet_schedule(&bus->tasklet);

	} else

		brcmf_sdbrcm_bus_stop(bus, true);

	} else {

		brcmf_sdbrcm_bus_stop(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;

}



void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex)

void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)

{

	u32 local_hostintmask;

	u8 saveclk;
@@ -3648,7 +3649,6 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex) 


	brcmf_dbg(TRACE, "Enter\n");



	if (enforce_mutex)

	down(&bus->sdsem);



	bus_wake(bus);
@@ -3720,11 +3720,10 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus, bool enforce_mutex) 
	bus->rxskip = false;

	bus->tx_seq = bus->rx_seq = 0;



	if (enforce_mutex)

	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;

	unsigned long timeout;
@@ -3748,7 +3747,6 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) 
	bus->drvr->tickcnt = 0;

	brcmf_sdbrcm_wd_timer(bus, BRCMF_WD_POLL_MS);



	if (enforce_mutex)

	down(&bus->sdsem);



	/* Make sure backplane clock is on, needed to generate F2 interrupt */
@@ -3822,7 +3820,6 @@ int brcmf_sdbrcm_bus_init(struct brcmf_pub *drvr, bool enforce_mutex) 
		brcmf_sdbrcm_clkctl(bus, CLK_NONE, false);



exit:

	if (enforce_mutex)

	up(&bus->sdsem);



	return ret;