From 2d4684a57457c8414c240a3b2e94c357021f901e Mon Sep 17 00:00:00 2001 From: Roland Vossen Date: Wed, 6 Jul 2011 00:02:37 +0200 Subject: [PATCH] staging: brcm80211: removed remains of assert mechanism in fullmac Reviewed-by: Franky (Zhenhui) Lin Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmfmac/dhd.h | 9 ---- .../staging/brcm80211/brcmfmac/dhd_linux.c | 50 ------------------- 2 files changed, 59 deletions(-) diff --git a/drivers/staging/brcm80211/brcmfmac/dhd.h b/drivers/staging/brcm80211/brcmfmac/dhd.h index 229a7028244a..b4d786ff0f6a 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 0ea80842210c..1a7752d5938e 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) */ -- 2.20.1