---

yaml --- r: 236228 b: refs/heads/master c: 9cceab9 h: refs/heads/master v: v3
git-mirror · Mar 3, 2011 · 3cfb470 · 3cfb470
1 parent 40747f9
commit 3cfb470
Show file tree

Hide file tree

Showing 44 changed files with 1 addition and 133 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c9d4c3749a712fa370289b54f40b157c336c8f3
+refs/heads/master: 9cceab99d7038b69093fd0142f644224c040a6bb
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/Makefile b/trunk/drivers/staging/brcm80211/brcmfmac/Makefile
@@ -52,7 +52,6 @@ DHDOFILES = \
 	bcmsdh_linux.o	\
 	bcmsdh_sdmmc.o \
 	bcmsdh_sdmmc_linux.o \
-	linux_osl.o \
 	aiutils.o \
 	siutils.o \
 	sbutils.o \

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
@@ -19,7 +19,6 @@
 #include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <hndsoc.h>
 #include <siutils.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
@@ -24,7 +24,6 @@
 #include <linux/pci.h>
 #include <linux/completion.h>
 
-#include <osl.h>
 #include <pcicfg.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -17,7 +17,6 @@
 #include <linux/netdevice.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <sdio.h>		/* SDIO Device and Protocol Specs */
 #include <sdioh.h>		/* SDIO Host Controller Specification */

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
@@ -17,7 +17,6 @@
 #include <linux/sched.h>	/* request_irq() */
 #include <linux/netdevice.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <sdio.h>		/* SDIO Specs */
 #include <bcmsdbus.h>		/* bcmsdh to/from specific controller APIs */

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
@@ -17,7 +17,6 @@
 #include <linux/types.h>
 #include <linux/netdevice.h>
 #include <bcmdefs.h>
-#include <osl.h>
 
 #include <bcmutils.h>
 #include <bcmcdc.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_common.c
@@ -17,7 +17,6 @@
 #include <linux/string.h>
 #include <bcmdefs.h>
 #include <linux/netdevice.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <dngl_stats.h>
 #include <dhd.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
@@ -15,7 +15,6 @@
  */
 
 #include <linux/netdevice.h>
-#include <osl.h>
 #include <bcmutils.h>
 
 #include <dngl_stats.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -32,7 +32,6 @@
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <bcmutils.h>
 
 #include <dngl_stats.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -17,7 +17,6 @@
 #include <linux/types.h>
 #include <bcmdefs.h>
 #include <linux/netdevice.h>
-#include <osl.h>
 #include <bcmsdh.h>
 
 #ifdef BCMEMBEDIMAGE

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/linux_osl.c b/trunk/drivers/staging/brcm80211/brcmfmac/linux_osl.c
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,7 +16,6 @@
 
 #include <linux/kernel.h>
 #include <linux/if_arp.h>
-#include <osl.h>
 
 #include <bcmutils.h>
 

diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_iw.c
@@ -18,7 +18,6 @@
 #include <linux/semaphore.h>
 #include <bcmdefs.h>
 #include <linux/netdevice.h>
-#include <osl.h>
 #include <wlioctl.h>
 
 #include <bcmutils.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/Makefile b/trunk/drivers/staging/brcm80211/brcmsmac/Makefile
@@ -45,7 +45,6 @@ BRCMSMAC_OFILES := \
 	phy/wlc_phy_n.o \
 	phy/wlc_phytbl_lcn.o \
 	phy/wlc_phytbl_n.o \
-	../util/linux_osl.o \
 	../util/aiutils.o \
 	../util/siutils.o \
 	../util/bcmutils.o \

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <linux/delay.h>
 #include <linux/module.h>
 #include <linux/pci.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -20,7 +20,6 @@
 #include <linux/delay.h>
 #include <wlc_cfg.h>
 #include <qmath.h>
-#include <osl.h>
 #include <linux/pci.h>
 #include <siutils.h>
 #include <hndpmu.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
@@ -20,7 +20,6 @@
 #include <wlc_cfg.h>
 #include <linux/delay.h>
 #include <linux/pci.h>
-#include <osl.h>
 #include <siutils.h>
 #include <sbchipc.h>
 #include <hndpmu.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
@@ -16,7 +16,6 @@
 
 #include <linux/types.h>
 #include <sbhnddma.h>
-#include <osl.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_lcn.h>
 

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
@@ -17,7 +17,6 @@
 #include <linux/kernel.h>
 
 #include <sbhnddma.h>
