From patchwork Tue Jul 5 22:02:37 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: 946972 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 p65M492g024540 for ; Tue, 5 Jul 2011 22:04:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754826Ab1GEWEA (ORCPT ); Tue, 5 Jul 2011 18:04:00 -0400 Received: from mms2.broadcom.com ([216.31.210.18]:1435 "EHLO mms2.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754312Ab1GEWDV (ORCPT ); Tue, 5 Jul 2011 18:03:21 -0400 Received: from [10.9.200.131] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Tue, 05 Jul 2011 15:07:49 -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; Tue, 5 Jul 2011 15:03:06 -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 0CF4574D0C; Tue, 5 Jul 2011 15:03:06 -0700 (PDT) Received: from arend-laptop (unknown [10.177.252.250]) by mail-sj1-12.sj.broadcom.com (Postfix) with ESMTP id 4816E2050B; Tue, 5 Jul 2011 15:03:01 -0700 (PDT) Received: from arend by arend-laptop with local (Exim 4.74) ( envelope-from ) id 1QeDhs-0007Za-0Z; Wed, 06 Jul 2011 00:03:00 +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 10/31] staging: brcm80211: removed remains of assert mechanism in fullmac Date: Wed, 6 Jul 2011 00:02:37 +0200 Message-ID: <1309903378-29021-11-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: 620D54BF62O19671835-03-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:09 +0000 (UTC) From: Roland Vossen Reviewed-by: Franky (Zhenhui) Lin Signed-off-by: Arend van Spriel --- drivers/staging/brcm80211/brcmfmac/dhd.h | 9 ---- drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 50 ------------------------ 2 files changed, 0 insertions(+), 59 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 229a702..b4d786f 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd.h +++ b/drivers/staging/brcm80211/brcmfmac/dhd.h @@ -703,7 +703,6 @@ extern uint brcmf_pktgen_len; #define BRCMF_MAX_PKTGEN_LEN 1800 #endif -extern u32 g_assert_type; extern const struct bcmevent_name bcmevent_names[]; extern const int bcmevent_names_size; @@ -815,14 +814,6 @@ extern void brcmf_c_pktfilter_offload_set(struct brcmf_pub *drvr, char *arg); extern void brcmf_c_pktfilter_offload_enable(struct brcmf_pub *drvr, char *arg, int enable, int master_mode); -#ifdef BCMDBG -#define ASSERT(exp) \ - do { if (!(exp)) osl_assert(#exp, __FILE__, __LINE__); } while (0) -extern void osl_assert(char *exp, char *file, int line); -#else -#define ASSERT(exp) do {} while (0) -#endif /* defined(BCMDBG) */ - /* Linux network driver ioctl encoding */ struct brcmf_c_ioctl { uint cmd; /* common ioctl definition */ diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index 0ea8084..1a7752d 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -41,9 +41,6 @@ #include "wl_cfg80211.h" #include "bcmchip.h" -/* Global ASSERT type flag */ -u32 g_assert_type; - #if defined(CONFIG_PM_SLEEP) #include atomic_t brcmf_mmc_suspend; @@ -1739,50 +1736,3 @@ exit: return ret; } #endif /* BCMDBG */ - -#if defined(BCMDBG) -void osl_assert(char *exp, char *file, int line) -{ - char tempbuf[256]; - char *basename; - - basename = strrchr(file, '/'); - /* skip the '/' */ - if (basename) - basename++; - - if (!basename) - basename = file; - - snprintf(tempbuf, 256, - "assertion \"%s\" failed: file \"%s\", line %d\n", exp, - basename, line); - - /* - * Print assert message and give it time to - * be written to /var/log/messages - */ - if (!in_interrupt()) { - const int delay = 3; - printk(KERN_ERR "%s", tempbuf); - printk(KERN_ERR "panic in %d seconds\n", delay); - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(delay * HZ); - } - - switch (g_assert_type) { - case 0: - panic(KERN_ERR "%s", tempbuf); - break; - case 1: - printk(KERN_ERR "%s", tempbuf); - BUG(); - break; - case 2: - printk(KERN_ERR "%s", tempbuf); - break; - default: - break; - } -} -#endif /* defined(BCMDBG) */