Commit 70736b97 authored Apr 19, 2019 by Wen Gong Committed by Kalle Valo Apr 23, 2019

ath10k: don't disable interrupts in ath10k_sdio_remove()

Disabling interrupts this early meant WMI communication was not working anymore
when the SDIO device was removed. But we call ath10k_core_unregister() that
will eventually call ath10k_sdio_hif_stop(), which disables the interrupts. So
there's actually no need to disable interrupts here.

Also remove cancel_work_sync() as it's also called in ath10k_sdio_hif_stop().

Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00007-QCARMSWP-1.

Signed-off-by: Wen Gong <wgong@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

parent 4504f0e5

drivers/net/wireless/ath/ath10k/sdio.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2073,8 +2073,6 @@ static void ath10k_sdio_remove(struct sdio_func *func)
		"sdio removed func %d vendor 0x%x device 0x%x\n",
		func->num, func->vendor, func->device);

		(void)ath10k_sdio_hif_disable_intrs(ar);
		cancel_work_sync(&ar_sdio->wr_async_work);
		ath10k_core_unregister(ar);
		ath10k_core_destroy(ar);
		}

Admin message