From: Arend van Spriel <arend@xxxxxxxxxxxx>
The whole need for the OSL concept has been removed from the driver. This
is the final commit removing the source file and include file from the
driver repository. All include statements of osl.h have been removed from
the other source files.
Reviewed-by: Brett Rudley <brudley@xxxxxxxxxxxx>
Reviewed-by: Henry Ptasinski <henryp@xxxxxxxxxxxx>
Reviewed-by: Roland Vossen <rvossen@xxxxxxxxxxxx>
Signed-off-by: Arend van Spriel <arend@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/brcm80211/brcmfmac/Makefile | 1 -
drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 1 -
drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 1 -
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 1 -
.../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 1 -
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 1 -
drivers/staging/brcm80211/brcmfmac/dhd_common.c | 1 -
.../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 1 -
drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 1 -
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 -
drivers/staging/brcm80211/brcmfmac/linux_osl.c | 1 -
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 1 -
drivers/staging/brcm80211/brcmfmac/wl_iw.c | 1 -
drivers/staging/brcm80211/brcmsmac/Makefile | 1 -
.../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 1 -
.../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 1 -
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 1 -
.../brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c | 1 -
.../staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c | 1 -
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 9 ---
drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_main.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 1 -
drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 1 -
drivers/staging/brcm80211/include/osl.h | 29 -----------
drivers/staging/brcm80211/util/aiutils.c | 1 -
drivers/staging/brcm80211/util/bcmotp.c | 1 -
drivers/staging/brcm80211/util/bcmsrom.c | 1 -
drivers/staging/brcm80211/util/bcmutils.c | 1 -
drivers/staging/brcm80211/util/bcmwifi.c | 1 -
drivers/staging/brcm80211/util/hnddma.c | 1 -
drivers/staging/brcm80211/util/hndpmu.c | 1 -
drivers/staging/brcm80211/util/linux_osl.c | 54 --------------------
drivers/staging/brcm80211/util/nicpci.c | 1 -
drivers/staging/brcm80211/util/nvram/nvram_ro.c | 1 -
drivers/staging/brcm80211/util/sbutils.c | 1 -
drivers/staging/brcm80211/util/siutils.c | 1 -
43 files changed, 0 insertions(+), 132 deletions(-)
delete mode 100644 drivers/staging/brcm80211/brcmfmac/linux_osl.c
delete mode 100644 drivers/staging/brcm80211/include/osl.h
delete mode 100644 drivers/staging/brcm80211/util/linux_osl.c
diff --git a/drivers/staging/brcm80211/brcmfmac/Makefile b/drivers/staging/brcm80211/brcmfmac/Makefile
index 040f4a7..ac5a7d4 100644
--- a/drivers/staging/brcm80211/brcmfmac/Makefile
+++ b/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/drivers/staging/brcm80211/brcmfmac/bcmsdh.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
index 6180f64..473f57d 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
index 6842e73..e3556ff 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index e69b77f..65313fa 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c b/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
index ceaa474..d738d4d 100644
--- a/drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c b/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
index 6c0620c..8398fa4 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/dhd_common.c b/drivers/staging/brcm80211/brcmfmac/dhd_common.c
index a80a5c3..64d88c2 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_common.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c b/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
index 1a7a939..cbfa1c1 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 870f3be..ab8e688 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index bb62576..971d406 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/linux_osl.c b/drivers/staging/brcm80211/brcmfmac/linux_osl.c
deleted file mode 100644
index a4d338d..0000000
--- a/drivers/staging/brcm80211/brcmfmac/linux_osl.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../util/linux_osl.c"
diff --git a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index fc92078..1291124 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/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/drivers/staging/brcm80211/brcmfmac/wl_iw.c b/drivers/staging/brcm80211/brcmfmac/wl_iw.c
index f82c10e..4d16644 100644
--- a/drivers/staging/brcm80211/brcmfmac/wl_iw.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/Makefile b/drivers/staging/brcm80211/brcmsmac/Makefile
index b0d3e07..c4aafe5 100644
--- a/drivers/staging/brcm80211/brcmsmac/Makefile
+++ b/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/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
index bb49a0c..fc810e3 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
index 825bf76..a5a7bb8 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
index e51d303..a385873 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
index e962902..81c59b0 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c b/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
index 3dbce71..742df99 100644
--- a/drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 9fdd775..d70ed3d 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
index a4bed8b..f3198cc 100644
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c b/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
index 0b6c6e7..0768496 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_alloc.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index c016648..7f8790d 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c b/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
index 33e3bdf..566be86 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_antsel.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index e419da5..b85194d 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_channel.c b/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
index 49b1ea6..d43948f 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_channel.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index 4527fe2..cb1e142 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c b/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
index e867bf7..1ac6597 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_rate.c b/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
index 863f18f..0cfa360 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_rate.c
+++ b/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/drivers/staging/brcm80211/brcmsmac/wlc_stf.c b/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
index 75aeb28..a6f6e5c 100644
--- a/drivers/staging/brcm80211/brcmsmac/wlc_stf.c
+++ b/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/drivers/staging/brcm80211/include/osl.h b/drivers/staging/brcm80211/include/osl.h
deleted file mode 100644
index 24b114d..0000000
--- a/drivers/staging/brcm80211/include/osl.h
+++ /dev/null
@@ -1,29 +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 _osl_h_
-#define _osl_h_
-
-/* osl handle type forward declaration */
-struct osl_info {
- uint pktalloced; /* Number of allocated packet buffers */
- uint magic;
-};
-
-extern struct osl_info *osl_attach(void *pdev, uint bustype);
-extern void osl_detach(struct osl_info *osh);
-
-#endif /* _osl_h_ */
diff --git a/drivers/staging/brcm80211/util/aiutils.c b/drivers/staging/brcm80211/util/aiutils.c
index 9179897..5708690 100644
--- a/drivers/staging/brcm80211/util/aiutils.c
+++ b/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/drivers/staging/brcm80211/util/bcmotp.c b/drivers/staging/brcm80211/util/bcmotp.c
index e763a0d..b080345 100644
--- a/drivers/staging/brcm80211/util/bcmotp.c
+++ b/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/drivers/staging/brcm80211/util/bcmsrom.c b/drivers/staging/brcm80211/util/bcmsrom.c
index 11b5c08..7373603 100644
--- a/drivers/staging/brcm80211/util/bcmsrom.c
+++ b/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/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 00e5c49..fb0bccc 100644
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/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/drivers/staging/brcm80211/util/bcmwifi.c b/drivers/staging/brcm80211/util/bcmwifi.c
index 3d3e5ea..d82c2b2 100644
--- a/drivers/staging/brcm80211/util/bcmwifi.c
+++ b/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/drivers/staging/brcm80211/util/hnddma.c b/drivers/staging/brcm80211/util/hnddma.c
index 5508147..60afd06 100644
--- a/drivers/staging/brcm80211/util/hnddma.c
+++ b/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/drivers/staging/brcm80211/util/hndpmu.c b/drivers/staging/brcm80211/util/hndpmu.c
index 9113749..59e3ede 100644
--- a/drivers/staging/brcm80211/util/hndpmu.c
+++ b/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>
diff --git a/drivers/staging/brcm80211/util/linux_osl.c b/drivers/staging/brcm80211/util/linux_osl.c
deleted file mode 100644
index 2f76aaf..0000000
--- a/drivers/staging/brcm80211/util/linux_osl.c
+++ /dev/null
@@ -1,54 +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.
- */
-
-#include <linux/delay.h>
-#include <linux/fs.h>
-#ifdef mips
-#include <asm/paccess.h>
-#endif /* mips */
-#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>
-#include <pcicfg.h>
-
-
-#define OS_HANDLE_MAGIC 0x1234abcd /* Magic # to recognise osh */
-#define BCM_MEM_FILENAME_LEN 24 /* Mem. filename length */
-
-struct osl_info *osl_attach(void *pdev, uint bustype)
-{
- struct osl_info *osh;
-
- osh = kmalloc(sizeof(struct osl_info), GFP_ATOMIC);
- ASSERT(osh);
-
- memset(osh, 0, sizeof(struct osl_info));
- osh->magic = OS_HANDLE_MAGIC;
- return osh;
-}
-
-void osl_detach(struct osl_info *osh)
-{
- if (osh == NULL)
- return;
-
- ASSERT(osh->magic == OS_HANDLE_MAGIC);
- kfree(osh);
-}
diff --git a/drivers/staging/brcm80211/util/nicpci.c b/drivers/staging/brcm80211/util/nicpci.c
index b5e79ac..a1fb2f0 100644
--- a/drivers/staging/brcm80211/util/nicpci.c
+++ b/drivers/staging/brcm80211/util/nicpci.c
@@ -18,7 +18,6 @@
#include <linux/string.h>
#include <linux/pci.h>
#include <bcmdefs.h>
-#include <osl.h>
#include <bcmutils.h>
#include <siutils.h>
#include <hndsoc.h>
diff --git a/drivers/staging/brcm80211/util/nvram/nvram_ro.c b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
index a5e8c4d..a697ff1 100644
--- a/drivers/staging/brcm80211/util/nvram/nvram_ro.c
+++ b/drivers/staging/brcm80211/util/nvram/nvram_ro.c
@@ -17,7 +17,6 @@
#include <linux/slab.h>
#include <linux/string.h>
#include <bcmdefs.h>
-#include <osl.h>
#include <bcmutils.h>
#include <siutils.h>
#include <bcmnvram.h>
diff --git a/drivers/staging/brcm80211/util/sbutils.c b/drivers/staging/brcm80211/util/sbutils.c
index 75381e4..21dde8e 100644
--- a/drivers/staging/brcm80211/util/sbutils.c
+++ b/drivers/staging/brcm80211/util/sbutils.c
@@ -19,7 +19,6 @@
#ifdef BRCM_FULLMAC
#include <linux/netdevice.h>
#endif
-#include <osl.h>
#include <bcmutils.h>
#include <siutils.h>
#include <bcmdevs.h>
diff --git a/drivers/staging/brcm80211/util/siutils.c b/drivers/staging/brcm80211/util/siutils.c
index d8d8f82..ed168ce 100644
--- a/drivers/staging/brcm80211/util/siutils.c
+++ b/drivers/staging/brcm80211/util/siutils.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>
--
1.7.4.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
