From: "Arend van Spriel" <arend@broadcom.com>
To: gregkh@suse.de
Cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org,
"Roland Vossen" <rvossen@broadcom.com>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH v2 04/21] staging: brcm80211: removed brcmf_sdioh_reset()
Date: Tue, 5 Jul 2011 22:06:00 +0200 [thread overview]
Message-ID: <1309896377-4425-5-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1309896377-4425-1-git-send-email-arend@broadcom.com>
From: Roland Vossen <rvossen@broadcom.com>
Code cleanup. This function did not perform a reset, hence it was removed.
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>
---
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, 0 insertions(+), 21 deletions(-)
diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h b/drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
index 656caeb..eb08152 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 132b18f..11abd55 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 092d044..0f0dc42 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 e43c53a7..4b0352f 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 f05067a..df4063c 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);
--
1.7.4.1
next prev parent reply other threads:[~2011-07-05 20:06 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-05 20:05 [PATCH v2 00/21] staging: brcm80211: mostly fullmac cleanup patches Arend van Spriel
2011-07-05 20:05 ` [PATCH v2 01/21] staging: brcm80211: removed last occurrences of bcmsdh/BCMSDH Arend van Spriel
2011-07-05 20:05 ` [PATCH v2 02/21] staging: brcm80211: sdh related code cleanup Arend van Spriel
2011-07-05 20:05 ` [PATCH v2 03/21] staging: brcm80211: removed brcmf_sdioh_interrupt_pending() Arend van Spriel
2011-07-05 20:06 ` Arend van Spriel [this message]
2011-07-05 20:06 ` [PATCH v2 05/21] staging: brcm80211: removed brcmf_sdioh_start() and brcmf_sdioh_stop() Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 06/21] staging: brcm80211: removed file sdiovar.h Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 07/21] staging: brcm80211: further cleaned fullmac header files Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 08/21] staging: brcm80211: rename function variables Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 09/21] staging: brcm80211: rename dhd_bus structure and functions Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 10/21] staging: brcm80211: removed last typedefs from fullmac Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 11/21] staging: brcm80211: removed unused code and definitions " Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 12/21] staging: brcm80211: fullmac register access macro's take u32 instead of pointers Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 13/21] staging: brcm80211: replaced macro R_SDREG by function r_sdreg() Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 14/21] staging: brcm80211: replaced macro W_SDREG by function w_sdreg() Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 15/21] staging: brcm80211: got rid of redundant member 'regs' of struct dhd_bus Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 16/21] staging: brcm80211: removed last amd64 compiler warnings Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 17/21] staging: brcm80211: W_REG macro cleanup in fullmac SDIO Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 18/21] staging: brcm80211: removed unused definitions from dhd_sdio.c Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 19/21] staging: brcm80211: rename structures and variables in wl_cfg80211.c Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 20/21] staging: brcm80211: rename pointer conversion macros in wl_cfg80211.h Arend van Spriel
2011-07-05 20:06 ` [PATCH v2 21/21] staging: brcm80211: rename external function in wl_cfg80211.c Arend van Spriel
2011-07-05 20:38 ` [PATCH v2 00/21] staging: brcm80211: mostly fullmac cleanup patches Rafał Miłecki
2011-07-05 21:40 ` Arend van Spriel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309896377-4425-5-git-send-email-arend@broadcom.com \
--to=arend@broadcom.com \
--cc=devel@linuxdriverproject.org \
--cc=gregkh@suse.de \
--cc=linux-wireless@vger.kernel.org \
--cc=rvossen@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).