[PATCH 815/961] staging: brcm80211: lower number of wlc_bsscfg.h includes

Greg Kroah-Hartman gregkh at suse.de
Wed Mar 16 21:07:38 UTC 2011


From: Roland Vossen <rvossen at broadcom.com>

Code cleanup.

Signed-off-by: Roland Vossen <rvossen at broadcom.com>
Reviewed-by: Arend van Spriel <arend at broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c    |    1 -
 drivers/staging/brcm80211/brcmsmac/wlc_antsel.c   |    1 -
 drivers/staging/brcm80211/brcmsmac/wlc_bmac.c     |    1 -
 drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h   |    3 ---
 drivers/staging/brcm80211/brcmsmac/wlc_channel.c  |    1 -
 drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c |    1 -
 drivers/staging/brcm80211/brcmsmac/wlc_stf.c      |    1 -
 drivers/staging/brcm80211/include/bcmdefs.h       |    1 +
 8 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index 0a0ff30..c6cdcd9 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -34,7 +34,6 @@
 #include "wlc_antsel.h"
 #include "wl_export.h"
 #include "wl_dbg.h"
-#include "wlc_bsscfg.h"
 #include "wlc_channel.h"
 #include "wlc_main.h"
 #include "wlc_ampdu.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index 566be86..85a73a9 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -36,7 +36,6 @@
 #include "phy/wlc_phy_hal.h"
 #include "wlc_bmac.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wl_export.h"
 #include "wlc_phy_shim.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index b85194d..5a96dc3 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -47,7 +47,6 @@
 #include "wlc_phy_shim.h"
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wl_export.h"
 #include "wl_ucode.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
index cd5cfbb..bbcff4f 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
@@ -23,9 +23,6 @@
 
 #define BSSCFG_IBSS(cfg)	(!(cfg)->BSS)
 
-/* forward declarations */
-typedef struct wlc_bsscfg wlc_bsscfg_t;
-
 #define NTXRATE			64	/* # tx MPDUs rate is reported for */
 #define MAXMACLIST		64	/* max # source MAC matches */
 #define BCN_TEMPLATE_COUNT 	2
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
index d43948f..96161c0 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
@@ -35,7 +35,6 @@
 #include "wlc_bmac.h"
 #include "wlc_rate.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wlc_stf.h"
 #include "wl_dbg.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
index 1ac6597..96d3600 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
@@ -52,7 +52,6 @@
 #include "wlc_bmac.h"
 #include "wlc_phy_hal.h"
 #include "wl_export.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wlc_phy_shim.h"
 
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
index a6f6e5c..098fd59 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
@@ -36,7 +36,6 @@
 #include "wlc_key.h"
 #include "phy/wlc_phy_hal.h"
 #include "wlc_channel.h"
-#include "wlc_bsscfg.h"
 #include "wlc_main.h"
 #include "wl_export.h"
 #include "wlc_bmac.h"
diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h
index 601ec70..22a389e 100644
--- a/drivers/staging/brcm80211/include/bcmdefs.h
+++ b/drivers/staging/brcm80211/include/bcmdefs.h
@@ -157,5 +157,6 @@ typedef struct {
 
 /* handle forward declaration */
 struct wl_info;
+struct wlc_bsscfg;
 
 #endif				/* _bcmdefs_h_ */
-- 
1.7.4.1




More information about the devel mailing list