From: Roland Vossen Date: Tue, 5 Jul 2011 20:05:59 +0000 (+0200) Subject: staging: brcm80211: removed brcmf_sdioh_interrupt_pending() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7d72d3064eccd1a0a0509c1b39c000113c6d0c95;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: brcm80211: removed brcmf_sdioh_interrupt_pending() Code cleanup. This function always returned 0. Signed-off-by: Roland Vossen Reviewed-by: Arend van Spriel Reviewed-by: Franky Lin Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h index ee01e488c1b8..656caebafcdc 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h @@ -53,10 +53,6 @@ brcmf_sdioh_interrupt_query(struct sdioh_info *si, bool *onoff); extern int brcmf_sdioh_interrupt_set(struct sdioh_info *si, bool enable_disable); -#if defined(BCMDBG) -extern bool brcmf_sdioh_interrupt_pending(struct sdioh_info *si); -#endif - extern int brcmf_sdioh_claim_host_and_lock(struct sdioh_info *si); extern int brcmf_sdioh_release_host_and_unlock(struct sdioh_info *si); diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 4c7e4a9aa7ca..132b18f8576e 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -138,14 +138,6 @@ int brcmf_sdcard_intr_dereg(struct brcmf_sdio_card *card) return brcmf_sdioh_interrupt_deregister(card->sdioh); } -#if defined(BCMDBG) -bool brcmf_sdcard_intr_pending(struct brcmf_sdio_card *card) -{ - ASSERT(card); - return brcmf_sdioh_interrupt_pending(card->sdioh); -} -#endif - int brcmf_sdcard_devremove_reg(struct brcmf_sdio_card *card, brcmf_sdiocard_cb_fn_t fn, void *argh) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index d0e9b3d06cd6..092d0441d6b0 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -244,13 +244,6 @@ brcmf_sdioh_interrupt_query(struct sdioh_info *sd, bool *onoff) return 0; } -#if defined(BCMDBG) -extern bool brcmf_sdioh_interrupt_pending(struct sdioh_info *sd) -{ - return 0; -} -#endif - uint brcmf_sdioh_query_iofnum(struct sdioh_info *sd) { return sd->num_funcs; diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 3ed9e12d8acd..e43c53a7928a 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -1889,8 +1889,7 @@ void brcmf_sdbrcm_bus_dump(struct brcmf_pub *dhdp, struct brcmu_strbuf *strbuf) #endif /* SDTEST */ #ifdef BCMDBG brcmu_bprintf(strbuf, "dpc_sched %d host interrupt%spending\n", - bus->dpc_sched, - (brcmf_sdcard_intr_pending(bus->card) ? " " : " not ")); + bus->dpc_sched, " not "); brcmu_bprintf(strbuf, "blocksize %d roundup %d\n", bus->blocksize, bus->roundup); #endif /* BCMDBG */ diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h index 5c5bbcae46f8..f05067a3089e 100644 --- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h @@ -93,11 +93,6 @@ brcmf_sdcard_intr_reg(struct brcmf_sdio_card *card, brcmf_sdiocard_cb_fn_t fn, extern int brcmf_sdcard_intr_dereg(struct brcmf_sdio_card *card); -#if defined(BCMDBG) -/* Query pending interrupt status from the host controller */ -extern bool brcmf_sdcard_intr_pending(struct brcmf_sdio_card *card); -#endif - /* Register a callback to be called on device removal. * No-op in the case of non-removable/hardwired devices. */