From patchwork Tue Jul 5 22:02:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arend van Spriel X-Patchwork-Id: 946832 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 p65M3aUE024180 for ; Tue, 5 Jul 2011 22:03:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754463Ab1GEWDX (ORCPT ); Tue, 5 Jul 2011 18:03:23 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:2950 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753933Ab1GEWDU (ORCPT ); Tue, 5 Jul 2011 18:03:20 -0400 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Tue, 05 Jul 2011 15:08:08 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Tue, 5 Jul 2011 15:02:54 -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 6EA3174D03; Tue, 5 Jul 2011 15:03:07 -0700 (PDT) Received: from arend-laptop (unknown [10.177.252.250]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 3B07020502; Tue, 5 Jul 2011 15:03:06 -0700 (PDT) Received: from arend by arend-laptop with local (Exim 4.74) ( envelope-from ) id 1QeDhu-0007aJ-5p; Wed, 06 Jul 2011 00:03:02 +0200 From: "Arend van Spriel" To: gregkh@suse.de cc: devel@linuxdriverproject.org, linux-wireless@vger.kernel.org, "Roland Vossen" , "Arend van Spriel" Subject: [PATCH 25/31] staging: brcm80211: removed #ifdef SDIOH_API_ACCESS_RETRY_LIMIT Date: Wed, 6 Jul 2011 00:02:52 +0200 Message-ID: <1309903378-29021-26-git-send-email-arend@broadcom.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309903378-29021-1-git-send-email-arend@broadcom.com> References: <1309903378-29021-1-git-send-email-arend@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 620D54C23B414799205-01-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]); Tue, 05 Jul 2011 22:03:37 +0000 (UTC) From: Roland Vossen SDIOH_API_ACCESS_RETRY_LIMIT is always defined. Signed-off-by: Arend van Spriel --- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index c9e20e1..f4e72ed 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -189,26 +189,20 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, int *err) { int status; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT s32 retry = 0; -#endif u8 data = 0; if (!card) card = l_card; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT do { if (retry) /* wait for 1 ms till bus get settled down */ udelay(1000); -#endif status = brcmf_sdioh_cfg_read(card->sdioh, fnc_num, addr, (u8 *) &data); -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT } while (status != 0 && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); -#endif if (err) *err = status; @@ -223,25 +217,19 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, u8 data, int *err) { int status; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT s32 retry = 0; -#endif if (!card) card = l_card; -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT do { if (retry) /* wait for 1 ms till bus get settled down */ udelay(1000); -#endif status = brcmf_sdioh_cfg_write(card->sdioh, fnc_num, addr, (u8 *) &data); -#ifdef SDIOH_API_ACCESS_RETRY_LIMIT } while (status != 0 && (retry++ < SDIOH_API_ACCESS_RETRY_LIMIT)); -#endif if (err) *err = status;