| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283 |
- From: Christian Daudt <csd@broadcom.com>
- Date: Wed, 11 May 2016 15:06:49 -0700
- Subject: [PATCH] brcmfmac: Fix 'did not remove int handler' warning
- brcmf_sdiod_intr_unregister call that removes both func1 and
- func2 interrupt handlers only called when brcmf_ops_sdio_remove
- is called for func 1 (which is the 2nd call) but sdio is expecting
- it to be removed at the end of each sdio_remove call.
- This is causing 'rmmod bcmrfmac' on a 4356-sdio chip to complain
- with:
- WARNING: driver brcmfmac did not remove its interrupt handler!
- The modification makes calling brcmf_sdiod_intr_unregister multiple
- times harmless by clearing the variables that track if interrupt
- handlers have been installed, and then calls it on every
- brcmf_ops_sdio_remove call instead of just remove for func 1.
- Signed-off-by: Christian Daudt <csd@broadcom.com>
- Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
- ---
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
- @@ -172,7 +172,7 @@ int brcmf_sdiod_intr_register(struct brc
- return 0;
- }
-
- -int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)
- +void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)
- {
-
- brcmf_dbg(SDIO, "Entering oob=%d sd=%d\n",
- @@ -195,6 +195,7 @@ int brcmf_sdiod_intr_unregister(struct b
- }
- free_irq(pdata->oob_irq_nr, &sdiodev->func[1]->dev);
- sdiodev->irq_en = false;
- + sdiodev->oob_irq_requested = false;
- }
-
- if (sdiodev->sd_irq_requested) {
- @@ -202,9 +203,8 @@ int brcmf_sdiod_intr_unregister(struct b
- sdio_release_irq(sdiodev->func[2]);
- sdio_release_irq(sdiodev->func[1]);
- sdio_release_host(sdiodev->func[1]);
- + sdiodev->sd_irq_requested = false;
- }
- -
- - return 0;
- }
-
- void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
- @@ -1201,12 +1201,17 @@ static void brcmf_ops_sdio_remove(struct
- brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device);
- brcmf_dbg(SDIO, "Function: %d\n", func->num);
-
- - if (func->num != 1)
- - return;
- -
- bus_if = dev_get_drvdata(&func->dev);
- if (bus_if) {
- sdiodev = bus_if->bus_priv.sdio;
- +
- + /* start by unregistering irqs */
- + brcmf_sdiod_intr_unregister(sdiodev);
- +
- + if (func->num != 1)
- + return;
- +
- + /* only proceed with rest of cleanup if func 1 */
- brcmf_sdiod_remove(sdiodev);
-
- dev_set_drvdata(&sdiodev->func[1]->dev, NULL);
- --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
- +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
- @@ -294,7 +294,7 @@ struct sdpcmd_regs {
-
- /* Register/deregister interrupt handler. */
- int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev);
- -int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev);
- +void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev);
-
- /* sdio device register access interface */
- u8 brcmf_sdiod_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret);
|
