]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
staging: brcm80211: Purge linuxver.h and redistribute #includes as required
authorBrett Rudley <brudley@broadcom.com>
Tue, 26 Oct 2010 18:55:23 +0000 (11:55 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 9 Nov 2010 23:34:13 +0000 (15:34 -0800)
Linuxver.h only included other .h files. Delete it and move #includes to .c's as needed.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
39 files changed:
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
drivers/staging/brcm80211/brcmfmac/dhd_common.c
drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
drivers/staging/brcm80211/brcmfmac/wl_iw.c
drivers/staging/brcm80211/include/linux_osl.h
drivers/staging/brcm80211/include/linuxver.h [deleted file]
drivers/staging/brcm80211/phy/wlc_phy_cmn.c
drivers/staging/brcm80211/phy/wlc_phy_lcn.c
drivers/staging/brcm80211/phy/wlc_phy_n.c
drivers/staging/brcm80211/sys/wl_mac80211.c
drivers/staging/brcm80211/sys/wlc_alloc.c
drivers/staging/brcm80211/sys/wlc_ampdu.c
drivers/staging/brcm80211/sys/wlc_antsel.c
drivers/staging/brcm80211/sys/wlc_bmac.c
drivers/staging/brcm80211/sys/wlc_channel.c
drivers/staging/brcm80211/sys/wlc_event.c
drivers/staging/brcm80211/sys/wlc_mac80211.c
drivers/staging/brcm80211/sys/wlc_phy_shim.c
drivers/staging/brcm80211/sys/wlc_rate.c
drivers/staging/brcm80211/sys/wlc_stf.c
drivers/staging/brcm80211/util/aiutils.c
drivers/staging/brcm80211/util/bcmotp.c
drivers/staging/brcm80211/util/bcmsrom.c
drivers/staging/brcm80211/util/bcmutils.c
drivers/staging/brcm80211/util/bcmwifi.c
drivers/staging/brcm80211/util/hnddma.c
drivers/staging/brcm80211/util/hndpmu.c
drivers/staging/brcm80211/util/linux_osl.c
drivers/staging/brcm80211/util/nicpci.c
drivers/staging/brcm80211/util/sbutils.c
drivers/staging/brcm80211/util/siutils.c

index 4c613da3553ab11824bdd02cdb54fa1422fcc1de..3f79637f9e3c2823ef42fc07f537a3e99b47d31f 100644 (file)
@@ -16,6 +16,7 @@
 /* ****************** BCMSDH Interface Functions *************************** */
 
 #include <linux/types.h>
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
index 9028cd01d9d03fdfdbf1feb6248d02b2d8c57197..59eaf71040b20ba5f8915f2338fad349c02ff953 100644 (file)
@@ -20,8 +20,7 @@
 
 #define __UNDEF_NO_VERSION__
 
-#include <linuxver.h>
-
+#include <linux/netdevice.h>
 #include <linux/pci.h>
 #include <linux/completion.h>
 
index f6c9c454181328b139e419b3f9110ed838341b11..7d3d7cc749483f62da9de7eb9c14ac61fe6e164b 100644 (file)
@@ -14,6 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <linux/types.h>
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmendian.h>
index ae7b566b11d70227ddb323002306e44b52fb4bf9..b9f91fa861042fa938b0fb48bcc7686acb067602 100644 (file)
@@ -15,6 +15,7 @@
  */
 #include <linux/types.h>
 #include <linux/sched.h>       /* request_irq() */
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <sdio.h>              /* SDIO Specs */
index bcbaac9bcdcc8af209b28a10463dd2710679efdb..0d14f6c1fcfa6b83224bf128ba0b2002f6c49ecc 100644 (file)
@@ -15,6 +15,7 @@
  */
 
 #include <linux/types.h>
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <osl.h>
 
index 703188fc28ec9f26a87b6aeed82ac6d5f720580b..f7ffea69233c74cd6783827ec6eeaff133da3277 100644 (file)
@@ -16,6 +16,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
index f647034f36d689348024a48d4e0daf673fc416f4..bb3c7b8c4b982e925a480b31617341e2b23bd183 100644 (file)
@@ -14,7 +14,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <linuxver.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmutils.h>
 
index bbbe7c5f7492573508d5027b03cd1df9a187b561..797bff3be41631b6b966398bb5c992a570db0121 100644 (file)
@@ -32,7 +32,6 @@
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <bcmendian.h>
index bf8df9801030e20fa06bb556d2470bd091c2f8b4..c66f1c2941e2865bcc0ba0a2fa21b51ab8a772e9 100644 (file)
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/sched.h>
-#include <linuxver.h>
 
 int setScheduler(struct task_struct *p, int policy, struct sched_param *param)
 {
index b2281d9dfdcfa2d09afbc9052f548ef433cf0a74..66884d47e83465fe0bc17021bb752a980c1fe278 100644 (file)
@@ -16,6 +16,7 @@
 
 #include <linux/types.h>
 #include <bcmdefs.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <bcmsdh.h>
 
index 3f29488d9c7279c6ba79ad604d6fbb22b9a59a5a..21fe38fa736e4bb8745cca519086fa11d0b6f9fb 100644 (file)
@@ -16,7 +16,6 @@
 
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
-#include <linuxver.h>
 #include <osl.h>
 
 #include <bcmutils.h>
index 979a494fda59eaff5b23c5464bff79cd07096b07..3e053fe56c79983f445c1296315fb3a0759f4ef5 100644 (file)
@@ -16,7 +16,7 @@
 
 #include <linux/kthread.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
+#include <linux/netdevice.h>
 #include <osl.h>
 #include <wlioctl.h>
 
index c9c860b6e474f87c9cdfa23dc6bab67c16e79685..b13ae7614042fe8bf66086ed69777478997a68ea 100644 (file)
@@ -299,10 +299,6 @@ extern int osl_error(int bcmerror);
 #define        W_SM(r, v)              (*(r) = (v))
 #define        BZERO_SM(r, len)        memset((r), '\0', (len))
 
-#ifdef BRCM_FULLMAC
-#include <linuxver.h>          /* use current 2.4.x calling conventions */
-#endif
-
 /* packet primitives */
 #define        PKTGET(osh, len, send)          osl_pktget((osh), (len))
 #define        PKTFREE(osh, skb, send)         osl_pktfree((osh), (skb), (send))
diff --git a/drivers/staging/brcm80211/include/linuxver.h b/drivers/staging/brcm80211/include/linuxver.h
deleted file mode 100644 (file)
index dc72141..0000000
+++ /dev/null
@@ -1,38 +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 _linuxver_h_
-#define _linuxver_h_
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/netdevice.h>
-#include <linux/workqueue.h>
-#include <linux/sched.h>
-#include <linux/ieee80211.h>
-#include <linux/time.h>
-#include <linux/wait.h>
-
-#undef IP_TOS
-#include <asm/io.h>
-
-#endif                         /* _linuxver_h_ */
index c1882e2b291f708a7ac5872ab905d9be9a1faee4..9e6bbcdf8b6f2736eb49f08ecda19ecb3dbfce8a 100644 (file)
@@ -20,7 +20,8 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmendian.h>
 #include <bcmnvram.h>
 #include <sbchipc.h>
index 4efd8623e715cc43fac8dab94abdaf55b5a24e97..1fde9d5701b02c6bc93342eac517139328fc0bea 100644 (file)
@@ -20,7 +20,7 @@
 #include <wlc_cfg.h>
 #include <qmath.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/pci.h>
 #include <siutils.h>
 #include <hndpmu.h>
 
index 36f73e8adb64d72ad886bc94a5e7c65ca8895106..3e1ab579c0864badddcd0710c56953579c8932d7 100644 (file)
@@ -18,7 +18,7 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
+#include <linux/pci.h>
 #include <osl.h>
 #include <siutils.h>
 #include <sbchipc.h>
index d182b0233c9b6bd4f345f1b021efb4d2243da749..a2e21dc3444479915b68f4e2a1780a30cf852412 100644 (file)
@@ -21,7 +21,9 @@
 #include <linux/string.h>
 #include <linux/pci_ids.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/sched.h>
 #include <osl.h>
 #define WLC_MAXBSSCFG          1       /* single BSS configs */
 
index dc1fe2448d70d5659a30e40e9b1e570858b3f2b8..8240d4ba962e61a445369f873ab41ad7e1ded15a 100644 (file)
@@ -17,7 +17,8 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
index 7a8340bd80ddb47643d620ad773b0bfe8f6aab0f..5a3acf852efad700659df26d755d0fa05913e44c 100644 (file)
@@ -16,8 +16,6 @@
 #include <linux/kernel.h>
 #include <wlc_cfg.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
-#include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
index eac5b21d5df571b492044280bbd95e3e369c0e27..3a1c1e9e7131520388a69f54e0e4829b4f4af2d8 100644 (file)
@@ -19,7 +19,8 @@
 #ifdef WLANTSEL
 
 #include <linux/kernel.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
index 5045b8c68300f63e1b772832b319ebd219b9144e..a92a68fb4604ccbe172887f20aee7cf2ebfada23 100644 (file)
@@ -20,7 +20,9 @@
 
 #include <linux/kernel.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <proto/802.11.h>
index e786d990639eeca152572af1a443438ca267554c..c7f4161880930a42cc34df54af9fd03060c3a325 100644 (file)
@@ -19,7 +19,8 @@
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <sbhndpio.h>
index 87181c111056197e9334a4b0112ecd384fe505e8..88418a293181526f80cfe5ebebba2fbd00577d45 100644 (file)
@@ -16,7 +16,8 @@
 
 #include <linux/kernel.h>
 #include <bcmdefs.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <sbhndpio.h>
index f64177436a62ba8b45ad63f6f8305807490fd53d..c434f786594f4f3759a186cbc4a7c459a6b18be6 100644 (file)
@@ -18,7 +18,6 @@
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
 #include <osl.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
index bf8e2e1a15f64eeff973bc663caf3668186068ba..45d583b1a271630ff8a7358571aafa9c2ea5e4fd 100644 (file)
@@ -24,7 +24,8 @@
 #include <linux/kernel.h>
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <osl.h>
 
index 5b216b0bd9a41737d8203234adbe9c1ec1f2ba07..e1199b236f5fc577a7612548abde64c463da8cd6 100644 (file)
@@ -17,7 +17,7 @@
 #include <bcmdefs.h>
 #include <wlc_cfg.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmendian.h>
index 2d02ae7bdd8b174db016761d15f61909d1d5925d..7bf326fc015b106f590b6952f324436353d7cd4a 100644 (file)
@@ -15,8 +15,8 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/module.h>
 #include <wlc_cfg.h>
-#include <linuxver.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
index 75a7e3a5c0094023abf0eeea75e6a5ae40cfbaf2..1d4e3729ad618ce81998ccb6fa80d681a82ee7c8 100644 (file)
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <hndsoc.h>
index c909832c7ee11848b1dd08075b3f7bf3644ff57f..9b1e6d961a726e553b3f44bd87b2292610f5952a 100644 (file)
@@ -18,7 +18,8 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmdevs.h>
 #include <bcmutils.h>
 #include <siutils.h>
index 1282ef7eb922ed419948603878663f0743b1f943..4f3d3ca1af794e8e4d401a88b1f2235061c42c61 100644 (file)
@@ -17,7 +17,8 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <stdarg.h>
 #include <bcmutils.h>
 #include <hndsoc.h>
index 9789ea45ecd625c12ecec47f2900eed637201dbf..869d34c420d217b28e0616f4426fdff4be9300d4 100644 (file)
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <stdarg.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
 #include <osl.h>
-#include <linuxver.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmnvram.h>
@@ -30,7 +32,6 @@
 #include <proto/802.1d.h>
 #include <proto/802.11.h>
 
-
 /* copy a buffer into a pkt buffer chain */
 uint pktfrombuf(osl_t *osh, void *p, uint offset, int len, unsigned char *buf)
 {
index 1bb6c78eece7dba9ee1f3e436990277312dc7c0d..2e472e00adc3b5dd403e65384752469155bff680 100644 (file)
@@ -15,6 +15,9 @@
  */
 #include <linux/ctype.h>
 #include <linux/kernel.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
index fe503e7de563889c6511a67e321859269904436b..b4dcb05705b3352c79c77d9defbbf54a828c31ff 100644 (file)
@@ -16,7 +16,8 @@
 
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linuxver.h>
+#include <linux/netdevice.h>
+#include <linux/pci.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <osl.h>
index a8f3306c1d2b447c87c33e85cbc19e33ea1ef5b2..6fb256bc5549c4786e42beb19a21f93b880cef62 100644 (file)
  */
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
index 2bb5b8722df66ef485a136c0e5234f872669c5ec..effe043f196247e46859c19bcbf3c5dd83a86f0c 100644 (file)
 #include <asm/paccess.h>
 #endif                         /* mips */
 #include <bcmendian.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/netdevice.h>
+#include <linux/sched.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
index 23f86dd7b1598bc5d9ae3591594f8a9e94241e0f..169a4287ee639c48adf9f4ec257ece33d8ea30d0 100644 (file)
@@ -15,7 +15,7 @@
  */
 
 #include <linux/string.h>
-#include <linuxver.h>
+#include <linux/pci.h>
 #include <bcmdefs.h>
 #include <osl.h>
 #include <bcmutils.h>
index e4c0baba553d82c362129ad37add164db6e43c38..82767e266e970d9e741d424a6c98a53e70d7ffb9 100644 (file)
@@ -16,6 +16,9 @@
 
 #include <linux/types.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
index f3ea7e1a7aefd1367615c890ca4f4d86837bf3cc..3b99293307ea716f20fc34451592558d5a4eb5a2 100644 (file)
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
+#ifdef BRCM_FULLMAC
+#include <linux/netdevice.h>
+#endif
 #include <osl.h>
-#include <linuxver.h>
+#include <linux/module.h>
+#include <linux/pci.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmdevs.h>