From: Arend van Spriel <arend@xxxxxxxxxxxx>
All source files including sbhndpio.h were needing it only
because they needed d11.h and it had a dependency. The content
of sbhndpio.h has been merged in d11.h.
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/brcm80211/brcmsmac/d11.h | 31 ++++++++++++
.../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 1 -
.../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 1 -
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 1 -
.../brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c | 1 -
.../staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c | 1 -
drivers/staging/brcm80211/brcmsmac/sbhndpio.h | 52 --------------------
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 5 +-
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 1 -
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_channel.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 1 -
17 files changed, 34 insertions(+), 68 deletions(-)
delete mode 100644 drivers/staging/brcm80211/brcmsmac/sbhndpio.h
diff --git a/drivers/staging/brcm80211/brcmsmac/d11.h b/drivers/staging/brcm80211/brcmsmac/d11.h
index 80a8489..a9d182f 100644
--- a/drivers/staging/brcm80211/brcmsmac/d11.h
+++ b/drivers/staging/brcm80211/brcmsmac/d11.h
@@ -59,6 +59,37 @@ typedef volatile struct {
u32 intmask;
} intctrlregs_t;
+/* PIO structure,
+ * support two PIO format: 2 bytes access and 4 bytes access
+ * basic FIFO register set is per channel(transmit or receive)
+ * a pair of channels is defined for convenience
+ */
+/* 2byte-wide pio register set per channel(xmt or rcv) */
+typedef volatile struct {
+ u16 fifocontrol;
+ u16 fifodata;
+ u16 fifofree; /* only valid in xmt channel, not in rcv channel */
+ u16 PAD;
+} pio2regs_t;
+
+/* a pair of pio channels(tx and rx) */
+typedef volatile struct {
+ pio2regs_t tx;
+ pio2regs_t rx;
+} pio2regp_t;
+
+/* 4byte-wide pio register set per channel(xmt or rcv) */
+typedef volatile struct {
+ u32 fifocontrol;
+ u32 fifodata;
+} pio4regs_t;
+
+/* a pair of pio channels(tx and rx) */
+typedef volatile struct {
+ pio4regs_t tx;
+ pio4regs_t rx;
+} pio4regp_t;
+
/* read: 32-bit register that can be read as 32-bit or as 2 16-bit
* write: only low 16b-it half can be written
*/
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
index 2f80da7..151c9b2 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
@@ -26,7 +26,6 @@
#include <bcmnvram.h>
#include <sbchipc.h>
#include <bcmdevs.h>
-#include <sbhndpio.h>
#include <sbhnddma.h>
#include <wlc_phy_int.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
index f027d50..36dea14 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -26,7 +26,6 @@
#include <hndpmu.h>
#include <bcmdevs.h>
-#include <sbhndpio.h>
#include <sbhnddma.h>
#include <wlc_phy_radio.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
index 23b6086..af8291f 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
@@ -26,7 +26,6 @@
#include <hndpmu.h>
#include <bcmdevs.h>
-#include <sbhndpio.h>
#include <sbhnddma.h>
#include <wlc_phy_radio.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
index 330b881..e962902 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
@@ -15,7 +15,6 @@
*/
#include <linux/types.h>
-#include <sbhndpio.h>
#include <sbhnddma.h>
#include <osl.h>
#include <wlc_phy_int.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
index a9fc193..3dbce71 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
+++ b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
@@ -16,7 +16,6 @@
#include <linux/kernel.h>
-#include <sbhndpio.h>
#include <sbhnddma.h>
#include <osl.h>
#include <wlc_phy_int.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/sbhndpio.h b/drivers/staging/brcm80211/brcmsmac/sbhndpio.h
deleted file mode 100644
index 9eabdb5..0000000
--- a/drivers/staging/brcm80211/brcmsmac/sbhndpio.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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 _sbhndpio_h_
-#define _sbhndpio_h_
-
-/* PIO structure,
- * support two PIO format: 2 bytes access and 4 bytes access
- * basic FIFO register set is per channel(transmit or receive)
- * a pair of channels is defined for convenience
- */
-
-/* 2byte-wide pio register set per channel(xmt or rcv) */
-typedef volatile struct {
- u16 fifocontrol;
- u16 fifodata;
- u16 fifofree; /* only valid in xmt channel, not in rcv channel */
- u16 PAD;
-} pio2regs_t;
-
-/* a pair of pio channels(tx and rx) */
-typedef volatile struct {
- pio2regs_t tx;
- pio2regs_t rx;
-} pio2regp_t;
-
-/* 4byte-wide pio register set per channel(xmt or rcv) */
-typedef volatile struct {
- u32 fifocontrol;
- u32 fifodata;
-} pio4regs_t;
-
-/* a pair of pio channels(tx and rx) */
-typedef volatile struct {
- pio4regs_t tx;
- pio4regs_t rx;
-} pio4regp_t;
-
-#endif /* _sbhndpio_h_ */
diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index b57c3a0..137a382 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -35,11 +35,12 @@
#include <wlioctl.h>
#include <sbhnddma.h>
+#include "phy/wlc_phy_int.h"
+#include "d11.h"
+#include "wlc_types.h"
#include "wlc_cfg.h"
#include "phy/phy_version.h"
#include "wlc_key.h"
-#include "sbhndpio.h"
-#include "phy/wlc_phy_hal.h"
#include "wlc_channel.h"
#include "wlc_scb.h"
#include "wlc_pub.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
index ff55169..dc06b1a 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
@@ -23,7 +23,6 @@
#include <wlioctl.h>
#include <sbhnddma.h>
-#include "sbhndpio.h"
#include "d11.h"
#include "wlc_types.h"
#include "wlc_cfg.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index ea6bb85..d438d9a 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -21,7 +21,6 @@
#include <bcmutils.h>
#include <siutils.h>
#include <wlioctl.h>
-#include <sbhndpio.h>
#include <sbhnddma.h>
#include <hnddma.h>
#include <d11.h>
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index ec99420..3e45389 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -30,7 +30,6 @@
#include <sbhnddma.h>
#include <wlioctl.h>
-#include "sbhndpio.h"
#include "d11.h"
#include "wlc_rate.h"
#include "wlc_key.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index b55ab25..4a7346f 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -39,7 +39,6 @@
#include <hndpmu.h>
#include "wlc_types.h"
-#include "sbhndpio.h"
#include "d11.h"
#include "wlc_cfg.h"
#include "wlc_rate.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
index c89ce5f..8e2a384 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
@@ -27,7 +27,6 @@
#include <wlioctl.h>
#include "wlc_types.h"
-#include "sbhndpio.h"
#include "d11.h"
#include "wlc_cfg.h"
#include "wlc_scb.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index c7f0630..29d9dee 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
@@ -31,7 +31,6 @@
#include <hnddma.h>
#include <hndpmu.h>
-#include "sbhndpio.h"
#include "d11.h"
#include "wlc_types.h"
#include "wlc_cfg.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
index 0b25bd7..fa3f73f 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
@@ -41,7 +41,6 @@
#include "wlc_types.h"
#include "wl_dbg.h"
-#include "sbhndpio.h"
#include "wlc_cfg.h"
#include "d11.h"
#include "wlc_rate.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
index e22ff84..863f18f 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
@@ -25,7 +25,6 @@
#include <sbhnddma.h>
#include "wlc_types.h"
-#include "sbhndpio.h"
#include "d11.h"
#include "wl_dbg.h"
#include "wlc_cfg.h"
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
index 2d98f0d..25fbcda 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
@@ -28,7 +28,6 @@
#include <sbhnddma.h>
#include "wlc_types.h"
-#include "sbhndpio.h"
#include "d11.h"
#include "wl_dbg.h"
#include "wlc_cfg.h"
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
