From ac3ab43f54aee6f8bb7b68397d8625c3d9349c6f Mon Sep 17 00:00:00 2001
From: Roland Vossen <rvossen@broadcom.com>
Date: Fri, 26 Aug 2011 15:19:38 +0200
Subject: [PATCH] --- yaml --- r: 268025 b: refs/heads/master c:
 38a02acde38eabee56c273ce0973af2d8139932a h: refs/heads/master i:   268023:
 aab25e62dd6c80557bc98064ce2ffa665ab1337c v: v3

---
 [refs]                                           |  2 +-
 .../staging/brcm80211/brcmsmac/mac80211_if.c     |  4 ----
 .../staging/brcm80211/brcmsmac/phy/phy_cmn.c     |  2 --
 .../staging/brcm80211/brcmsmac/phy/phy_int.h     | 16 ----------------
 4 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 585162bcc12b..f4892f5e576b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cc698552f3ba1f59f96672229a74e4647b82ed51
+refs/heads/master: 38a02acde38eabee56c273ce0973af2d8139932a
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
index 9b787e6c0880..01829db4fe81 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/mac80211_if.c
@@ -105,8 +105,6 @@ MODULE_DEVICE_TABLE(pci, brcms_pci_id_table);
 #ifdef BCMDBG
 static int msglevel = 0xdeadbeef;
 module_param(msglevel, int, 0);
-static int phymsglevel = 0xdeadbeef;
-module_param(phymsglevel, int, 0);
 #endif				/* BCMDBG */
 
 #define HW_TO_WL(hw)	 (hw->priv)
@@ -1282,8 +1280,6 @@ static int __init brcms_module_init(void)
 #ifdef BCMDBG
 	if (msglevel != 0xdeadbeef)
 		brcm_msg_level = msglevel;
-	if (phymsglevel != 0xdeadbeef)
-		phyhal_msg_level = phymsglevel;
 #endif				/* BCMDBG */
 
 	error = pci_register_driver(&brcms_pci_driver);
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
index 3d54a3942a68..bd602de84d14 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -27,8 +27,6 @@
 #include "phy_lcn.h"
 #include "phyreg_n.h"
 
-u32 phyhal_msg_level = PHYHAL_ERROR;
-
 struct chan_info_basic {
 	u16 chan;
 	u16 freq;
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
index 7ec2ad253e8f..a06e7190bcdb 100644
--- a/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
+++ b/trunk/drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
@@ -23,22 +23,6 @@
 
 #define	PHY_VERSION			{ 1, 82, 8, 0 }
 
-#define PHYHAL_ERROR	0x0001
-#define PHYHAL_TRACE	0x0002
-#define PHYHAL_INFORM	0x0004
-
-extern u32 phyhal_msg_level;
-
-#define PHY_INFORM_ON()		(phyhal_msg_level & PHYHAL_INFORM)
-#define PHY_THERMAL_ON()	(phyhal_msg_level & PHYHAL_THERMAL)
-#define PHY_CAL_ON()		(phyhal_msg_level & PHYHAL_CAL)
-
-#ifdef BOARD_TYPE
-#define BOARDTYPE(_type) BOARD_TYPE
-#else
-#define BOARDTYPE(_type) _type
-#endif
-
 #define LCNXN_BASEREV		16
 
 struct phy_shim_info;