diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index 333a2784cf0b..14a32c420fd4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
@@ -1544,6 +1544,8 @@ static void iwl_trans_pcie_configure(struct iwl_trans *trans, | |||
1544 | 1544 | ||
1545 | trans_pcie->wd_timeout = | 1545 | trans_pcie->wd_timeout = |
1546 | msecs_to_jiffies(trans_cfg->queue_watchdog_timeout); | 1546 | msecs_to_jiffies(trans_cfg->queue_watchdog_timeout); |
1547 | |||
1548 | trans_pcie->command_names = trans_cfg->command_names; | ||
1547 | } | 1549 | } |
1548 | 1550 | ||
1549 | static void iwl_trans_pcie_free(struct iwl_trans *trans) | 1551 | static void iwl_trans_pcie_free(struct iwl_trans *trans) |
@@ -1635,6 +1637,7 @@ static int iwl_trans_pcie_wait_tx_queue_empty(struct iwl_trans *trans) | |||
1635 | 1637 | ||
1636 | static const char *get_fh_string(int cmd) | 1638 | static const char *get_fh_string(int cmd) |
1637 | { | 1639 | { |
1640 | #define IWL_CMD(x) case x: return #x | ||
1638 | switch (cmd) { | 1641 | switch (cmd) { |
1639 | IWL_CMD(FH_RSCSR_CHNL0_STTS_WPTR_REG); | 1642 | IWL_CMD(FH_RSCSR_CHNL0_STTS_WPTR_REG); |
1640 | IWL_CMD(FH_RSCSR_CHNL0_RBDCB_BASE_REG); | 1643 | IWL_CMD(FH_RSCSR_CHNL0_RBDCB_BASE_REG); |
@@ -1648,6 +1651,7 @@ static const char *get_fh_string(int cmd) | |||
1648 | default: | 1651 | default: |
1649 | return "UNKNOWN"; | 1652 | return "UNKNOWN"; |
1650 | } | 1653 | } |
1654 | #undef IWL_CMD | ||
1651 | } | 1655 | } |
1652 | 1656 | ||
1653 | int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display) | 1657 | int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display) |
@@ -1696,6 +1700,7 @@ int iwl_dump_fh(struct iwl_trans *trans, char **buf, bool display) | |||
1696 | 1700 | ||
1697 | static const char *get_csr_string(int cmd) | 1701 | static const char *get_csr_string(int cmd) |
1698 | { | 1702 | { |
1703 | #define IWL_CMD(x) case x: return #x | ||
1699 | switch (cmd) { | 1704 | switch (cmd) { |
1700 | IWL_CMD(CSR_HW_IF_CONFIG_REG); | 1705 | IWL_CMD(CSR_HW_IF_CONFIG_REG); |
1701 | IWL_CMD(CSR_INT_COALESCING); | 1706 | IWL_CMD(CSR_INT_COALESCING); |
@@ -1723,6 +1728,7 @@ static const char *get_csr_string(int cmd) | |||
1723 | default: | 1728 | default: |
1724 | return "UNKNOWN"; | 1729 | return "UNKNOWN"; |
1725 | } | 1730 | } |
1731 | #undef IWL_CMD | ||
1726 | } | 1732 | } |
1727 | 1733 | ||
1728 | void iwl_dump_csr(struct iwl_trans *trans) | 1734 | void iwl_dump_csr(struct iwl_trans *trans) |