staging: brcm80211: remove include file sbhndpio.h

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@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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
  */

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>

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>

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>

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>

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>

drivers/staging/brcm80211/brcmsmac/sbhndpio.h

@@ -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_ */

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"

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"

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>

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"

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"

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"

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"

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"

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"

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"