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>

diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index e5cf138100f1289208de60798823f3173ad73490..6c1b57d2faa5075412a7cea1b480ea154b7e899b 100644 (file)
--- 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 2e7d3cea867bb6aba58898121a886b51b442fa8d..1dfad3e13e0c3243c21efdb10e6f888cff5692fe 100644 (file)
--- 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 bdbf41124340611532b405472b8c0de4bebe8875..d9803071d033d8e96c7383801546a1848c272f5b 100644 (file)
--- 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);