staging: brcm80211: remove threads_only code from fullmac (bd42e67b) · Commits · 戴 / test

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+30 −70

Original line number	Diff line number	Diff line
		@@ -651,11 +651,9 @@ struct brcmf_bus {
		bool wd_timer_valid;
		uint save_ms;

		struct tasklet_struct tasklet;
		struct task_struct *dpc_tsk;
		struct completion dpc_wait;

		bool threads_only;
		struct semaphore sdsem;

		const char *fw_name;
		@@ -2704,29 +2702,6 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
		return 0;
		}

		static void brcmf_sdbrcm_dpc_tasklet(unsigned long data)
		{
		struct brcmf_bus bus = (struct brcmf_bus ) data;

		/* Call bus dpc unless it indicated down (then clean stop) */
		if (bus->drvr->busstate != BRCMF_BUS_DOWN) {
		if (brcmf_sdbrcm_dpc(bus))
		tasklet_schedule(&bus->tasklet);
		} else {
		brcmf_sdbrcm_bus_stop(bus);
		}
		}

		static void brcmf_sdbrcm_sched_dpc(struct brcmf_bus *bus)
		{
		if (bus->dpc_tsk) {
		complete(&bus->dpc_wait);
		return;
		}

		tasklet_schedule(&bus->tasklet);
		}

		int brcmf_sdbrcm_bus_txdata(struct brcmf_bus bus, struct sk_buff pkt)
		{
		int ret = -EBADE;
		@@ -2770,7 +2745,8 @@ int brcmf_sdbrcm_bus_txdata(struct brcmf_bus bus, struct sk_buff pkt)
		/* Schedule DPC if needed to send queued packet(s) */
		if (!bus->dpc_sched) {
		bus->dpc_sched = true;
		brcmf_sdbrcm_sched_dpc(bus);
		if (bus->dpc_tsk)
		complete(&bus->dpc_wait);
		}

		return ret;
		@@ -3642,8 +3618,7 @@ void brcmf_sdbrcm_bus_stop(struct brcmf_bus *bus)
		send_sig(SIGTERM, bus->dpc_tsk, 1);
		kthread_stop(bus->dpc_tsk);
		bus->dpc_tsk = NULL;
		} else
		tasklet_kill(&bus->tasklet);
		}

		/* Disable and clear interrupts at the chip level also */
		w_sdreg32(bus, 0, offsetof(struct sdpcmd_regs, hostintmask), &retries);
		@@ -3831,7 +3806,8 @@ void brcmf_sdbrcm_isr(void *arg)
		brcmf_dbg(ERROR, "isr w/o interrupt configured!\n");

		bus->dpc_sched = true;
		brcmf_sdbrcm_sched_dpc(bus);
		if (bus->dpc_tsk)
		complete(&bus->dpc_wait);
		}

		static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
		@@ -3875,8 +3851,8 @@ static bool brcmf_sdbrcm_bus_watchdog(struct brcmf_pub *drvr)
		bus->ipend = true;

		bus->dpc_sched = true;
		brcmf_sdbrcm_sched_dpc(bus);

		if (bus->dpc_tsk)
		complete(&bus->dpc_wait);
		}
		}

		@@ -4366,21 +4342,13 @@ brcmf_sdbrcm_watchdog(unsigned long data)
		{
		struct brcmf_bus bus = (struct brcmf_bus )data;

		if (bus->threads_only) {
		if (bus->watchdog_tsk)
		if (bus->watchdog_tsk) {
		complete(&bus->watchdog_wait);
		else
		return;
		} else {
		brcmf_sdbrcm_bus_watchdog(bus->drvr);

		/* Count the tick for reference */
		bus->drvr->tickcnt++;
		}

		/* Reschedule the watchdog */
		if (bus->wd_timer_valid)
		mod_timer(&bus->timer, jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
		mod_timer(&bus->timer,
		jiffies + BRCMF_WD_POLL_MS * HZ / 1000);
		}
		}

		static void
		@@ -4465,7 +4433,6 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
		bus->tx_seq = SDPCM_SEQUENCE_WRAP - 1;
		bus->usebufpool = false; /* Use bufpool if allocated,
		else use locally malloced rxbuf */
		bus->threads_only = true;

		/* attempt to attach to the dongle */
		if (!(brcmf_sdbrcm_probe_attach(bus, regsva))) {
		@@ -4483,7 +4450,6 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
		bus->timer.function = brcmf_sdbrcm_watchdog;

		/* Initialize thread based operation and lock */
		if (bus->threads_only) {
		sema_init(&bus->sdsem, 1);

		/* Initialize watchdog thread */
		@@ -4504,12 +4470,6 @@ void *brcmf_sdbrcm_probe(u16 bus_no, u16 slot, u16 func, uint bustype,
		"brcmf_dpc thread failed to start\n");
		bus->dpc_tsk = NULL;
		}
		} else {
		bus->watchdog_tsk = NULL;
		bus->dpc_tsk = NULL;
		tasklet_init(&bus->tasklet, brcmf_sdbrcm_dpc_tasklet,
		(unsigned long)bus);
		}

		/* Attach to the brcmf/OS/network interface */
		bus->drvr = brcmf_attach(bus, SDPCM_RESERVE);

Admin message