diff options
author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2012-06-12 10:48:22 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 14:36:02 -0400 |
commit | 26e942b790eddc757b5be179ef67907e025ff87b (patch) | |
tree | 2ad5e250d5fb6b438d1de6023fe2aef4e0143e1d /drivers | |
parent | 6d97be48e27603f99743fc0e94e57dce2edb9cbf (diff) |
ath9k_hw: remove MCI_STATE_CONT_* state
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_mci.c | 9 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_mci.h | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/mci.c | 22 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/reg.h | 4 |
4 files changed, 10 insertions, 28 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c index 1508500e73b..25f99ef48b2 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c +++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c | |||
@@ -1191,15 +1191,6 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type) | |||
1191 | AR_MCI_RX_REMOTE_SLEEP) ? | 1191 | AR_MCI_RX_REMOTE_SLEEP) ? |
1192 | MCI_BT_SLEEP : MCI_BT_AWAKE; | 1192 | MCI_BT_SLEEP : MCI_BT_AWAKE; |
1193 | break; | 1193 | break; |
1194 | case MCI_STATE_CONT_RSSI_POWER: | ||
1195 | value = MS(mci->cont_status, AR_MCI_CONT_RSSI_POWER); | ||
1196 | break; | ||
1197 | case MCI_STATE_CONT_PRIORITY: | ||
1198 | value = MS(mci->cont_status, AR_MCI_CONT_RRIORITY); | ||
1199 | break; | ||
1200 | case MCI_STATE_CONT_TXRX: | ||
1201 | value = MS(mci->cont_status, AR_MCI_CONT_TXRX); | ||
1202 | break; | ||
1203 | case MCI_STATE_SET_BT_SLEEP: | 1194 | case MCI_STATE_SET_BT_SLEEP: |
1204 | mci->bt_state = MCI_BT_SLEEP; | 1195 | mci->bt_state = MCI_BT_SLEEP; |
1205 | break; | 1196 | break; |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.h b/drivers/net/wireless/ath/ath9k/ar9003_mci.h index 0c02bd86597..98bfc62d6b9 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_mci.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.h | |||
@@ -195,9 +195,6 @@ enum mci_state_type { | |||
195 | MCI_STATE_SET_BT_CAL, | 195 | MCI_STATE_SET_BT_CAL, |
196 | MCI_STATE_LAST_SCHD_MSG_OFFSET, | 196 | MCI_STATE_LAST_SCHD_MSG_OFFSET, |
197 | MCI_STATE_REMOTE_SLEEP, | 197 | MCI_STATE_REMOTE_SLEEP, |
198 | MCI_STATE_CONT_RSSI_POWER, | ||
199 | MCI_STATE_CONT_PRIORITY, | ||
200 | MCI_STATE_CONT_TXRX, | ||
201 | MCI_STATE_RESET_REQ_WAKE, | 198 | MCI_STATE_RESET_REQ_WAKE, |
202 | MCI_STATE_SEND_WLAN_COEX_VERSION, | 199 | MCI_STATE_SEND_WLAN_COEX_VERSION, |
203 | MCI_STATE_SEND_VERSION_QUERY, | 200 | MCI_STATE_SEND_VERSION_QUERY, |
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c index 15645489258..e83d7200f76 100644 --- a/drivers/net/wireless/ath/ath9k/mci.c +++ b/drivers/net/wireless/ath/ath9k/mci.c | |||
@@ -517,23 +517,17 @@ void ath_mci_intr(struct ath_softc *sc) | |||
517 | mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_LNA_INFO; | 517 | mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_LNA_INFO; |
518 | 518 | ||
519 | if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_INFO) { | 519 | if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_INFO) { |
520 | int value_dbm = ar9003_mci_state(ah, | 520 | int value_dbm = MS(mci_hw->cont_status, |
521 | MCI_STATE_CONT_RSSI_POWER); | 521 | AR_MCI_CONT_RSSI_POWER); |
522 | 522 | ||
523 | mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_CONT_INFO; | 523 | mci_int_rxmsg &= ~AR_MCI_INTERRUPT_RX_MSG_CONT_INFO; |
524 | 524 | ||
525 | if (ar9003_mci_state(ah, MCI_STATE_CONT_TXRX)) | 525 | ath_dbg(common, MCI, |
526 | ath_dbg(common, MCI, | 526 | "MCI CONT_INFO: (%s) pri = %d pwr = %d dBm\n", |
527 | "MCI CONT_INFO: (tx) pri = %d, pwr = %d dBm\n", | 527 | MS(mci_hw->cont_status, AR_MCI_CONT_TXRX) ? |
528 | ar9003_mci_state(ah, | 528 | "tx" : "rx", |
529 | MCI_STATE_CONT_PRIORITY), | 529 | MS(mci_hw->cont_status, AR_MCI_CONT_PRIORITY), |
530 | value_dbm); | 530 | value_dbm); |
531 | else | ||
532 | ath_dbg(common, MCI, | ||
533 | "MCI CONT_INFO: (rx) pri = %d,pwr = %d dBm\n", | ||
534 | ar9003_mci_state(ah, | ||
535 | MCI_STATE_CONT_PRIORITY), | ||
536 | value_dbm); | ||
537 | } | 531 | } |
538 | 532 | ||
539 | if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_NACK) | 533 | if (mci_int_rxmsg & AR_MCI_INTERRUPT_RX_MSG_CONT_NACK) |
diff --git a/drivers/net/wireless/ath/ath9k/reg.h b/drivers/net/wireless/ath/ath9k/reg.h index 560d6effac7..75acefbd493 100644 --- a/drivers/net/wireless/ath/ath9k/reg.h +++ b/drivers/net/wireless/ath/ath9k/reg.h | |||
@@ -2098,8 +2098,8 @@ enum { | |||
2098 | #define AR_MCI_CONT_STATUS 0x1848 | 2098 | #define AR_MCI_CONT_STATUS 0x1848 |
2099 | #define AR_MCI_CONT_RSSI_POWER 0x000000FF | 2099 | #define AR_MCI_CONT_RSSI_POWER 0x000000FF |
2100 | #define AR_MCI_CONT_RSSI_POWER_S 0 | 2100 | #define AR_MCI_CONT_RSSI_POWER_S 0 |
2101 | #define AR_MCI_CONT_RRIORITY 0x0000FF00 | 2101 | #define AR_MCI_CONT_PRIORITY 0x0000FF00 |
2102 | #define AR_MCI_CONT_RRIORITY_S 8 | 2102 | #define AR_MCI_CONT_PRIORITY_S 8 |
2103 | #define AR_MCI_CONT_TXRX 0x00010000 | 2103 | #define AR_MCI_CONT_TXRX 0x00010000 |
2104 | #define AR_MCI_CONT_TXRX_S 16 | 2104 | #define AR_MCI_CONT_TXRX_S 16 |
2105 | 2105 | ||