staging: brcm80211: removed brcmf_sdioh_interrupt_pending()

Code cleanup. This function always returned 0.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Franky Lin <frankyl@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/bcmsdbus.h b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
index ee01e488c1b83bc1bfc5de77c1fcfdbed8d40350..656caebafcdc39b23f0cc6ce201cdbe46be24bad 100644 (file)
--- 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 4c7e4a9aa7ca5c7a279a639c958e00affd171991..132b18f8576eed7980f727886a2f13b6cd278240 100644 (file)
--- 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 d0e9b3d06cd69c52e355ced30d52dd87277e2f35..092d0441d6b0e5ec920a7de37fc40d217c7615b3 100644 (file)
--- 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 3ed9e12d8acd90ccdf1099bd6ce614760904467b..e43c53a7928a1b030d1f684857d31db0727160b0 100644 (file)
--- 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 5c5bbcae46f816aded8735dc7aa58437acd978fc..f05067a3089eee34e1c91dcb16398c426be9dc94 100644 (file)
--- 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.
  */