staging: brcm80211: cleanup struct wl_info

removed unused field piomode from struct wl_info definition.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
index 3deb9036372cd6988a6dffd5d743725396a56802..f951f22fd2eac3ccc4ff5ad1828c1edcd2340c0b 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
@@ -739,7 +739,6 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
 {
        struct wl_info *wl = NULL;
        int unit, err;
-
        unsigned long base_addr;
        struct ieee80211_hw *hw;
        u8 perm[ETH_ALEN];
@@ -768,9 +767,7 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
 
        base_addr = regs;
 
-       if (bustype == PCI_BUS) {
-               wl->piomode = false;
-       } else if (bustype == RPC_BUS) {
+       if (bustype == PCI_BUS || bustype == RPC_BUS) {
                /* Do nothing */
        } else {
                bustype = PCI_BUS;
@@ -796,7 +793,7 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
        }
 
        /* common load-time initialization */
-       wl->wlc = wlc_attach((void *)wl, vendor, device, unit, wl->piomode,
+       wl->wlc = wlc_attach((void *)wl, vendor, device, unit, false,
                             wl->regsva, wl->bcm_bustype, btparam, &err);
        wl_release_fw(wl);
        if (!wl->wlc) {

diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
index e703d8bb94d6043dc6e491f2431be69ab27f944d..c878690c06276a5c5aca6ddb0dbf20edc6d7d4f3 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
+++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.h
@@ -57,11 +57,15 @@ struct wl_info {
 
        spinlock_t lock;        /* per-device perimeter lock */
        spinlock_t isr_lock;    /* per-device ISR synchronization lock */
+
+       /* bus type and regsva for unmap in wl_free() */
        uint bcm_bustype;       /* bus type */
-       bool piomode;           /* set from insmod argument */
        void *regsva;           /* opaque chip registers virtual address */
+
+       /* timer related fields */
        atomic_t callbacks;     /* # outstanding callback functions */
        struct wl_timer *timers;        /* timer cleanup queue */
+
        struct tasklet_struct tasklet;  /* dpc tasklet */
        bool resched;           /* dpc needs to be and is rescheduled */
 #ifdef LINUXSTA_PS