diff options
author | Kalle Valo <kvalo@qca.qualcomm.com> | 2013-11-20 10:00:35 +0200 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2013-11-20 10:34:59 +0200 |
commit | 95cbb6a8f1baa4118912a7d38cf4eca7583c868a (patch) | |
tree | 1e3b73fad3f4f30a020c8f858408416f7bc25d8f /drivers/net/wireless/ath/ath10k/pci.c | |
parent | 7d9b40b4618a1f6fcd69db7056903d5cba835c2e (diff) |
ath10k: don't show MSI registration warnings
Convert the MSI failure warnings to a debug message to make them less spammy.
Also convert the irq mode printout to a single print to make it easier to
show it only once.
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/pci.c')
-rw-r--r-- | drivers/net/wireless/ath/ath10k/pci.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 46c94ce58f97..a3cdd72f3148 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -1851,6 +1851,7 @@ static void ath10k_pci_start_bmi(struct ath10k *ar) static int ath10k_pci_hif_power_up(struct ath10k *ar) { struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); + const char *irq_mode; int ret; /* @@ -1916,6 +1917,16 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar) } ath10k_pci_start_bmi(ar); + + if (ar_pci->num_msi_intrs > 1) + irq_mode = "MSI-X"; + else if (ar_pci->num_msi_intrs == 1) + irq_mode = "MSI"; + else + irq_mode = "legacy"; + + ath10k_info("pci irq %s\n", irq_mode); + return 0; err_irq: @@ -2161,7 +2172,8 @@ static int ath10k_pci_start_intr_msix(struct ath10k *ar, int num) } } - ath10k_info("MSI-X interrupt handling (%d intrs)\n", num); + ath10k_dbg(ATH10K_DBG_BOOT, + "MSI-X interrupt handling (%d intrs)\n", num); return 0; } @@ -2182,7 +2194,7 @@ static int ath10k_pci_start_intr_msi(struct ath10k *ar) return ret; } - ath10k_info("MSI interrupt handling\n"); + ath10k_dbg(ATH10K_DBG_BOOT, "MSI interrupt handling\n"); return 0; } @@ -2218,7 +2230,7 @@ static int ath10k_pci_start_intr_legacy(struct ath10k *ar) PCIE_INTR_ENABLE_ADDRESS)); ath10k_pci_sleep(ar); - ath10k_info("legacy interrupt handling\n"); + ath10k_dbg(ATH10K_DBG_BOOT, "legacy interrupt handling\n"); return 0; } @@ -2248,7 +2260,8 @@ static int ath10k_pci_start_intr(struct ath10k *ar) if (ret == 0) goto exit; - ath10k_warn("MSI-X didn't succeed (%d), trying MSI\n", ret); + ath10k_dbg(ATH10K_DBG_BOOT, + "MSI-X didn't succeed (%d), trying MSI\n", ret); num = 1; } @@ -2257,8 +2270,9 @@ static int ath10k_pci_start_intr(struct ath10k *ar) if (ret == 0) goto exit; - ath10k_warn("MSI didn't succeed (%d), trying legacy INTR\n", - ret); + ath10k_dbg(ATH10K_DBG_BOOT, + "MSI didn't succeed (%d), trying legacy INTR\n", + ret); num = 0; } |