staging: brcm80211: unifdef -UBCMSDIO

Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.c b/drivers/staging/brcm80211/sys/wl_mac80211.c
index 37e6ced84db5a0b027d3a3e4fc4af62a53576234..6c162b9f864a8170a8e2394e890ee4558aede569 100644 (file)
--- a/drivers/staging/brcm80211/sys/wl_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.c
@@ -40,9 +40,6 @@
 #include <wlc_pub.h>
 #include <wlc_scb.h>
 #include <wl_dbg.h>
-#ifdef BCMSDIO
-#include <bcmsdh.h>
-#endif
 #include <wl_export.h>
 
 #include <wl_mac80211.h>
@@ -50,9 +47,6 @@
 #include <wl_ucode.h>
 #include <d11ucode_ext.h>
 
-#ifdef BCMSDIO
-extern struct device *sdiommc_dev;
-#endif
 
 extern void wlc_wme_setparams(wlc_info_t *wlc, u16 aci, void *arg,
                              bool suspend);
@@ -127,7 +121,6 @@ MODULE_DESCRIPTION("Broadcom 802.11n wireless LAN driver.");
 MODULE_SUPPORTED_DEVICE("Broadcom 802.11n WLAN cards");
 MODULE_LICENSE("Dual BSD/GPL");
 
