Commit da4ef2ae authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

staging: brcm80211: removed wl_dbg.h

Code cleanup. Reducing number of header files. Merged into wlc_types.h.
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5706e3de
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include "wlc_channel.h" #include "wlc_channel.h"
#include "wlc_scb.h" #include "wlc_scb.h"
#include "wlc_pub.h" #include "wlc_pub.h"
#include "wl_dbg.h"
#include "wl_export.h" #include "wl_export.h"
#include "ucode_loader.h" #include "ucode_loader.h"
#include "brcms_mac80211.h" #include "brcms_mac80211.h"
......
/*
* Copyright (c) 2010 Broadcom Corporation
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
* SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#ifndef _wl_dbg_h_
#define _wl_dbg_h_
#include <linux/device.h> /* dev_err() */
/* brcm_msg_level is a bit vector with defs in bcmdefs.h */
extern u32 brcm_msg_level;
#define BCMMSG(dev, fmt, args...) \
do { \
if (brcm_msg_level & LOG_TRACE_VAL) \
wiphy_err(dev, "%s: " fmt, __func__, ##args); \
} while (0)
#define WL_ERROR_ON() (brcm_msg_level & LOG_ERROR_VAL)
#endif /* _wl_dbg_h_ */
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "wlc_pub.h" #include "wlc_pub.h"
#include "wlc_key.h" #include "wlc_key.h"
#include "wlc_alloc.h" #include "wlc_alloc.h"
#include "wl_dbg.h"
#include "wlc_rate.h" #include "wlc_rate.h"
#include "wlc_bsscfg.h" #include "wlc_bsscfg.h"
#include "phy/wlc_phy_hal.h" #include "phy/wlc_phy_hal.h"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "phy/wlc_phy_hal.h" #include "phy/wlc_phy_hal.h"
#include "wlc_antsel.h" #include "wlc_antsel.h"
#include "wl_export.h" #include "wl_export.h"
#include "wl_dbg.h"
#include "wlc_channel.h" #include "wlc_channel.h"
#include "wlc_main.h" #include "wlc_main.h"
#include "wlc_ampdu.h" #include "wlc_ampdu.h"
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include "wlc_key.h" #include "wlc_key.h"
#include "wlc_scb.h" #include "wlc_scb.h"
#include "wlc_pub.h" #include "wlc_pub.h"
#include "wl_dbg.h"
#include "phy/wlc_phy_hal.h" #include "phy/wlc_phy_hal.h"
#include "wlc_bmac.h" #include "wlc_bmac.h"
#include "wlc_channel.h" #include "wlc_channel.h"
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include "ucode_loader.h" #include "ucode_loader.h"
#include "wlc_antsel.h" #include "wlc_antsel.h"
#include "wlc_alloc.h" #include "wlc_alloc.h"
#include "wl_dbg.h"
#include "wlc_bmac.h" #include "wlc_bmac.h"
#define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */ #define TIMER_INTERVAL_WATCHDOG_BMAC 1000 /* watchdog timer, in unit of ms */
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
#include "wlc_channel.h" #include "wlc_channel.h"
#include "wlc_main.h" #include "wlc_main.h"
#include "wlc_stf.h" #include "wlc_stf.h"
#include "wl_dbg.h"
#define VALID_CHANNEL20_DB(wlc, val) wlc_valid_channel20_db((wlc)->cmi, val) #define VALID_CHANNEL20_DB(wlc, val) wlc_valid_channel20_db((wlc)->cmi, val)
#define VALID_CHANNEL20_IN_BAND(wlc, bandunit, val) \ #define VALID_CHANNEL20_IN_BAND(wlc, bandunit, val) \
......
...@@ -48,7 +48,6 @@ ...@@ -48,7 +48,6 @@
#include "wlc_ampdu.h" #include "wlc_ampdu.h"
#include "wl_export.h" #include "wl_export.h"
#include "wlc_alloc.h" #include "wlc_alloc.h"
#include "wl_dbg.h"
#include "brcms_mac80211.h" #include "brcms_mac80211.h"
/* /*
......
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <wlc_pmu.h> #include <wlc_pmu.h>
#include "wlc_types.h" #include "wlc_types.h"
#include "wl_dbg.h"
#include "wlc_cfg.h" #include "wlc_cfg.h"
#include "d11.h" #include "d11.h"
#include "wlc_rate.h" #include "wlc_rate.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "wlc_types.h" #include "wlc_types.h"
#include "d11.h" #include "d11.h"
#include "wl_dbg.h"
#include "wlc_cfg.h" #include "wlc_cfg.h"
#include "wlc_scb.h" #include "wlc_scb.h"
#include "wlc_pub.h" #include "wlc_pub.h"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include "wlc_types.h" #include "wlc_types.h"
#include "d11.h" #include "d11.h"
#include "wl_dbg.h"
#include "wlc_cfg.h" #include "wlc_cfg.h"
#include "wlc_rate.h" #include "wlc_rate.h"
#include "wlc_scb.h" #include "wlc_scb.h"
......
...@@ -33,6 +33,14 @@ ...@@ -33,6 +33,14 @@
#define MAX_DMA_SEGS 4 #define MAX_DMA_SEGS 4
#define BCMMSG(dev, fmt, args...) \
do { \
if (brcm_msg_level & LOG_TRACE_VAL) \
wiphy_err(dev, "%s: " fmt, __func__, ##args); \
} while (0)
#define WL_ERROR_ON() (brcm_msg_level & LOG_ERROR_VAL)
/* forward declarations */ /* forward declarations */
struct sk_buff; struct sk_buff;
struct brcms_info; struct brcms_info;
...@@ -49,4 +57,7 @@ struct wlc_bsscfg; ...@@ -49,4 +57,7 @@ struct wlc_bsscfg;
struct bcmstrbuf; struct bcmstrbuf;
struct si_pub; struct si_pub;
/* brcm_msg_level is a bit vector with defs in bcmdefs.h */
extern u32 brcm_msg_level;
#endif /* _wlc_types_h_ */ #endif /* _wlc_types_h_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment