| Message ID | 20220320233010.123106-2-wlooi@ucalgary.ca (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 26c31016fe7eb1911e9ffa50dbaac6f2c42c799c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | ath9k: suggested improvements and bugfixes | expand |
Wenli Looi <wlooi@ucalgary.ca> writes: > This makes the macros more consistent and removes hidden dependencies on > ah for macros that take _ah as a parameter. > > This change does not appear to affect the final binary. > > Signed-off-by: Wenli Looi <wlooi@ucalgary.ca> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk>
Wenli Looi <wlooi@ucalgary.ca> wrote: > This makes the macros more consistent and removes hidden dependencies on > ah for macros that take _ah as a parameter. > > This change does not appear to affect the final binary. > > Signed-off-by: Wenli Looi <wlooi@ucalgary.ca> > Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> 6 patches applied to ath-next branch of ath.git, thanks. 26c31016fe7e ath9k: make ATH_SREV macros more consistent a96474a794e1 ath9k: split set11nRateFlags and set11nChainSel 3096a4d9eb9b ath9k: use AR9300_MAX_CHAINS when appropriate 9aaff3864b60 ath9k: fix ar9003_get_eepmisc 193025378c44 ath9k: refactor ar9003_hw_spur_mitigate_ofdm 673424ce0e77 ath9k: add functions to get paprd rate mask
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h index 653e79611..8983ea6fc 100644 --- a/drivers/net/wireless/ath/ath9k/reg.h +++ b/drivers/net/wireless/ath/ath9k/reg.h @@ -834,8 +834,8 @@ ((_ah)->hw_version.macRev >= AR_SREV_REVISION_5416_22)) || \ ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9100)) -#define AR_SREV_9100(ah) \ - ((ah->hw_version.macVersion) == AR_SREV_VERSION_9100) +#define AR_SREV_9100(_ah) \ + (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9100)) #define AR_SREV_9100_OR_LATER(_ah) \ (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9100)) @@ -891,7 +891,7 @@ #define AR_SREV_9300_20_OR_LATER(_ah) \ ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300) #define AR_SREV_9300_22(_ah) \ - (AR_SREV_9300(ah) && \ + (AR_SREV_9300((_ah)) && \ ((_ah)->hw_version.macRev == AR_SREV_REVISION_9300_22)) #define AR_SREV_9330(_ah) \ @@ -994,8 +994,8 @@ (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9561)) #define AR_SREV_SOC(_ah) \ - (AR_SREV_9340(_ah) || AR_SREV_9531(_ah) || AR_SREV_9550(ah) || \ - AR_SREV_9561(ah)) + (AR_SREV_9340(_ah) || AR_SREV_9531(_ah) || AR_SREV_9550(_ah) || \ + AR_SREV_9561(_ah)) /* NOTE: When adding chips newer than Peacock, add chip check here */ #define AR_SREV_9580_10_OR_LATER(_ah) \
This makes the macros more consistent and removes hidden dependencies on ah for macros that take _ah as a parameter. This change does not appear to affect the final binary. Signed-off-by: Wenli Looi <wlooi@ucalgary.ca> --- drivers/net/wireless/ath/ath9k/reg.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)