Commit 57a944435fd0c56ffde42288d8515020b2859e30
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
8e41b4b65d
Exists in
master
and in
7 other branches
Staging: w35und: Remove MTO_FUNC_INPUT macro obfuscation
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 2 changed files with 10 additions and 12 deletions Side-by-side Diff
drivers/staging/winbond/mto.c
| ... | ... | @@ -53,12 +53,12 @@ |
| 53 | 53 | |
| 54 | 54 | static u8 boSparseTxTraffic = false; |
| 55 | 55 | |
| 56 | -void MTO_Init(MTO_FUNC_INPUT); | |
| 57 | -void TxRateReductionCtrl(MTO_FUNC_INPUT); | |
| 56 | +void MTO_Init(struct wbsoft_priv *adapter); | |
| 57 | +void TxRateReductionCtrl(struct wbsoft_priv *adapter); | |
| 58 | 58 | /** 1.1.31.1000 Turbo modify */ |
| 59 | -void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index); | |
| 60 | -void MTO_TxFailed(MTO_FUNC_INPUT); | |
| 61 | -void hal_get_dto_para(MTO_FUNC_INPUT, char *buffer); | |
| 59 | +void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 t0, u8 index); | |
| 60 | +void MTO_TxFailed(struct wbsoft_priv *adapter); | |
| 61 | +void hal_get_dto_para(struct wbsoft_priv *adapter, char *buffer); | |
| 62 | 62 | |
| 63 | 63 | //=========================================================================== |
| 64 | 64 | // MTO_Init -- |
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | // Return Value: |
| 75 | 75 | // None |
| 76 | 76 | //============================================================================ |
| 77 | -void MTO_Init(MTO_FUNC_INPUT) | |
| 77 | +void MTO_Init(struct wbsoft_priv *adapter) | |
| 78 | 78 | { |
| 79 | 79 | int i; |
| 80 | 80 | //[WKCHEN]pMTOcore_data = pcore_data; |
| ... | ... | @@ -189,7 +189,7 @@ |
| 189 | 189 | // If we enable DTO, we will ignore the tx count with different tx rate from |
| 190 | 190 | // DTO rate. This is because when we adjust DTO tx rate, there could be some |
| 191 | 191 | // packets in the tx queue with previous tx rate |
| 192 | -void MTO_SetTxCount(MTO_FUNC_INPUT, u8 tx_rate, u8 index) | |
| 192 | +void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 tx_rate, u8 index) | |
| 193 | 193 | { |
| 194 | 194 | MTO_TXFLOWCOUNT()++; |
| 195 | 195 | if ((MTO_ENABLE==1) && (MTO_RATE_CHANGE_ENABLE()==1)) |
drivers/staging/winbond/mto.h
| ... | ... | @@ -133,8 +133,6 @@ |
| 133 | 133 | } MTO_PARAMETERS, *PMTO_PARAMETERS; |
| 134 | 134 | |
| 135 | 135 | |
| 136 | -#define MTO_FUNC_INPUT struct wbsoft_priv * adapter | |
| 137 | -#define MTO_FUNC_INPUT_DATA adapter | |
| 138 | 136 | #define MTO_DATA() (adapter->sMtoPara) |
| 139 | 137 | #define MTO_HAL() (&adapter->sHwData) |
| 140 | 138 | #define MTO_SET_PREAMBLE_TYPE(x) // 20040511 Turbo mark LM_PREAMBLE_TYPE(&pcore_data->lm_data) = (x) |
| ... | ... | @@ -264,9 +262,9 @@ |
| 264 | 262 | extern void MTO_Init(struct wbsoft_priv *); |
| 265 | 263 | extern void MTO_PeriodicTimerExpired(struct wbsoft_priv *); |
| 266 | 264 | extern void MTO_SetDTORateRange(struct wbsoft_priv *, u8 *, u8); |
| 267 | -extern u8 MTO_GetTxRate(MTO_FUNC_INPUT, u32 fpdu_len); | |
| 268 | -extern u8 MTO_GetTxFallbackRate(MTO_FUNC_INPUT); | |
| 269 | -extern void MTO_SetTxCount(MTO_FUNC_INPUT, u8 t0, u8 index); | |
| 265 | +extern u8 MTO_GetTxRate(struct wbsoft_priv *adapter, u32 fpdu_len); | |
| 266 | +extern u8 MTO_GetTxFallbackRate(struct wbsoft_priv *adapter); | |
| 267 | +extern void MTO_SetTxCount(struct wbsoft_priv *adapter, u8 t0, u8 index); | |
| 270 | 268 | |
| 271 | 269 | #endif //__MTO_H__ |