From patchwork Wed Jun 29 23:48:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Franky Lin X-Patchwork-Id: 931092 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5TNpiRC005496 for ; Wed, 29 Jun 2011 23:51:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758280Ab1F2Xvh (ORCPT ); Wed, 29 Jun 2011 19:51:37 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:4623 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758129Ab1F2XtF (ORCPT ); Wed, 29 Jun 2011 19:49:05 -0400 Received: from [10.9.200.131] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Wed, 29 Jun 2011 16:53:15 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Wed, 29 Jun 2011 16:48:39 -0700 Received: from mail-sj1-12.sj.broadcom.com (mail-sj1-12.sj.broadcom.com [10.17.16.106]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 2584974D27; Wed, 29 Jun 2011 16:48:31 -0700 (PDT) Received: from lc-sj1-3560.broadcom.com (lc-sj1-3560.sj.broadcom.com [10.17.194.250]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 3CFD120559; Wed, 29 Jun 2011 16:48:28 -0700 (PDT) Received: by lc-sj1-3560.broadcom.com (Postfix, from userid 25250) id 48D9F2C19D64; Wed, 29 Jun 2011 16:48:24 -0700 (PDT) From: "Franky Lin" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org Subject: [PATCH 097/119] staging: brcm80211: removed brcmf_sdioh_reset() Date: Wed, 29 Jun 2011 16:48:01 -0700 Message-ID: <1309391303-22741-98-git-send-email-frankyl@broadcom.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1309391303-22741-1-git-send-email-frankyl@broadcom.com> References: <1309391303-22741-1-git-send-email-frankyl@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 6215656262O16333079-22-01 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 29 Jun 2011 23:51:46 +0000 (UTC) From: Roland Vossen 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 --- 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 e43c53a..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);