-#ifndef BCMSDIO
 /* recognized PCI IDs */
 static struct pci_device_id wl_id_table[] = {
        {PCI_VENDOR_ID_BROADCOM, 0x4357, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},      /* 43225 2G */
@@ -138,12 +131,7 @@ static struct pci_device_id wl_id_table[] = {
 
 MODULE_DEVICE_TABLE(pci, wl_id_table);
 static void wl_remove(struct pci_dev *pdev);
-#endif                         /* !BCMSDIO */
 
-#ifdef BCMSDIO
-static uint sd_drivestrength = 6;
-module_param(sd_drivestrength, uint, 0);
-#endif
 
 #ifdef BCMDBG
 static int msglevel = 0xdeadbeef;
@@ -701,9 +689,6 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
        tasklet_init(&wl->tasklet, wl_dpc, (unsigned long) wl);
 
 
-#ifdef BCMSDIO
-       SET_IEEE80211_DEV(hw, sdiommc_dev);
-#endif
 
        base_addr = regs;
 
@@ -754,10 +739,6 @@ static wl_info_t *wl_attach(u16 vendor, u16 device, unsigned long regs,
                WL_ERROR(("wl%d: Error setting MPC variable to 0\n",
                          unit));
        }
-#ifdef BCMSDIO
-       /* Set SDIO drive strength */
-       wlc_iovar_setint(wl->wlc, "sd_drivestrength", sd_drivestrength);
-#endif
 
        /* register our interrupt handler */
        if (request_irq(irq, wl_isr, IRQF_SHARED, KBUILD_MODNAME, wl)) {
@@ -1048,7 +1029,6 @@ static int ieee_hw_init(struct ieee80211_hw *hw)
        return ieee_hw_rate_init(hw);
 }
 
-#ifndef BCMSDIO
 /**
  * determines if a device is a WL device, and if so, attaches it.
  *
@@ -1219,7 +1199,6 @@ static struct pci_driver wl_pci_driver = {
  .remove   = __devexit_p(wl_remove),
  .id_table = wl_id_table,
 };
-#endif                         /* !BCMSDIO */
 
 /**
  * This is the main entry point for the WL driver.
@@ -1253,12 +1232,10 @@ static int __init wl_module_init(void)
        }
 #endif                         /* BCMDBG */
 
-#ifndef BCMSDIO
        error = pci_register_driver(&wl_pci_driver);
        if (!error)
                return 0;
 
-#endif                         /* !BCMSDIO */
 
 
        return error;
@@ -1273,9 +1250,7 @@ static int __init wl_module_init(void)
  */
 static void __exit wl_module_exit(void)
 {
-#ifndef BCMSDIO
        pci_unregister_driver(&wl_pci_driver);
-#endif                         /* !BCMSDIO */
 
 }
 

diff --git a/drivers/staging/brcm80211/sys/wl_mac80211.h b/drivers/staging/brcm80211/sys/wl_mac80211.h
index 220d570710cb4497c8edfc830e1e1bd71423a6aa..239ef3a0ed9be208f96f8654252dc5a5564169d3 100644 (file)
--- a/drivers/staging/brcm80211/sys/wl_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wl_mac80211.h
@@ -75,10 +75,6 @@ struct wl_info {
        atomic_t callbacks;     /* # outstanding callback functions */
        struct wl_timer *timers;        /* timer cleanup queue */
        struct tasklet_struct tasklet;  /* dpc tasklet */
-#ifdef BCMSDIO
-       bcmsdh_info_t *sdh;     /* pointer to sdio bus handler */
-       unsigned long flags;            /* current irq flags */
-#endif                         /* BCMSDIO */
        bool resched;           /* dpc needs to be and is rescheduled */
 #ifdef LINUXSTA_PS
        u32 pci_psstate[16];    /* pci ps-state save/restore */

diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c
index 110710ad6e783575578d2334eaf16c628b416ad1..4b27086200492c87f953fd34d38c1ea7022a5910 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_bmac.c
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -56,9 +56,6 @@
 #include <wl_export.h>
 #include "wl_ucode.h"
 #include "d11ucode_ext.h"
-#ifdef BCMSDIO
-#include <bcmsdh.h>
-#endif
 #include <bcmotp.h>
 
 /* BMAC_NOTE: With WLC_HIGH defined, some fns in this file make calls to high level
@@ -3209,9 +3206,7 @@ static inline u32 wlc_intstatus(wlc_info_t *wlc, bool in_isr)
         */
        /* turn off the interrupts */
        W_REG(osh, &regs->macintmask, 0);
-#ifndef BCMSDIO
        (void)R_REG(osh, &regs->macintmask);    /* sync readback */
-#endif
        wlc->macintmask = 0;
 
        /* clear device interrupts */

diff --git a/drivers/staging/brcm80211/sys/wlc_cfg.h b/drivers/staging/brcm80211/sys/wlc_cfg.h
index e36d209c72fdfe10094e696d7c287eafb793ad60..e56adb78f4fa14b8af52d7b58c5e256fda9622b7 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_cfg.h
+++ b/drivers/staging/brcm80211/sys/wlc_cfg.h
@@ -55,22 +55,6 @@
                                         *      3       5356a0
                                         */
 
-#ifdef BCMSDIO
-#define D11CONF 0x100000
-#define SSLPNCONF 2
-#define GCCONF 0
-#define ACCONF 0
-#define NCONF  0
-#define LPCONF 0
-#define LCNCONF        0
-#define NTXD 32
-#define NRXD 16
-#define NRXBUFPOST 8
-#define WLC_DATAHIWAT 32
-#define RXBND 8
-#define MAXPKTCB 64
-#define AMPDU_NUM_MPDU 8
-#endif
 
 /* For undefined values, use defaults */
 #ifndef D11CONF

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.c b/drivers/staging/brcm80211/sys/wlc_mac80211.c
index c6f64c2e461ab2e48893356fdbd707d442b34f71..37a87d8f23c8f5d105bb5301fa6a411984d7c7b0 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.c
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.c
@@ -48,11 +48,7 @@
 #include <wlc_ampdu.h>
 #include <wlc_event.h>
 #include <wl_export.h>
-#ifdef BCMSDIO
-#include <bcmsdh.h>
-#else
 #include "d11ucode_ext.h"
-#endif
 #include <wlc_alloc.h>
 #include <net/mac80211.h>
 #include <wl_dbg.h>

diff --git a/drivers/staging/brcm80211/sys/wlc_mac80211.h b/drivers/staging/brcm80211/sys/wlc_mac80211.h
index 459e3cfc84aa47779b6df68df7b56442e229cdce..8c961e21002f2468183b0d3175428f11eaa9f024 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_mac80211.h
+++ b/drivers/staging/brcm80211/sys/wlc_mac80211.h
@@ -480,9 +480,6 @@ struct wlc_hw_info {
        bool phyclk;            /* phy is out of reset and has clock */
        bool dma_lpbk;          /* core is in DMA loopback */
 
-#ifdef BCMSDIO
-       void *sdh;
-#endif
        bool ucode_loaded;      /* true after ucode downloaded */
 
 

diff --git a/drivers/staging/brcm80211/sys/wlc_pub.h b/drivers/staging/brcm80211/sys/wlc_pub.h
index 09be41d921c56db0eae618a874400a084d5b49dd..2f4b899f0fe185bdea7bbd0ca2dc64d2321fcb90 100644 (file)
--- a/drivers/staging/brcm80211/sys/wlc_pub.h
+++ b/drivers/staging/brcm80211/sys/wlc_pub.h
@@ -318,9 +318,6 @@ typedef struct wlc_pub {
                                 * is implemented properly in osl of that port
                                 * when it enables this Power Save feature.
                                 */
-#ifdef BCMSDIO
-       uint sdiod_drive_strength;      /* SDIO drive strength */
-#endif                         /* BCMSDIO */
 
        u16 boardrev;   /* version # of particular board */
        u8 sromrev;             /* version # of the srom */