diff options
| author | Franky Lin <frankyl@broadcom.com> | 2011-08-12 15:34:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 13:06:39 -0700 |
| commit | 7b687524f78dac9d521051483e7e77154c314be5 (patch) | |
| tree | 65e4d02901bbc8d5d2bc2737ef7159279d024133 /drivers/staging/brcm80211 | |
| parent | 8e8d49663f0beca00b12de11b3a332fd24c23af3 (diff) | |
staging: brcm80211: absorb brcmf_sdioh_interrupt_deregister into brcmf_sdcard_intr_dereg
brcmfmac wrapper function cleanup
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211')
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 8 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 22 | ||||
| -rw-r--r-- | drivers/staging/brcm80211/brcmfmac/sdio_host.h | 2 |
3 files changed, 7 insertions, 25 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index e5cf138100f..6c1b57d2faa 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -189,7 +189,13 @@ int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev) int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev) { - return brcmf_sdioh_interrupt_deregister(sdiodev); + BRCMF_TRACE(("%s: Entering\n", __func__)); + + sdio_claim_host(sdiodev->func[1]); + sdio_release_irq(sdiodev->func[1]); + sdio_release_host(sdiodev->func[1]); + + return 0; } u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr, diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 2e7d3cea867..1dfad3e13e0 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -190,28 +190,6 @@ void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev) } -int brcmf_sdioh_interrupt_deregister(struct brcmf_sdio_dev *sdiodev) -{ - BRCMF_TRACE(("%s: Entering\n", __func__)); - - if (sdiodev->func[1]) { - /* register and unmask irq */ - sdio_claim_host(sdiodev->func[1]); - sdio_release_irq(sdiodev->func[1]); - sdio_release_host(sdiodev->func[1]); - } - - if (sdiodev->func[2]) { - /* Claim host controller F2 */ - sdio_claim_host(sdiodev->func[2]); - sdio_release_irq(sdiodev->func[2]); - /* Release host controller F2 */ - sdio_release_host(sdiodev->func[2]); - } - - return 0; -} - extern int brcmf_sdioh_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr, u8 *data) diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h index bdbf4112434..d9803071d03 100644 --- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h @@ -247,8 +247,6 @@ extern u32 brcmf_sdcard_cur_sbwad(struct brcmf_sdio_dev *sdiodev); extern int brcmf_sdioh_attach(struct brcmf_sdio_dev *sdiodev); extern void brcmf_sdioh_detach(struct brcmf_sdio_dev *sdiodev); -extern int brcmf_sdioh_interrupt_deregister(struct brcmf_sdio_dev *sdiodev); - /* read or write one byte using cmd52 */ extern int brcmf_sdioh_request_byte(struct brcmf_sdio_dev *sdiodev, uint rw, uint fnc, uint addr, u8 *byte); |