-#include <osl.h>
 #include <wlc_phy_int.h>
 #include <wlc_phytbl_n.h>
 

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -27,7 +27,6 @@
 #include <net/mac80211.h>
 
 #include <proto/802.11.h>
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmwifi.h>
 #include <bcmutils.h>
@@ -729,7 +728,6 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
 			    uint bustype, void *btparam, uint irq)
 {
 	struct wl_info *wl;
-	struct osl_info *osh;
 	int unit, err;
 
 	unsigned long base_addr;
@@ -744,15 +742,11 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
 		return NULL;
 	}
 
-	osh = osl_attach(btparam, bustype);
-	ASSERT(osh);
-
 	/* allocate private info */
 	hw = pci_get_drvdata(btparam);	/* btparam == pdev */
 	wl = hw->priv;
 	ASSERT(wl);
 
-	wl->osh = osh;
 	atomic_set(&wl->callbacks, 0);
 
 	/* setup the bottom half handler */
@@ -1397,9 +1391,6 @@ static void wl_free(struct wl_info *wl)
 		iounmap((void *)wl->regsva);
 	}
 	wl->regsva = NULL;
-
-
-	osl_detach(wl->osh);
 }
 
 /*

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
@@ -51,7 +51,6 @@ struct wl_firmware {
 struct wl_info {
 	struct wlc_pub *pub;		/* pointer to public wlc state */
 	void *wlc;		/* pointer to private common os-independent data */
-	struct osl_info *osh;		/* pointer to os handler */
 	u32 magic;
 
 	int irq;

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <linux/types.h>
 
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <siutils.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -16,7 +16,6 @@
 #include <linux/kernel.h>
 #include <net/mac80211.h>
 
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <siutils.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <siutils.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -22,7 +22,6 @@
 #include <linux/etherdevice.h>
 
 #include <proto/802.11.h>
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
 #include <bcmwifi.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <siutils.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -20,7 +20,6 @@
 
 #include <bcmdefs.h>
 #include <bcmdevs.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>
 #include <siutils.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
@@ -26,7 +26,6 @@
 #include <linux/pci.h>
 
 #include <proto/802.11.h>
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
@@ -18,7 +18,6 @@
 
 #include <proto/802.11.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <wlioctl.h>

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
@@ -20,7 +20,6 @@
 #include <proto/802.11.h>
 
 #include <bcmdefs.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <wlioctl.h>

diff --git a/trunk/drivers/staging/brcm80211/include/osl.h b/trunk/drivers/staging/brcm80211/include/osl.h
diff --git a/trunk/drivers/staging/brcm80211/util/aiutils.c b/trunk/drivers/staging/brcm80211/util/aiutils.c
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <bcmutils.h>

diff --git a/trunk/drivers/staging/brcm80211/util/bcmotp.c b/trunk/drivers/staging/brcm80211/util/bcmotp.c
@@ -18,7 +18,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <bcmdevs.h>

diff --git a/trunk/drivers/staging/brcm80211/util/bcmsrom.c b/trunk/drivers/staging/brcm80211/util/bcmsrom.c
@@ -17,7 +17,6 @@
 #include <linux/string.h>
 #include <linux/etherdevice.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <stdarg.h>

diff --git a/trunk/drivers/staging/brcm80211/util/bcmutils.c b/trunk/drivers/staging/brcm80211/util/bcmutils.c
@@ -23,7 +23,6 @@
 #include <linux/sched.h>
 #include <bcmdefs.h>
 #include <stdarg.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmnvram.h>

diff --git a/trunk/drivers/staging/brcm80211/util/bcmwifi.c b/trunk/drivers/staging/brcm80211/util/bcmwifi.c
@@ -15,7 +15,6 @@
  */
 #include <linux/ctype.h>
 #include <linux/kernel.h>
-#include <osl.h>
 #include <bcmdefs.h>
 #include <bcmutils.h>
 #include <bcmwifi.h>

diff --git a/trunk/drivers/staging/brcm80211/util/hnddma.c b/trunk/drivers/staging/brcm80211/util/hnddma.c
@@ -20,7 +20,6 @@
 #include <linux/pci.h>
 #include <bcmdefs.h>
 #include <bcmdevs.h>
-#include <osl.h>
 #include <hndsoc.h>
 #include <bcmutils.h>
 #include <siutils.h>

diff --git a/trunk/drivers/staging/brcm80211/util/hndpmu.c b/trunk/drivers/staging/brcm80211/util/hndpmu.c
@@ -19,7 +19,6 @@
 #include <linux/module.h>
 #include <linux/pci.h>
 #include <bcmdefs.h>
-#include <osl.h>
 #include <bcmutils.h>
 #include <siutils.h>
 #include <bcmdevs.h>