From 4fbb7b81282004d83283d5b23c191cc3e7734fa2 Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Tue, 5 Jul 2011 22:06:00 +0200 Subject: [PATCH] staging: brcm80211: removed brcmf_sdioh_reset() Code cleanup. This function did not perform a reset, hence it was removed. 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 --- drivers/staging/brcm80211/brcmfmac/bcmsdbus.h | 3 --- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 5 ----- drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 8 -------- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 2 -- drivers/staging/brcm80211/brcmfmac/sdio_host.h | 3 --- 5 files changed, 21 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h index 656caebafcdc..eb08152bae0a 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h @@ -97,9 +97,6 @@ extern int brcmf_sdioh_abort(struct sdioh_info *si, uint fnc); extern int brcmf_sdioh_start(struct sdioh_info *si, int stage); extern int brcmf_sdioh_stop(struct sdioh_info *si); -/* Reset and re-initialize the device */ -extern int brcmf_sdioh_reset(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 132b18f8576e..11abd552fdf3 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -545,11 +545,6 @@ uint brcmf_sdcard_query_iofnum(struct brcmf_sdio_card *card) return brcmf_sdioh_query_iofnum(card->sdioh); } -int brcmf_sdcard_reset(struct brcmf_sdio_card *card) -{ - return brcmf_sdioh_reset(card->sdioh); -} - void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card) { ASSERT(card); diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 092d0441d6b0..0f0dc42e7c6c 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -846,14 +846,6 @@ extern int brcmf_sdioh_abort(struct sdioh_info *sd, uint func) return 0; } -/* Reset and re-initialize the device */ -int brcmf_sdioh_reset(struct sdioh_info *si) -{ - sd_trace(("%s: Enter\n", __func__)); - sd_trace(("%s: Exit\n", __func__)); - return 0; -} - /* Disable device interrupt */ void brcmf_sdioh_dev_intr_off(struct sdioh_info *sd) { diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index e43c53a7928a..4b0352f0e191 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -6013,8 +6013,6 @@ int brcmf_bus_devreset(struct brcmf_pub *dhdp, u8 flag) if (bus->dhd->dongle_reset) { /* Turn on WLAN */ - /* Reset SD client */ - brcmf_sdcard_reset(bus->card); /* Attempt to re-attach & download */ if (brcmf_sdbrcm_probe_attach(bus, bus->card, diff --git a/drivers/staging/brcm80211/brcmfmac/sdio_host.h b/drivers/staging/brcm80211/brcmfmac/sdio_host.h index f05067a3089e..df4063c9a4ea 100644 --- a/drivers/staging/brcm80211/brcmfmac/sdio_host.h +++ b/drivers/staging/brcm80211/brcmfmac/sdio_host.h @@ -207,9 +207,6 @@ extern int brcmf_sdcard_iovar_op(struct brcmf_sdio_card *card, const char *name, void *params, int plen, void *arg, int len, bool set); -/* Reset and reinitialize the device */ -extern int brcmf_sdcard_reset(struct brcmf_sdio_card *card); - /* helper functions */ extern void *brcmf_sdcard_get_sdioh(struct brcmf_sdio_card *card); -- 2.20.1