Commit 037fd9b6 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by John W. Linville

ath_hw: Use common REG_WRITE parameter order

All defines for REG_WRITE in Atheros wireless drivers use the order "ah",
"register" and "value". hw.c is the only file using the order "ah", "value" and
"register".

drivers/net/wireless/ath/ath9k/hw.h:#define REG_WRITE(_ah, _reg, _val) \
drivers/net/wireless/ath/key.c:#define REG_WRITE(_ah, _reg, _val) (common->ops->write)(_ah, _val, _reg)

This inconsistent definition can easily lead to implementation errors. The
modification doesn't change the behavior of the driver or the generated code.
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <siwu@hrz.tu-chemnitz.de>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ed9f0ed3
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "ath.h" #include "ath.h"
#include "reg.h" #include "reg.h"
#define REG_READ (common->ops->read) #define REG_READ (common->ops->read)
#define REG_WRITE (common->ops->write) #define REG_WRITE(_ah, _reg, _val) (common->ops->write)(_ah, _val, _reg)
/** /**
* ath_hw_set_bssid_mask - filter out bssids we listen * ath_hw_set_bssid_mask - filter out bssids we listen
...@@ -119,8 +119,8 @@ void ath_hw_setbssidmask(struct ath_common *common) ...@@ -119,8 +119,8 @@ void ath_hw_setbssidmask(struct ath_common *common)
{ {
void *ah = common->ah; void *ah = common->ah;
REG_WRITE(ah, get_unaligned_le32(common->bssidmask), AR_BSSMSKL); REG_WRITE(ah, AR_BSSMSKL, get_unaligned_le32(common->bssidmask));
REG_WRITE(ah, get_unaligned_le16(common->bssidmask + 4), AR_BSSMSKU); REG_WRITE(ah, AR_BSSMSKU, get_unaligned_le16(common->bssidmask + 4));
} }
EXPORT_SYMBOL(ath_hw_setbssidmask); EXPORT_SYMBOL(ath_hw_setbssidmask);
...@@ -139,7 +139,7 @@ void ath_hw_cycle_counters_update(struct ath_common *common) ...@@ -139,7 +139,7 @@ void ath_hw_cycle_counters_update(struct ath_common *common)
void *ah = common->ah; void *ah = common->ah;
/* freeze */ /* freeze */
REG_WRITE(ah, AR_MIBC_FMC, AR_MIBC); REG_WRITE(ah, AR_MIBC, AR_MIBC_FMC);
/* read */ /* read */
cycles = REG_READ(ah, AR_CCCNT); cycles = REG_READ(ah, AR_CCCNT);
...@@ -148,13 +148,13 @@ void ath_hw_cycle_counters_update(struct ath_common *common) ...@@ -148,13 +148,13 @@ void ath_hw_cycle_counters_update(struct ath_common *common)
tx = REG_READ(ah, AR_TFCNT); tx = REG_READ(ah, AR_TFCNT);
/* clear */ /* clear */
REG_WRITE(ah, 0, AR_CCCNT); REG_WRITE(ah, AR_CCCNT, 0);
REG_WRITE(ah, 0, AR_RFCNT); REG_WRITE(ah, AR_RFCNT, 0);
REG_WRITE(ah, 0, AR_RCCNT); REG_WRITE(ah, AR_RCCNT, 0);
REG_WRITE(ah, 0, AR_TFCNT); REG_WRITE(ah, AR_TFCNT, 0);
/* unfreeze */ /* unfreeze */
REG_WRITE(ah, 0, AR_MIBC); REG_WRITE(ah, AR_MIBC, 0);
/* update all cycle counters here */ /* update all cycle counters here */
common->cc_ani.cycles += cycles; common->cc_ani.cycles += cycles;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment