[PATCH 053/961] staging: brcm80211: removed sys directory layer from brcmsmac driver

[Greg Kroah-Hartman]

From: Arend van Spriel <arend at broadcom.com>

Based on review comments moved sources from brcm80211/brcmsmac/sys
to its parent directory. The phy directory is kept for maintainance
logistics around phy source code.

Reviewed-by: Brett Rudley <brudley at broadcom.com>
Reviewed-by: Henry Ptasinski <henryp at broadcom.com>
Reviewed-by: Roland Vossen <rvossen at broadcom.com>
Signed-off-by: Arend van Spriel <arend at broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
 drivers/staging/brcm80211/Makefile                 |    3 ++
 drivers/staging/brcm80211/brcmfmac/Makefile        |    2 -
 drivers/staging/brcm80211/brcmsmac/Makefile        |   28 +++++++++----------
 .../brcm80211/brcmsmac/{sys => }/d11ucode_ext.h    |    0
 .../staging/brcm80211/brcmsmac/{sys => }/wl_dbg.h  |    0
 .../brcm80211/brcmsmac/{sys => }/wl_export.h       |    0
 .../brcm80211/brcmsmac/{sys => }/wl_mac80211.c     |    0
 .../brcm80211/brcmsmac/{sys => }/wl_mac80211.h     |    0
 .../brcm80211/brcmsmac/{sys => }/wl_ucode.h        |    0
 .../brcm80211/brcmsmac/{sys => }/wl_ucode_loader.c |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_alloc.c       |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_alloc.h       |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_ampdu.c       |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_ampdu.h       |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_antsel.c      |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_antsel.h      |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_bmac.c        |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_bmac.h        |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_bsscfg.h      |    0
 .../staging/brcm80211/brcmsmac/{sys => }/wlc_cfg.h |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_channel.c     |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_channel.h     |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_event.c       |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_event.h       |    0
 .../staging/brcm80211/brcmsmac/{sys => }/wlc_key.h |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_mac80211.c    |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_mac80211.h    |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_phy_shim.c    |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_phy_shim.h    |    0
 .../staging/brcm80211/brcmsmac/{sys => }/wlc_pub.h |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_rate.c        |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_rate.h        |    0
 .../staging/brcm80211/brcmsmac/{sys => }/wlc_scb.h |    0
 .../staging/brcm80211/brcmsmac/{sys => }/wlc_stf.c |    0
 .../staging/brcm80211/brcmsmac/{sys => }/wlc_stf.h |    0
 .../brcm80211/brcmsmac/{sys => }/wlc_types.h       |    0
 36 files changed, 16 insertions(+), 17 deletions(-)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/d11ucode_ext.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wl_dbg.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wl_export.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wl_mac80211.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wl_mac80211.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wl_ucode.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wl_ucode_loader.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_alloc.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_alloc.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_ampdu.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_ampdu.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_antsel.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_antsel.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_bmac.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_bmac.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_bsscfg.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_cfg.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_channel.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_channel.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_event.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_event.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_key.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_mac80211.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_mac80211.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_phy_shim.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_phy_shim.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_pub.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_rate.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_rate.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_scb.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_stf.c (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_stf.h (100%)
 rename drivers/staging/brcm80211/brcmsmac/{sys => }/wlc_types.h (100%)

diff --git a/drivers/staging/brcm80211/Makefile b/drivers/staging/brcm80211/Makefile
index a069519..5caaea5 100644
--- a/drivers/staging/brcm80211/Makefile
+++ b/drivers/staging/brcm80211/Makefile
@@ -15,5 +15,8 @@
 # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+# one and only common flag
+subdir-ccflags-y := -DBCMDBG
+
 obj-$(CONFIG_BRCMFMAC)	+= brcmfmac/
 obj-$(CONFIG_BRCMSMAC)	+= brcmsmac/
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index 13df7c3..b3931b0 100644
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -17,7 +17,6 @@
 
 ccflags-y :=			\
 	-DARP_OFFLOAD_SUPPORT	\
-	-DBCMDBG		\
 	-DBCMLXSDMMC		\
 	-DBCMPLATFORM_BUS	\
 	-DBCMSDIO		\
@@ -60,4 +59,3 @@ DHDOFILES = \
 
 obj-m += brcmfmac.o
 brcmfmac-objs += $(DHDOFILES)
-
diff --git a/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index e5dda86..ea29702 100644
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -16,7 +16,6 @@
 # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ccflags-y :=					\
-	-DBCMDBG				\
 	-DWLC_HIGH				\
 	-DWLC_LOW				\
 	-DSTA					\
@@ -25,25 +24,24 @@ ccflags-y :=					\
 	-DDBAND					\
 	-DBCMDMA32				\
 	-DBCMNVRAMR				\
-	-Idrivers/staging/brcm80211/brcmsmac    \
-	-Idrivers/staging/brcm80211/brcmsmac/sys \
+	-Idrivers/staging/brcm80211/brcmsmac \
 	-Idrivers/staging/brcm80211/brcmsmac/phy \
 	-Idrivers/staging/brcm80211/util \
 	-Idrivers/staging/brcm80211/include
 
 BRCMSMAC_OFILES := \
-	sys/wl_mac80211.o \
-	sys/wl_ucode_loader.o \
-	sys/wlc_alloc.o \
-	sys/wlc_ampdu.o \
-	sys/wlc_antsel.o \
-	sys/wlc_bmac.o \
-	sys/wlc_channel.o \
-	sys/wlc_event.o \
-	sys/wlc_mac80211.o \
-	sys/wlc_phy_shim.o \
-	sys/wlc_rate.o \
-	sys/wlc_stf.o \
+	wl_mac80211.o \
+	wl_ucode_loader.o \
+	wlc_alloc.o \
+	wlc_ampdu.o \
+	wlc_antsel.o \
+	wlc_bmac.o \
+	wlc_channel.o \
+	wlc_event.o \
+	wlc_mac80211.o \
+	wlc_phy_shim.o \
+	wlc_rate.o \
+	wlc_stf.o \
 	phy/wlc_phy_cmn.o \
 	phy/wlc_phy_lcn.o \
 	phy/wlc_phy_n.o \
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h b/drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/d11ucode_ext.h
rename to drivers/staging/brcm80211/brcmsmac/d11ucode_ext.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h b/drivers/staging/brcm80211/brcmsmac/wl_dbg.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wl_dbg.h
rename to drivers/staging/brcm80211/brcmsmac/wl_dbg.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_export.h b/drivers/staging/brcm80211/brcmsmac/wl_export.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wl_export.h
rename to drivers/staging/brcm80211/brcmsmac/wl_export.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.c
rename to drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wl_mac80211.h
rename to drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h b/drivers/staging/brcm80211/brcmsmac/wl_ucode.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wl_ucode.h
rename to drivers/staging/brcm80211/brcmsmac/wl_ucode.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wl_ucode_loader.c
rename to drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_alloc.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_alloc.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_ampdu.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_antsel.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_antsel.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_bmac.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_bmac.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h b/drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_bsscfg.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h b/drivers/staging/brcm80211/brcmsmac/wlc_cfg.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_cfg.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_cfg.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_channel.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h b/drivers/staging/brcm80211/brcmsmac/wlc_channel.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_channel.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_channel.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c b/drivers/staging/brcm80211/brcmsmac/wlc_event.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_event.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_event.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h b/drivers/staging/brcm80211/brcmsmac/wlc_event.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_event.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_event.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h b/drivers/staging/brcm80211/brcmsmac/wlc_key.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_key.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_key.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_mac80211.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_mac80211.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_phy_shim.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h b/drivers/staging/brcm80211/brcmsmac/wlc_pub.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_pub.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_pub.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_rate.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h b/drivers/staging/brcm80211/brcmsmac/wlc_rate.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_rate.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_rate.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h b/drivers/staging/brcm80211/brcmsmac/wlc_scb.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_scb.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_scb.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.c
rename to drivers/staging/brcm80211/brcmsmac/wlc_stf.c
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h b/drivers/staging/brcm80211/brcmsmac/wlc_stf.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_stf.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_stf.h
diff --git a/drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h b/drivers/staging/brcm80211/brcmsmac/wlc_types.h
similarity index 100%
rename from drivers/staging/brcm80211/brcmsmac/sys/wlc_types.h
rename to drivers/staging/brcm80211/brcmsmac/wlc_types.h
-- 
1.7.4.1