Commit 9fa341e5 authored by Arend van Spriel's avatar Arend van Spriel Committed by Greg Kroah-Hartman

staging: brcm80211: cleanup struct wl_info

removed unused field piomode from struct wl_info definition.
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c5e7c035
...@@ -739,7 +739,6 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs, ...@@ -739,7 +739,6 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
{ {
struct wl_info *wl = NULL; struct wl_info *wl = NULL;
int unit, err; int unit, err;
unsigned long base_addr; unsigned long base_addr;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
u8 perm[ETH_ALEN]; u8 perm[ETH_ALEN];
...@@ -768,9 +767,7 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs, ...@@ -768,9 +767,7 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
base_addr = regs; base_addr = regs;
if (bustype == PCI_BUS) { if (bustype == PCI_BUS || bustype == RPC_BUS) {
wl->piomode = false;
} else if (bustype == RPC_BUS) {
/* Do nothing */ /* Do nothing */
} else { } else {
bustype = PCI_BUS; bustype = PCI_BUS;
...@@ -796,7 +793,7 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs, ...@@ -796,7 +793,7 @@ static struct wl_info *wl_attach(u16 vendor, u16 device, unsigned long regs,
} }
/* common load-time initialization */ /* 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->regsva, wl->bcm_bustype, btparam, &err);
wl_release_fw(wl); wl_release_fw(wl);
if (!wl->wlc) { if (!wl->wlc) {
......
...@@ -57,11 +57,15 @@ struct wl_info { ...@@ -57,11 +57,15 @@ struct wl_info {
spinlock_t lock; /* per-device perimeter lock */ spinlock_t lock; /* per-device perimeter lock */
spinlock_t isr_lock; /* per-device ISR synchronization lock */ spinlock_t isr_lock; /* per-device ISR synchronization lock */
/* bus type and regsva for unmap in wl_free() */
uint bcm_bustype; /* bus type */ uint bcm_bustype; /* bus type */
bool piomode; /* set from insmod argument */
void *regsva; /* opaque chip registers virtual address */ void *regsva; /* opaque chip registers virtual address */
/* timer related fields */
atomic_t callbacks; /* # outstanding callback functions */ atomic_t callbacks; /* # outstanding callback functions */
struct wl_timer *timers; /* timer cleanup queue */ struct wl_timer *timers; /* timer cleanup queue */
struct tasklet_struct tasklet; /* dpc tasklet */ struct tasklet_struct tasklet; /* dpc tasklet */
bool resched; /* dpc needs to be and is rescheduled */ bool resched; /* dpc needs to be and is rescheduled */
#ifdef LINUXSTA_PS #ifdef LINUXSTA_PS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment