From a1c16ed2664205dd69c0ea0ec6945f7f10d3edf9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 21 Oct 2010 11:17:44 -0700 Subject: [PATCH] Staging: brcm80211: remove typedefs.h It's not needed anymore, so remove it and clean up the .h inclusion mess a bit to get everything to build properly again. Wow, this needs some unwinding... Cc: Brett Rudley Cc: Henry Ptasinski Cc: Nohee Ko Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 +- drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 1 - drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 4 +-- .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 7 ++-- drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 3 +- drivers/staging/brcm80211/brcmfmac/dhd_common.c | 4 +-- .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 1 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 8 ++--- drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 3 +- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 6 ++-- drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 5 ++- drivers/staging/brcm80211/brcmfmac/wl_iw.c | 7 ++-- drivers/staging/brcm80211/brcmfmac/wl_iw.h | 1 - drivers/staging/brcm80211/include/bcm_rpc.h | 1 - drivers/staging/brcm80211/include/bcmdefs.h | 15 ++++++--- drivers/staging/brcm80211/include/bcmendian.h | 2 -- drivers/staging/brcm80211/include/bcmnvram.h | 1 - drivers/staging/brcm80211/include/d11.h | 2 +- drivers/staging/brcm80211/include/dbus.h | 2 -- drivers/staging/brcm80211/include/dhdioctl.h | 2 -- drivers/staging/brcm80211/include/hndrte_armtrap.h | 2 -- drivers/staging/brcm80211/include/hndrte_cons.h | 2 -- drivers/staging/brcm80211/include/linux_osl.h | 3 -- drivers/staging/brcm80211/include/msgtrace.h | 2 -- drivers/staging/brcm80211/include/proto/802.11.h | 1 - drivers/staging/brcm80211/include/proto/bcmeth.h | 1 - drivers/staging/brcm80211/include/proto/bcmevent.h | 1 - drivers/staging/brcm80211/include/proto/bcmip.h | 1 - drivers/staging/brcm80211/include/proto/ethernet.h | 1 - drivers/staging/brcm80211/include/proto/vlan.h | 1 - drivers/staging/brcm80211/include/proto/wpa.h | 1 - drivers/staging/brcm80211/include/qmath.h | 2 -- drivers/staging/brcm80211/include/sdiovar.h | 2 -- drivers/staging/brcm80211/include/typedefs.h | 39 ---------------------- drivers/staging/brcm80211/include/wlioctl.h | 1 - drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 4 +-- drivers/staging/brcm80211/phy/wlc_phy_hal.h | 1 - drivers/staging/brcm80211/phy/wlc_phy_int.h | 3 +- drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 6 ++-- drivers/staging/brcm80211/phy/wlc_phy_lcn.h | 2 -- drivers/staging/brcm80211/phy/wlc_phy_n.c | 4 +-- drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3 +- drivers/staging/brcm80211/phy/wlc_phytbl_n.c | 2 +- drivers/staging/brcm80211/sys/wl_mac80211.c | 6 ++-- drivers/staging/brcm80211/sys/wl_ucode.h | 1 - drivers/staging/brcm80211/sys/wl_ucode_loader.c | 3 +- drivers/staging/brcm80211/sys/wlc_alloc.c | 5 ++- drivers/staging/brcm80211/sys/wlc_ampdu.c | 4 +-- drivers/staging/brcm80211/sys/wlc_antsel.c | 1 - drivers/staging/brcm80211/sys/wlc_bmac.c | 3 +- drivers/staging/brcm80211/sys/wlc_channel.c | 7 ++-- drivers/staging/brcm80211/sys/wlc_event.c | 2 +- drivers/staging/brcm80211/sys/wlc_mac80211.c | 8 ++--- drivers/staging/brcm80211/sys/wlc_phy_shim.c | 5 ++- drivers/staging/brcm80211/sys/wlc_rate.c | 5 ++- drivers/staging/brcm80211/sys/wlc_stf.c | 3 +- drivers/staging/brcm80211/util/aiutils.c | 5 ++- drivers/staging/brcm80211/util/bcmotp.c | 5 ++- drivers/staging/brcm80211/util/bcmsrom.c | 6 ++-- drivers/staging/brcm80211/util/bcmutils.c | 7 ++-- drivers/staging/brcm80211/util/bcmwifi.c | 5 +-- drivers/staging/brcm80211/util/hnddma.c | 1 - drivers/staging/brcm80211/util/hndpmu.c | 8 ++--- drivers/staging/brcm80211/util/linux_osl.c | 11 +++--- drivers/staging/brcm80211/util/nicpci.c | 1 - drivers/staging/brcm80211/util/nvram/nvram_ro.c | 3 +- drivers/staging/brcm80211/util/qmath.c | 1 + drivers/staging/brcm80211/util/sbutils.c | 2 +- drivers/staging/brcm80211/util/siutils.c | 5 ++- 69 files changed, 91 insertions(+), 185 deletions(-) delete mode 100644 drivers/staging/brcm80211/include/typedefs.h diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 6b62478d998..4c613da3553 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@ -15,7 +15,8 @@ */ /* ****************** BCMSDH Interface Functions *************************** */ -#include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c index e7ad60d98af..9028cd01d9d 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c @@ -20,7 +20,6 @@ #define __UNDEF_NO_VERSION__ -#include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c index 9adf37a2f33..f6c9c454181 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c @@ -13,8 +13,8 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c index 6ee2f4862de..ae7b566b11d 100644 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c @@ -13,15 +13,14 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include +#include +#include /* request_irq() */ +#include #include #include /* SDIO Specs */ #include /* bcmsdh to/from specific controller APIs */ #include /* to get msglevel bit values */ -#include /* request_irq() */ - #include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c index 08aca6521f7..bcbaac9bcdc 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c @@ -14,7 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c index 41063f9f36e..703188fc28e 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_common.c @@ -13,10 +13,10 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include #include #include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c index b200ee77593..f647034f36d 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c @@ -14,7 +14,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c index a3e9ca8e6e8..e2bc13d66c7 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c @@ -17,10 +17,6 @@ #ifdef CONFIG_WIFI_CONTROL_FUNC #include #endif -#include -#include -#include - #include #include #include @@ -34,8 +30,10 @@ #include #include #include - #include +#include +#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index fd4c91ee3ca..b2281d9dfdc 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c @@ -14,7 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c index 621521b9e40..9664787a9a5 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c @@ -14,16 +14,15 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include +#include #include #include -#include #include #include #include -#include #include #include @@ -35,7 +34,6 @@ #include #include -#include #include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h index 34eff08aaa6..770e63f0c8e 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h @@ -18,11 +18,10 @@ #define _wl_cfg80211_h_ #include -#include -#include -#include #include #include +#include +#include struct wl_conf; struct wl_iface; diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c index d6196d5cd23..979a494fda5 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.c @@ -14,12 +14,11 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - -#include -#include #include +#include +#include #include +#include #include #include diff --git a/drivers/staging/brcm80211/brcmfmac/wl_iw.h b/drivers/staging/brcm80211/brcmfmac/wl_iw.h index e8e91442d96..edbf61f30b4 100644 --- a/drivers/staging/brcm80211/brcmfmac/wl_iw.h +++ b/drivers/staging/brcm80211/brcmfmac/wl_iw.h @@ -19,7 +19,6 @@ #include -#include #include #include diff --git a/drivers/staging/brcm80211/include/bcm_rpc.h b/drivers/staging/brcm80211/include/bcm_rpc.h index e1f3cfd77cd..77e5d8f7196 100644 --- a/drivers/staging/brcm80211/include/bcm_rpc.h +++ b/drivers/staging/brcm80211/include/bcm_rpc.h @@ -17,7 +17,6 @@ #ifndef _BCM_RPC_H_ #define _BCM_RPC_H_ -#include #include typedef struct rpc_info rpc_info_t; diff --git a/drivers/staging/brcm80211/include/bcmdefs.h b/drivers/staging/brcm80211/include/bcmdefs.h index 2e1f35386f1..dc52e9dbb8b 100644 --- a/drivers/staging/brcm80211/include/bcmdefs.h +++ b/drivers/staging/brcm80211/include/bcmdefs.h @@ -24,10 +24,17 @@ #define JTAG_BUS 4 #define USB_BUS 5 #define SPI_BUS 6 -/* - * One doesn't need to include this file explicitly, gets included automatically if - * typedefs.h is included. - */ + + +#ifndef OFF +#define OFF 0 +#endif + +#ifndef ON +#define ON 1 /* ON = 1 */ +#endif + +#define AUTO (-1) /* Auto = -1 */ #ifdef mips #define BCMFASTPATH __attribute__ ((__section__(".text.fastpath"))) diff --git a/drivers/staging/brcm80211/include/bcmendian.h b/drivers/staging/brcm80211/include/bcmendian.h index 52296fb9fc5..4123aefa211 100644 --- a/drivers/staging/brcm80211/include/bcmendian.h +++ b/drivers/staging/brcm80211/include/bcmendian.h @@ -17,8 +17,6 @@ #ifndef _BCMENDIAN_H_ #define _BCMENDIAN_H_ -#include - /* Reverse the bytes in a 16-bit value */ #define BCMSWAP16(val) \ ((u16)((((u16)(val) & (u16)0x00ffU) << 8) | \ diff --git a/drivers/staging/brcm80211/include/bcmnvram.h b/drivers/staging/brcm80211/include/bcmnvram.h index adb2eb766c3..63e31a4749c 100644 --- a/drivers/staging/brcm80211/include/bcmnvram.h +++ b/drivers/staging/brcm80211/include/bcmnvram.h @@ -19,7 +19,6 @@ #ifndef _LANGUAGE_ASSEMBLY -#include #include struct nvram_header { diff --git a/drivers/staging/brcm80211/include/d11.h b/drivers/staging/brcm80211/include/d11.h index 5789e0828eb..c07548c70e3 100644 --- a/drivers/staging/brcm80211/include/d11.h +++ b/drivers/staging/brcm80211/include/d11.h @@ -17,7 +17,7 @@ #ifndef _D11_H #define _D11_H -#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/include/dbus.h b/drivers/staging/brcm80211/include/dbus.h index 52666632470..81ffea79d00 100644 --- a/drivers/staging/brcm80211/include/dbus.h +++ b/drivers/staging/brcm80211/include/dbus.h @@ -17,8 +17,6 @@ #ifndef __DBUS_H__ #define __DBUS_H__ -#include "typedefs.h" - #ifdef BCMDBG #define DBUSERR(args) do { if (net_ratelimit()) printf args; } while (0) #define DBUSTRACE(args) diff --git a/drivers/staging/brcm80211/include/dhdioctl.h b/drivers/staging/brcm80211/include/dhdioctl.h index 78fd02de137..4d06e506f15 100644 --- a/drivers/staging/brcm80211/include/dhdioctl.h +++ b/drivers/staging/brcm80211/include/dhdioctl.h @@ -17,8 +17,6 @@ #ifndef _dhdioctl_h_ #define _dhdioctl_h_ -#include - /* require default structure packing */ #define BWL_DEFAULT_PACKING #include diff --git a/drivers/staging/brcm80211/include/hndrte_armtrap.h b/drivers/staging/brcm80211/include/hndrte_armtrap.h index 8dc636d2ad6..28f092c9e02 100644 --- a/drivers/staging/brcm80211/include/hndrte_armtrap.h +++ b/drivers/staging/brcm80211/include/hndrte_armtrap.h @@ -47,8 +47,6 @@ #ifndef _LANGUAGE_ASSEMBLY -#include - typedef struct _trap_struct { u32 type; u32 epc; diff --git a/drivers/staging/brcm80211/include/hndrte_cons.h b/drivers/staging/brcm80211/include/hndrte_cons.h index 9e8442f5034..5caa53fb655 100644 --- a/drivers/staging/brcm80211/include/hndrte_cons.h +++ b/drivers/staging/brcm80211/include/hndrte_cons.h @@ -14,8 +14,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - #define CBUF_LEN (128) #define LOG_BUF_LEN 1024 diff --git a/drivers/staging/brcm80211/include/linux_osl.h b/drivers/staging/brcm80211/include/linux_osl.h index 7edf47f20a9..c9c860b6e47 100644 --- a/drivers/staging/brcm80211/include/linux_osl.h +++ b/drivers/staging/brcm80211/include/linux_osl.h @@ -17,9 +17,6 @@ #ifndef _linux_osl_h_ #define _linux_osl_h_ -#ifdef BRCM_FULLMAC -#include -#endif /* Linux Kernel: File Operations: start */ extern void *osl_os_open_image(char *filename); diff --git a/drivers/staging/brcm80211/include/msgtrace.h b/drivers/staging/brcm80211/include/msgtrace.h index 25b16615543..9d9e53da088 100644 --- a/drivers/staging/brcm80211/include/msgtrace.h +++ b/drivers/staging/brcm80211/include/msgtrace.h @@ -17,8 +17,6 @@ #ifndef _MSGTRACE_H #define _MSGTRACE_H -#include - /* This marks the start of a packed structure section. */ #include diff --git a/drivers/staging/brcm80211/include/proto/802.11.h b/drivers/staging/brcm80211/include/proto/802.11.h index db26cf10662..ffde19c5ac5 100644 --- a/drivers/staging/brcm80211/include/proto/802.11.h +++ b/drivers/staging/brcm80211/include/proto/802.11.h @@ -17,7 +17,6 @@ #ifndef _802_11_H_ #define _802_11_H_ -#include #include #include diff --git a/drivers/staging/brcm80211/include/proto/bcmeth.h b/drivers/staging/brcm80211/include/proto/bcmeth.h index c5da92b9ccd..f7d3d8dfd3a 100644 --- a/drivers/staging/brcm80211/include/proto/bcmeth.h +++ b/drivers/staging/brcm80211/include/proto/bcmeth.h @@ -17,7 +17,6 @@ #ifndef _BCMETH_H_ #define _BCMETH_H_ -#include #include #define BCMILCP_SUBTYPE_RATE 1 diff --git a/drivers/staging/brcm80211/include/proto/bcmevent.h b/drivers/staging/brcm80211/include/proto/bcmevent.h index 0a7231df0ce..865d15767a0 100644 --- a/drivers/staging/brcm80211/include/proto/bcmevent.h +++ b/drivers/staging/brcm80211/include/proto/bcmevent.h @@ -17,7 +17,6 @@ #ifndef _BCMEVENT_H_ #define _BCMEVENT_H_ -#include #include #define BCM_EVENT_MSG_VERSION 1 diff --git a/drivers/staging/brcm80211/include/proto/bcmip.h b/drivers/staging/brcm80211/include/proto/bcmip.h index 37ff7188d94..1ac391a4052 100644 --- a/drivers/staging/brcm80211/include/proto/bcmip.h +++ b/drivers/staging/brcm80211/include/proto/bcmip.h @@ -17,7 +17,6 @@ #ifndef _bcmip_h_ #define _bcmip_h_ -#include #include #define IP_VER_OFFSET 0x0 diff --git a/drivers/staging/brcm80211/include/proto/ethernet.h b/drivers/staging/brcm80211/include/proto/ethernet.h index d208d5f606a..cc17b428dd3 100644 --- a/drivers/staging/brcm80211/include/proto/ethernet.h +++ b/drivers/staging/brcm80211/include/proto/ethernet.h @@ -17,7 +17,6 @@ #ifndef _NET_ETHERNET_H_ #define _NET_ETHERNET_H_ -#include "typedefs.h" #include #define ETHER_ADDR_LEN 6 diff --git a/drivers/staging/brcm80211/include/proto/vlan.h b/drivers/staging/brcm80211/include/proto/vlan.h index 9e1f17836ae..f8b4ce257e7 100644 --- a/drivers/staging/brcm80211/include/proto/vlan.h +++ b/drivers/staging/brcm80211/include/proto/vlan.h @@ -17,7 +17,6 @@ #ifndef _vlan_h_ #define _vlan_h_ -#include #include #define VLAN_VID_MASK 0xfff diff --git a/drivers/staging/brcm80211/include/proto/wpa.h b/drivers/staging/brcm80211/include/proto/wpa.h index 5c63e593e6c..ec84c9f2b5e 100644 --- a/drivers/staging/brcm80211/include/proto/wpa.h +++ b/drivers/staging/brcm80211/include/proto/wpa.h @@ -17,7 +17,6 @@ #ifndef _proto_wpa_h_ #define _proto_wpa_h_ -#include #include #include diff --git a/drivers/staging/brcm80211/include/qmath.h b/drivers/staging/brcm80211/include/qmath.h index 4002eb06aca..5f525dbcd46 100644 --- a/drivers/staging/brcm80211/include/qmath.h +++ b/drivers/staging/brcm80211/include/qmath.h @@ -17,8 +17,6 @@ #ifndef __QMATH_H__ #define __QMATH_H__ -#include - s16 qm_sat32(s32 op); s32 qm_mul321616(s16 op1, s16 op2); diff --git a/drivers/staging/brcm80211/include/sdiovar.h b/drivers/staging/brcm80211/include/sdiovar.h index 2112cb6f901..7686fde0396 100644 --- a/drivers/staging/brcm80211/include/sdiovar.h +++ b/drivers/staging/brcm80211/include/sdiovar.h @@ -17,8 +17,6 @@ #ifndef _sdiovar_h_ #define _sdiovar_h_ -#include - /* require default structure packing */ #define BWL_DEFAULT_PACKING #include diff --git a/drivers/staging/brcm80211/include/typedefs.h b/drivers/staging/brcm80211/include/typedefs.h deleted file mode 100644 index 266734a5ae9..00000000000 --- a/drivers/staging/brcm80211/include/typedefs.h +++ /dev/null @@ -1,39 +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 _TYPEDEFS_H_ -#define _TYPEDEFS_H_ - -#include - -#ifndef OFF -#define OFF 0 -#endif - -#ifndef ON -#define ON 1 /* ON = 1 */ -#endif - -#define AUTO (-1) /* Auto = -1 */ - - -/* - * Including the bcmdefs.h here, to make sure everyone including typedefs.h - * gets this automatically -*/ -#include - -#endif /* _TYPEDEFS_H_ */ diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h index 0b81807c2f9..96866fb8898 100644 --- a/drivers/staging/brcm80211/include/wlioctl.h +++ b/drivers/staging/brcm80211/include/wlioctl.h @@ -17,7 +17,6 @@ #ifndef _wlioctl_h_ #define _wlioctl_h_ -#include #include #ifdef BRCM_FULLMAC #include diff --git a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c index 21bb8f10fc1..8287261120f 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_cmn.c +++ b/drivers/staging/brcm80211/phy/wlc_phy_cmn.c @@ -16,10 +16,10 @@ #include -#include -#include #include #include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/phy/wlc_phy_hal.h b/drivers/staging/brcm80211/phy/wlc_phy_hal.h index 6ad1b824a72..52260b2d0eb 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_hal.h +++ b/drivers/staging/brcm80211/phy/wlc_phy_hal.h @@ -17,7 +17,6 @@ #ifndef _wlc_phy_h_ #define _wlc_phy_h_ -#include #include #include #include diff --git a/drivers/staging/brcm80211/phy/wlc_phy_int.h b/drivers/staging/brcm80211/phy/wlc_phy_int.h index 8ec63011590..9513b87fa16 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_int.h +++ b/drivers/staging/brcm80211/phy/wlc_phy_int.h @@ -17,7 +17,8 @@ #ifndef _wlc_phy_int_h_ #define _wlc_phy_int_h_ -#include +#include +#include #include #include diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c index c41db98ddcc..3d3112ed4e2 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c +++ b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c @@ -14,14 +14,14 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include +#include +#include #include #include #include -#include -#include #include #include -#include #include #include diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.h b/drivers/staging/brcm80211/phy/wlc_phy_lcn.h index b7623ba13a4..b7bfc7230df 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.h +++ b/drivers/staging/brcm80211/phy/wlc_phy_lcn.h @@ -17,8 +17,6 @@ #ifndef _wlc_phy_lcn_h_ #define _wlc_phy_lcn_h_ -#include - struct phy_info_lcnphy { int lcnphy_txrf_sp_9_override; u8 lcnphy_full_cal_channel; diff --git a/drivers/staging/brcm80211/phy/wlc_phy_n.c b/drivers/staging/brcm80211/phy/wlc_phy_n.c index 6e3dbfd7815..950008f122b 100644 --- a/drivers/staging/brcm80211/phy/wlc_phy_n.c +++ b/drivers/staging/brcm80211/phy/wlc_phy_n.c @@ -14,10 +14,10 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include #include #include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c index e3d6dd18379..6ce9e5d9683 100644 --- a/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c +++ b/drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c @@ -14,8 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include - +#include #include #include diff --git a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/phy/wlc_phytbl_n.c index bbc4cfae73e..7cc2c563c72 100644 --- a/drivers/staging/brcm80211/phy/wlc_phytbl_n.c +++ b/drivers/staging/brcm80211/phy/wlc_phytbl_n.c @@ -14,7 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include #include #include diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c index ff9cbccd54b..ad635ee7758 100644 --- a/drivers/staging/brcm80211/sys/wl_mac80211.c +++ b/drivers/staging/brcm80211/sys/wl_mac80211.c @@ -16,13 +16,13 @@ #define __UNDEF_NO_VERSION__ -#include -#include -#include #include #include #include #include +#include +#include +#include #define WLC_MAXBSSCFG 1 /* single BSS configs */ #include diff --git a/drivers/staging/brcm80211/sys/wl_ucode.h b/drivers/staging/brcm80211/sys/wl_ucode.h index 3254f5aa46c..a1ba37209f9 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode.h +++ b/drivers/staging/brcm80211/sys/wl_ucode.h @@ -14,7 +14,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include typedef struct d11init { u16 addr; u16 size; diff --git a/drivers/staging/brcm80211/sys/wl_ucode_loader.c b/drivers/staging/brcm80211/sys/wl_ucode_loader.c index 93a3a016db5..0b41a9cb1ec 100644 --- a/drivers/staging/brcm80211/sys/wl_ucode_loader.c +++ b/drivers/staging/brcm80211/sys/wl_ucode_loader.c @@ -15,7 +15,8 @@ */ typedef struct wl_info wl_info_t; -#include +#include +#include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_alloc.c b/drivers/staging/brcm80211/sys/wlc_alloc.c index f9953df851b..2dc89f9c263 100644 --- a/drivers/staging/brcm80211/sys/wlc_alloc.c +++ b/drivers/staging/brcm80211/sys/wlc_alloc.c @@ -13,11 +13,10 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include -#include #include #include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_ampdu.c b/drivers/staging/brcm80211/sys/wlc_ampdu.c index 1edc5346438..a4e49f3c136 100644 --- a/drivers/staging/brcm80211/sys/wlc_ampdu.c +++ b/drivers/staging/brcm80211/sys/wlc_ampdu.c @@ -13,9 +13,9 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - +#include #include -#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_antsel.c b/drivers/staging/brcm80211/sys/wlc_antsel.c index 1f5e62ac7a5..5ff8831d2fa 100644 --- a/drivers/staging/brcm80211/sys/wlc_antsel.c +++ b/drivers/staging/brcm80211/sys/wlc_antsel.c @@ -18,7 +18,6 @@ #ifdef WLANTSEL -#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c index 5f386d3e3bc..b70f9d09923 100644 --- a/drivers/staging/brcm80211/sys/wlc_bmac.c +++ b/drivers/staging/brcm80211/sys/wlc_bmac.c @@ -18,12 +18,11 @@ #error "This file needs WLC_LOW" #endif +#include #include -#include #include #include #include -#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_channel.c b/drivers/staging/brcm80211/sys/wlc_channel.c index 259f40945a7..509280337e3 100644 --- a/drivers/staging/brcm80211/sys/wlc_channel.c +++ b/drivers/staging/brcm80211/sys/wlc_channel.c @@ -14,12 +14,11 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include -#include #include #include +#include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c index a2fdf485f40..7c17e5f67c5 100644 --- a/drivers/staging/brcm80211/sys/wlc_event.c +++ b/drivers/staging/brcm80211/sys/wlc_event.c @@ -14,8 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include +#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c index e695a4839e9..feaffcc64ec 100644 --- a/drivers/staging/brcm80211/sys/wlc_mac80211.c +++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c @@ -13,14 +13,12 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include -#include #include -#include +#include #include +#include +#include #include -#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_phy_shim.c b/drivers/staging/brcm80211/sys/wlc_phy_shim.c index 6980935af97..bf8e2e1a15f 100644 --- a/drivers/staging/brcm80211/sys/wlc_phy_shim.c +++ b/drivers/staging/brcm80211/sys/wlc_phy_shim.c @@ -21,12 +21,11 @@ * access to wlc_hw pointer. */ +#include +#include #include -#include #include -#include #include -#include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c index d4dcd058c41..d2d72568756 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/sys/wlc_rate.c @@ -13,11 +13,10 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - +#include +#include #include -#include #include -#include #include #include #include diff --git a/drivers/staging/brcm80211/sys/wlc_stf.c b/drivers/staging/brcm80211/sys/wlc_stf.c index a1db289a120..4728ad90e29 100644 --- a/drivers/staging/brcm80211/sys/wlc_stf.c +++ b/drivers/staging/brcm80211/sys/wlc_stf.c @@ -14,9 +14,8 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include #include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c index 65461d0d91d..75a7e3a5c00 100644 --- a/drivers/staging/brcm80211/util/aiutils.c +++ b/drivers/staging/brcm80211/util/aiutils.c @@ -14,11 +14,10 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include #include #include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c index 4a0161396d1..c909832c7ee 100644 --- a/drivers/staging/brcm80211/util/bcmotp.c +++ b/drivers/staging/brcm80211/util/bcmotp.c @@ -14,11 +14,10 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include #include #include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c index 62c055a8330..1282ef7eb92 100644 --- a/drivers/staging/brcm80211/util/bcmsrom.c +++ b/drivers/staging/brcm80211/util/bcmsrom.c @@ -13,12 +13,10 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include -#include -#include #include #include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c index 5635e8698ac..7ac64b6c00f 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c @@ -14,13 +14,12 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include -#include #include #include #include +#include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c index b83b12f0094..1bb6c78eece 100644 --- a/drivers/staging/brcm80211/util/bcmwifi.c +++ b/drivers/staging/brcm80211/util/bcmwifi.c @@ -13,12 +13,9 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include - -#include #include #include +#include #include #include diff --git a/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c index 3edef39962a..fe503e7de56 100644 --- a/drivers/staging/brcm80211/util/hnddma.c +++ b/drivers/staging/brcm80211/util/hnddma.c @@ -14,7 +14,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c index f8deb1c5160..a8f3306c1d2 100644 --- a/drivers/staging/brcm80211/util/hndpmu.c +++ b/drivers/staging/brcm80211/util/hndpmu.c @@ -13,13 +13,11 @@ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ - -#include -#include -#include +#include #include #include -#include +#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c index 34450a4f0cb..2bb5b8722df 100644 --- a/drivers/staging/brcm80211/util/linux_osl.c +++ b/drivers/staging/brcm80211/util/linux_osl.c @@ -14,19 +14,18 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include +#include +#ifdef mips +#include +#endif /* mips */ #include #include #include #include #include -#include -#ifdef mips -#include -#endif /* mips */ #include -#include #define PCI_CFG_RETRY 10 diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c index 9ffbe10dbd7..23f86dd7b15 100644 --- a/drivers/staging/brcm80211/util/nicpci.c +++ b/drivers/staging/brcm80211/util/nicpci.c @@ -14,7 +14,6 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include #include #include #include diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/util/nvram/nvram_ro.c index 7c5f88ddb4b..f80375cd680 100644 --- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c +++ b/drivers/staging/brcm80211/util/nvram/nvram_ro.c @@ -15,9 +15,8 @@ */ #include -#include -#include #include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/qmath.c b/drivers/staging/brcm80211/util/qmath.c index 108fc2b0446..40c9929de2b 100644 --- a/drivers/staging/brcm80211/util/qmath.c +++ b/drivers/staging/brcm80211/util/qmath.c @@ -14,6 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include #include "qmath.h" /* diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c index ca49a805c99..e4c0baba553 100644 --- a/drivers/staging/brcm80211/util/sbutils.c +++ b/drivers/staging/brcm80211/util/sbutils.c @@ -14,7 +14,7 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#include #include #include #include diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c index 15e4ff449a2..f3ea7e1a7ae 100644 --- a/drivers/staging/brcm80211/util/siutils.c +++ b/drivers/staging/brcm80211/util/siutils.c @@ -14,11 +14,10 @@ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include -#include -#include #include #include +#include +#include #include #include #include -- 2.11.0