diff options
| author | Roland Vossen <rvossen@broadcom.com> | 2011-05-03 11:35:52 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-03 12:42:45 -0700 |
| commit | 13f401cb5320a027ab79c53f5089b0a0c8bd5adb (patch) | |
| tree | 1a469dd02a9a737d66bb5391661d0cbf0d5c5a6c /drivers/staging/brcm80211/util/bcmutils.c | |
| parent | 93af5a4833ae3387fa929ff2821251aca81ccbe0 (diff) | |
| download | linux-13f401cb5320a027ab79c53f5089b0a0c8bd5adb.tar.gz | |
staging: brcm80211: moved ASSERT logic to fullmac driver
Code cleanup. Softmac driver does not use ASSERTs anymore.
Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util/bcmutils.c')
| -rw-r--r-- | drivers/staging/brcm80211/util/bcmutils.c | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c index e23e2e9e8073..68a0dc65f158 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c @@ -28,9 +28,6 @@ #include <bcmdevs.h> #include <proto/802.11.h> -/* Global ASSERT type flag */ -u32 g_assert_type; - struct sk_buff *BCMFASTPATH pkt_buf_get_skb(uint len) { struct sk_buff *skb; @@ -1044,50 +1041,3 @@ int bcm_bprintf(struct bcmstrbuf *b, const char *fmt, ...) return r; } - -#if defined(BCMDBG_ASSERT) -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_ASSERT) */ |