From patchwork Tue Jul 5 22:02:33 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: 947012 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 p65M4H7q024638 for ; Tue, 5 Jul 2011 22:04:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754993Ab1GEWEP (ORCPT ); Tue, 5 Jul 2011 18:04:15 -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 S1752612Ab1GEWDM (ORCPT ); Tue, 5 Jul 2011 18:03:12 -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:05 -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:52 -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 845EC74D03; Tue, 5 Jul 2011 15:03:04 -0700 (PDT) Received: from arend-laptop (unknown [10.177.252.250]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id F257220507; Tue, 5 Jul 2011 15:03:00 -0700 (PDT) Received: from arend by arend-laptop with local (Exim 4.74) ( envelope-from ) id 1QeDhr-0007ZL-GE; Wed, 06 Jul 2011 00:02:59 +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 06/31] staging: brcm80211: removed asserts from bcmsdh.c Date: Wed, 6 Jul 2011 00:02:33 +0200 Message-ID: <1309903378-29021-7-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: 620D54CF3B414799176-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:04:18 +0000 (UTC) From: Roland Vossen Reviewed-by: Franky (Zhenhui) Lin Signed-off-by: Arend van Spriel --- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 36 --------------------------- 1 files changed, 0 insertions(+), 36 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index cecb291..97c0f9d 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -119,30 +119,22 @@ brcmf_sdcard_iovar_op(struct brcmf_sdio_card *card, const char *name, int brcmf_sdcard_intr_enable(struct brcmf_sdio_card *card) { - ASSERT(card); - return brcmf_sdioh_interrupt_set(card->sdioh, true); } int brcmf_sdcard_intr_disable(struct brcmf_sdio_card *card) { - ASSERT(card); - return brcmf_sdioh_interrupt_set(card->sdioh, false); } int brcmf_sdcard_intr_reg(struct brcmf_sdio_card *card, void (*fn)(void *), void *argh) { - ASSERT(card); - return brcmf_sdioh_interrupt_register(card->sdioh, fn, argh); } int brcmf_sdcard_intr_dereg(struct brcmf_sdio_card *card) { - ASSERT(card); - return brcmf_sdioh_interrupt_deregister(card->sdioh); } @@ -158,8 +150,6 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, if (!card) card = l_card; - ASSERT(card->init_success); - #ifdef SDIOH_API_ACCESS_RETRY_LIMIT do { if (retry) /* wait for 1 ms till bus get settled down */ @@ -193,8 +183,6 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_card *card, uint fnc_num, u32 addr, if (!card) card = l_card; - ASSERT(card->init_success); - #ifdef SDIOH_API_ACCESS_RETRY_LIMIT do { if (retry) /* wait for 1 ms till bus get settled down */ @@ -223,8 +211,6 @@ u32 brcmf_sdcard_cfg_read_word(struct brcmf_sdio_card *card, uint fnc_num, if (!card) card = l_card; - ASSERT(card->init_success); - status = brcmf_sdioh_request_word(card->sdioh, SDIOH_CMD_TYPE_NORMAL, SDIOH_READ, fnc_num, addr, &data, 4); @@ -246,8 +232,6 @@ brcmf_sdcard_cfg_write_word(struct brcmf_sdio_card *card, uint fnc_num, if (!card) card = l_card; - ASSERT(card->init_success); - status = brcmf_sdioh_request_word(card->sdioh, SDIOH_CMD_TYPE_NORMAL, SDIOH_WRITE, fnc_num, addr, &data, 4); @@ -272,10 +256,6 @@ int brcmf_sdcard_cis_read(struct brcmf_sdio_card *card, uint func, u8 * cis, if (!card) card = l_card; - ASSERT(card->init_success); - ASSERT(cis); - ASSERT(length <= SBSDIO_CIS_SIZE_LIMIT); - status = brcmf_sdioh_cis_read(card->sdioh, func, cis, length); if (ascii) { @@ -330,8 +310,6 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_card *card, u32 addr, uint size) if (!card) card = l_card; - ASSERT(card->init_success); - if (bar0 != card->sbwad) { if (brcmf_sdcard_set_sbaddr_window(card, bar0)) return 0xFFFFFFFF; @@ -384,8 +362,6 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_card *card, u32 addr, uint size, if (!card) card = l_card; - ASSERT(card->init_success); - if (bar0 != card->sbwad) { err = brcmf_sdcard_set_sbaddr_window(card, bar0); if (err) @@ -429,14 +405,10 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_card *card, u32 addr, uint fn, uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; int err = 0; - ASSERT(card); - ASSERT(card->init_success); - BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n", __func__, fn, addr, nbytes)); /* Async not implemented yet */ - ASSERT(!(flags & SDIO_REQ_ASYNC)); if (flags & SDIO_REQ_ASYNC) return -ENOTSUPP; @@ -473,14 +445,10 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_card *card, u32 addr, uint fn, uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK; int err = 0; - ASSERT(card); - ASSERT(card->init_success); - BRCMF_SD_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n", __func__, fn, addr, nbytes)); /* Async not implemented yet */ - ASSERT(!(flags & SDIO_REQ_ASYNC)); if (flags & SDIO_REQ_ASYNC) return -ENOTSUPP; @@ -506,10 +474,6 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_card *card, u32 addr, uint fn, int brcmf_sdcard_rwdata(struct brcmf_sdio_card *card, uint rw, u32 addr, u8 *buf, uint nbytes) { - ASSERT(card); - ASSERT(card->init_success); - ASSERT((addr & SBSDIO_SBWINDOW_MASK) == 0); - addr &= SBSDIO_SB_OFT_ADDR_MASK; addr |= SBSDIO_SB_ACCESS_2_4B_FLAG;