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/net/wireless/ath/ath9k/mci.c | |
| 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/net/wireless/ath/ath9k/mci.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/mci.c | 22 |
1 files changed, 8 insertions, 14 deletions
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) |