staging: brcm80211: remove include file sbhndpio.h
authorArend van Spriel <arend@broadcom.com>
Fri, 25 Feb 2011 15:39:18 +0000 (16:39 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 1 Mar 2011 02:17:41 +0000 (18:17 -0800)
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>
17 files changed:
drivers/staging/brcm80211/brcmsmac/d11.h
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
drivers/staging/brcm80211/brcmsmac/sbhndpio.h [deleted file]
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
drivers/staging/brcm80211/brcmsmac/wlc_channel.c
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
drivers/staging/brcm80211/brcmsmac/wlc_rate.c
drivers/staging/brcm80211/brcmsmac/wlc_stf.c

index 80a8489b854806e348a52df70572051067ce9bc4..a9d182f49023450630d8667dd950b5f7d7762b03 100644 (file)
@@ -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
  */
index 2f80da7f0d0f2fbb234ca22d67e5ac6cf2ad163b..151c9b2627663fe3d136b4c4a99565080d2fb34d 100644 (file)
@@ -26,7 +26,6 @@
 #include <bcmnvram.h>
 #include <sbchipc.h>
 #include <bcmdevs.h>
-#include <sbhndpio.h>
 #include <sbhnddma.h>
 
 #include <wlc_phy_int.h>
index f027d5076c7d84fbaa3cb1b1e12dd7f967e1d7e5..36dea14b7d7f658b39cc56f8afa3503c7142e48f 100644 (file)
@@ -26,7 +26,6 @@
 #include <hndpmu.h>
 
 #include <bcmdevs.h>
-#include <sbhndpio.h>
 #include <sbhnddma.h>
 
 #include <wlc_phy_radio.h>
index 23b6086aa74d2efde966612196bb76c189e7b2c0..af8291f1bc0f95be60dd9cf1753d343412a9541f 100644 (file)
@@ -26,7 +26,6 @@
 #include <hndpmu.h>
 
 #include <bcmdevs.h>
-#include <sbhndpio.h>
 #include <sbhnddma.h>
 
 #include <wlc_phy_radio.h>
index 330b88152b651023f9afb59dd1412ee887aff5d3..e962902d72286ba2e641971c37d28f3b4b0fe610 100644 (file)
@@ -15,7 +15,6 @@
  */
 
 #include <linux/types.h>
-#include <sbhndpio.h>
 #include <sbhnddma.h>
 #include <osl.h>
 #include <wlc_phy_int.h>
index a9fc193721ef548ac8d5c76c09b87b8d1312717f..3dbce71f83abdd4476b92e321edbd7752aa1f646 100644 (file)
@@ -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 (file)
index 9eabdb5..0000000
+++ /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_ */
index b57c3a0046123f4a7f7841d11f5838fa07f15551..137a382bac52b3d23ddd3c2087a9fe383d3c6dad 100644 (file)
 #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"
index ff5516946ae152e5471135a4dd2b7302e232b268..dc06b1ac11f9780a991715cef85348f74ebf891f 100644 (file)
@@ -23,7 +23,6 @@
 #include <wlioctl.h>
 #include <sbhnddma.h>
 
-#include "sbhndpio.h"
 #include "d11.h"
 #include "wlc_types.h"
 #include "wlc_cfg.h"
index ea6bb85d2c4b22adc17e420ea7ddb10c856fca2b..d438d9a2a3c32dcc49f6a35e5d1c2e4ab8240d8b 100644 (file)
@@ -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>
index ec99420c9b955bdbd4714a8fce9220cf7c1b1adf..3e453899db31bdee5ea70aa9fe053266a2a46287 100644 (file)
@@ -30,7 +30,6 @@
 #include <sbhnddma.h>
 #include <wlioctl.h>
 
-#include "sbhndpio.h"
 #include "d11.h"
 #include "wlc_rate.h"
 #include "wlc_key.h"
index b55ab25b1ed273fee883268f8708d9622ac1f2e9..4a7346f0f918433675312b37c841ffb9dbc2abf0 100644 (file)
@@ -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"
index c89ce5fede2455a7632adf27ccfeb58d977aa6db..8e2a3848496c62f957676759f627e27916bf2599 100644 (file)
@@ -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"
index c7f0630f020202310eb860c0768c3d2afcc29a9a..29d9dee38f8a42a3f95f4cf2b868bfb5ceb89654 100644 (file)
@@ -31,7 +31,6 @@
 #include <hnddma.h>
 #include <hndpmu.h>
 
-#include "sbhndpio.h"
 #include "d11.h"
 #include "wlc_types.h"
 #include "wlc_cfg.h"
index 0b25bd767d53098f6c08ca023db46c03c593f1ad..fa3f73ffff17b305cfd6f275877dece063641f9b 100644 (file)
@@ -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"
index e22ff84ba678c52d15d9effa5fe7595a8469fa83..863f18f86ece7fc9bfed3c7d04019610c8e749af 100644 (file)
@@ -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"
index 2d98f0d69a928f6fec181f2b87e342496c6f0e8d..25fbcdac4f77853fc7ccf22dead47b961f448bcc 100644 (file)
@@ -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"