Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2d4684a5 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: removed remains of assert mechanism in fullmac 



Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8c405d82

drivers/staging/brcm80211/brcmfmac/dhd.h

+0 −9
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

+0 −50
Original line number Diff line number Diff line
@@ -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 <linux/suspend.h>

atomic_t brcmf_mmc_suspend;
@@ -1739,50 +1736,3 @@ int brcmf_write_to_file(struct brcmf_pub *drvr, u8 *buf, int size) 
	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) */