From: Roland Vossen Date: Tue, 5 Jul 2011 20:06:01 +0000 (+0200) Subject: staging: brcm80211: removed brcmf_sdioh_start() and brcmf_sdioh_stop() X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=69c9070cb1d09c6dc6c9ad0e3e79d2c8435d886e;p=linux-beck.git staging: brcm80211: removed brcmf_sdioh_start() and brcmf_sdioh_stop() Code cleanup. These functions were empty. 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 eb08152bae0a..761ec209fb22 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h @@ -93,10 +93,6 @@ extern int brcmf_sdioh_iovar_op(struct sdioh_info *si, const char *name, /* Issue abort to the specified function and clear controller as needed */ extern int brcmf_sdioh_abort(struct sdioh_info *si, uint fnc); -/* Start and Stop SDIO without re-enumerating the SD card. */ -extern int brcmf_sdioh_start(struct sdioh_info *si, int stage); -extern int brcmf_sdioh_stop(struct sdioh_info *si); - /* Helper function */ void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card); diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 11abd552fdf3..09bad40c01ed 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -521,16 +521,6 @@ int brcmf_sdcard_abort(struct brcmf_sdio_card *card, uint fn) return brcmf_sdioh_abort(card->sdioh, fn); } -int brcmf_sdcard_start(struct brcmf_sdio_card *card, int stage) -{ - return brcmf_sdioh_start(card->sdioh, stage); -} - -int brcmf_sdcard_stop(struct brcmf_sdio_card *card) -{ - return brcmf_sdioh_stop(card->sdioh); -} - int brcmf_sdcard_query_device(struct brcmf_sdio_card *card) { card->vendevid = (PCI_VENDOR_ID_BROADCOM << 16) | 0; diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 0f0dc42e7c6c..7da200f9b7a0 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -921,13 +921,3 @@ static void brcmf_sdioh_irqhandler_f2(struct sdio_func *func) ASSERT(sd != NULL); } - -int brcmf_sdioh_start(struct sdioh_info *si, int stage) -{ - return 0; -} - -int brcmf_sdioh_stop(struct sdioh_info *si) -{ - return 0; -} diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h index df4063c9a4ea..712d0dff0d0d 100644 --- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h @@ -190,12 +190,6 @@ extern int brcmf_sdcard_rwdata(struct brcmf_sdio_card *card, uint rw, u32 addr, /* Issue an abort to the specified function */ extern int brcmf_sdcard_abort(struct brcmf_sdio_card *card, uint fn); -/* Start SDIO Host Controller communication */ -extern int brcmf_sdcard_start(struct brcmf_sdio_card *card, int stage); - -/* Stop SDIO Host Controller communication */ -extern int brcmf_sdcard_stop(struct brcmf_sdio_card *card); - /* Returns the "Device ID" of target device on the SDIO bus. */ extern int brcmf_sdcard_query_device(struct brcmf_sdio_card *card);