Commit 7b687524 authored by Franky Lin's avatar Franky Lin Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: absorb brcmf_sdioh_interrupt_deregister into brcmf_sdcard_intr_dereg 



brcmfmac wrapper function cleanup

Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8e8d4966

drivers/staging/brcm80211/brcmfmac/bcmsdh.c

+7 −1
Original line number Diff line number Diff line
@@ -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,

drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c

+0 −22
Original line number Diff line number Diff line
@@ -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)

drivers/staging/brcm80211/brcmfmac/sdio_host.h

+0 −2
Original line number Diff line number Diff line
@@ -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);