diff options
| author | Pekka Enberg <penberg@cs.helsinki.fi> | 2008-10-30 16:14:38 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-01-06 13:51:49 -0800 |
| commit | 1e8a2b60339a050f4fd383e332a5dd66b75f4f02 (patch) | |
| tree | 4caedc94ac170b32d18336833c9387a10b532078 /drivers/staging/winbond/wbhal.c | |
| parent | ac418b8faaaad7a17474c8fba5c2e5917c91cf31 (diff) | |
Staging: w35und: merge struct wb35_adapter to struct wbsoft_priv
This patch merges struct wb35_adapter to struct wbsoft_priv. Now we can finally
start passing a pointer to struct ieee80211_hw around where necessary.
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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/winbond/wbhal.c b/drivers/staging/winbond/wbhal.c index 1fb8c3d78467..163ca3c4f117 100644 --- a/drivers/staging/winbond/wbhal.c +++ b/drivers/staging/winbond/wbhal.c @@ -32,7 +32,7 @@ void hal_get_permanent_address( phw_data_t pHwData, u8 *pethernet_address ) static void hal_led_control(unsigned long data) { - struct wb35_adapter *adapter = (struct wb35_adapter *) data; + struct wbsoft_priv *adapter = (struct wbsoft_priv *) data; phw_data_t pHwData = &adapter->sHwData; struct wb35_reg *reg = &pHwData->reg; u32 LEDSet = (pHwData->SoftwareSet & HAL_LED_SET_MASK) >> HAL_LED_SET_SHIFT; @@ -316,7 +316,7 @@ static void hal_led_control(unsigned long data) } -u8 hal_init_hardware(phw_data_t pHwData, struct wb35_adapter * adapter) +u8 hal_init_hardware(phw_data_t pHwData, struct wbsoft_priv * adapter) { u16 SoftwareSet; @@ -671,7 +671,7 @@ s32 hal_get_rssi( phw_data_t pHwData, u32 *HalRssiArry, u8 Count ) return ltmp; } //---------------------------------------------------------------------------------------------------- -s32 hal_get_rssi_bss(struct wb35_adapter *adapter, u16 idx, u8 Count) +s32 hal_get_rssi_bss(struct wbsoft_priv *adapter, u16 idx, u8 Count) { phw_data_t pHwData = &adapter->sHwData; struct wb35_reg *reg = &pHwData->reg; @@ -841,7 +841,7 @@ void hal_system_power_change(phw_data_t pHwData, u32 PowerState) } } -void hal_surprise_remove(struct wb35_adapter *adapter) +void hal_surprise_remove(struct wbsoft_priv *adapter) { phw_data_t pHwData = &adapter->sHwData; @@ -853,7 +853,7 @@ void hal_surprise_remove(struct wb35_adapter *adapter) } } -void hal_rate_change(struct wb35_adapter *adapter) // Notify the HAL rate is changing 20060613.1 +void hal_rate_change(struct wbsoft_priv *adapter) // Notify the HAL rate is changing 20060613.1 { phw_data_t pHwData = &adapter->sHwData; u8 rate = CURRENT_TX_RATE; |