diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:49 -0800 |
| commit | 7fff1316b9ecc415fb1d43f438c0668884a24881 (patch) | |
| tree | 0d0c99dccd1a6d2fec46269b80f959c0a827b984 /drivers/staging/winbond/wbhal.c | |
| parent | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (diff) | |
Staging: w35und: remove global struct ieee80211_hw
Remove the my_dev global variable from wbusb.c by passing a pointer to struct
ieee80211_hw around so that packet_came() gets it.
Acked-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/winbond/wbhal.c')
| -rw-r--r-- | drivers/staging/winbond/wbhal.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c index 163ca3c4f11..026a5a8bc34 100644 --- a/drivers/staging/winbond/wbhal.c +++ b/drivers/staging/winbond/wbhal.c @@ -315,9 +315,10 @@ static void hal_led_control(unsigned long data) add_timer(&pHwData->LEDTimer); } - -u8 hal_init_hardware(phw_data_t pHwData, struct wbsoft_priv * adapter) +u8 hal_init_hardware(struct ieee80211_hw *hw) { + struct wbsoft_priv *priv = hw->priv; + phw_data_t pHwData = &priv->sHwData; u16 SoftwareSet; // Initial the variable @@ -333,7 +334,7 @@ u8 hal_init_hardware(phw_data_t pHwData, struct wbsoft_priv * adapter) pHwData->InitialResource = 4; init_timer(&pHwData->LEDTimer); pHwData->LEDTimer.function = hal_led_control; - pHwData->LEDTimer.data = (unsigned long) adapter; + pHwData->LEDTimer.data = (unsigned long) priv; pHwData->LEDTimer.expires = jiffies + msecs_to_jiffies(1000); add_timer(&pHwData->LEDTimer); @@ -349,8 +350,8 @@ u8 hal_init_hardware(phw_data_t pHwData, struct wbsoft_priv * adapter) return false; #endif - Wb35Rx_start( pHwData ); - Wb35Tx_EP2VM_start(adapter); + Wb35Rx_start(hw); + Wb35Tx_EP2VM_start(priv); return true; } |