Skip to content

Commit

Permalink
staging: brcm80211: move sdio related variables to dhd_sdio.c
Browse files Browse the repository at this point in the history
In fullmac some variables are used by sdio layer declared in
dhd_linux.c. Move them to dhd_sdio.c for clean up.

Signed-off-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Franky Lin authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 1f44a82 commit e1ae77b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 35 deletions.
13 changes: 0 additions & 13 deletions drivers/staging/brcm80211/brcmfmac/dhd.h
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,6 @@ extern atomic_t brcmf_mmc_suspend;
* Insmod parameters for debug/test
*/

/* Use interrupts */
extern uint brcmf_intr;

/* Use polling */
extern uint brcmf_poll;

/* ARP offload agent mode */
extern uint brcmf_arp_mode;

Expand All @@ -696,13 +690,6 @@ extern uint brcmf_roam;
/* Roaming mode control */
extern uint brcmf_radio_up;

/* Initial idletime ticks (may be -1 for immediate idle, 0 for no idle) */
extern int brcmf_idletime;
#define BRCMF_IDLETIME_TICKS 1

/* SDIO Drive Strength */
extern uint brcmf_sdiod_drive_strength;

/* Override to force tx queueing all the time */
extern uint brcmf_force_tx_queueing;

Expand Down
22 changes: 0 additions & 22 deletions drivers/staging/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@ module_param(brcmf_pkt_filter_init, uint, 0);
uint brcmf_master_mode = true;
module_param(brcmf_master_mode, uint, 0);

module_param(brcmf_dongle_memsize, int, 0);

/* Contorl fw roaming */
uint brcmf_roam = 1;

Expand All @@ -132,26 +130,6 @@ module_param_string(iface_name, iface_name, IFNAMSIZ, 0);
/* IOCTL response timeout */
int brcmf_ioctl_timeout_msec = IOCTL_RESP_TIMEOUT;

/* Idle timeout for backplane clock */
int brcmf_idletime = BRCMF_IDLETIME_TICKS;
module_param(brcmf_idletime, int, 0);

/* Use polling */
uint brcmf_poll;
module_param(brcmf_poll, uint, 0);

/* Use interrupts */
uint brcmf_intr = true;
module_param(brcmf_intr, uint, 0);

/* SDIO Drive Strength (in milliamps) */
uint brcmf_sdiod_drive_strength = 6;
module_param(brcmf_sdiod_drive_strength, uint, 0);

/* Tx/Rx bounds */
module_param(brcmf_txbound, uint, 0);
module_param(brcmf_rxbound, uint, 0);

#ifdef SDTEST
/* Echo packet generator (pkts/s) */
uint brcmf_pktgen;
Expand Down
18 changes: 18 additions & 0 deletions drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -838,11 +838,29 @@ module_param(brcmf_console_ms, uint, 0);
/* Tx/Rx bounds */
uint brcmf_txbound;
uint brcmf_rxbound;
module_param(brcmf_txbound, uint, 0);
module_param(brcmf_rxbound, uint, 0);
uint brcmf_txminmax;

int brcmf_idletime = 1;
module_param(brcmf_idletime, int, 0);

/* SDIO Drive Strength (in milliamps) */
uint brcmf_sdiod_drive_strength = 6;
module_param(brcmf_sdiod_drive_strength, uint, 0);

/* Use polling */
uint brcmf_poll;
module_param(brcmf_poll, uint, 0);

/* Use interrupts */
uint brcmf_intr = true;
module_param(brcmf_intr, uint, 0);

/* override the RAM size if possible */
#define DONGLE_MIN_MEMSIZE (128 * 1024)
int brcmf_dongle_memsize;
module_param(brcmf_dongle_memsize, int, 0);

static bool brcmf_alignctl;

Expand Down

0 comments on commit e1ae77b

Please sign in to comment.