diff options
author | Michal Kazior <michal.kazior@tieto.com> | 2014-08-25 06:09:38 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2014-08-26 12:04:48 -0400 |
commit | 7aa7a72a23679abf1cea9b3b65a8921244e769a7 (patch) | |
tree | 1fae909aa0300aff481db6fe53e5bd09c696d57b /drivers/net/wireless/ath/ath10k/htt.c | |
parent | 61e9aab7a1930ae031d1b9d948837b5ffd8e3f5e (diff) |
ath10k: improve logging to include dev id
This makes it a lot easier to log and debug
messages if there's more than 1 ath10k device on a
system.
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/htt.c')
-rw-r--r-- | drivers/net/wireless/ath/ath10k/htt.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath10k/htt.c b/drivers/net/wireless/ath/ath10k/htt.c index 19c12cc8d663..87daae11f116 100644 --- a/drivers/net/wireless/ath/ath10k/htt.c +++ b/drivers/net/wireless/ath/ath10k/htt.c | |||
@@ -74,12 +74,14 @@ int ath10k_htt_init(struct ath10k *ar) | |||
74 | 74 | ||
75 | static int ath10k_htt_verify_version(struct ath10k_htt *htt) | 75 | static int ath10k_htt_verify_version(struct ath10k_htt *htt) |
76 | { | 76 | { |
77 | ath10k_dbg(ATH10K_DBG_BOOT, "htt target version %d.%d\n", | 77 | struct ath10k *ar = htt->ar; |
78 | |||
79 | ath10k_dbg(ar, ATH10K_DBG_BOOT, "htt target version %d.%d\n", | ||
78 | htt->target_version_major, htt->target_version_minor); | 80 | htt->target_version_major, htt->target_version_minor); |
79 | 81 | ||
80 | if (htt->target_version_major != 2 && | 82 | if (htt->target_version_major != 2 && |
81 | htt->target_version_major != 3) { | 83 | htt->target_version_major != 3) { |
82 | ath10k_err("unsupported htt major version %d. supported versions are 2 and 3\n", | 84 | ath10k_err(ar, "unsupported htt major version %d. supported versions are 2 and 3\n", |
83 | htt->target_version_major); | 85 | htt->target_version_major); |
84 | return -ENOTSUPP; | 86 | return -ENOTSUPP; |
85 | } | 87 | } |
@@ -89,6 +91,7 @@ static int ath10k_htt_verify_version(struct ath10k_htt *htt) | |||
89 | 91 | ||
90 | int ath10k_htt_setup(struct ath10k_htt *htt) | 92 | int ath10k_htt_setup(struct ath10k_htt *htt) |
91 | { | 93 | { |
94 | struct ath10k *ar = htt->ar; | ||
92 | int status; | 95 | int status; |
93 | 96 | ||
94 | init_completion(&htt->target_version_received); | 97 | init_completion(&htt->target_version_received); |
@@ -100,7 +103,7 @@ int ath10k_htt_setup(struct ath10k_htt *htt) | |||
100 | status = wait_for_completion_timeout(&htt->target_version_received, | 103 | status = wait_for_completion_timeout(&htt->target_version_received, |
101 | HTT_TARGET_VERSION_TIMEOUT_HZ); | 104 | HTT_TARGET_VERSION_TIMEOUT_HZ); |
102 | if (status <= 0) { | 105 | if (status <= 0) { |
103 | ath10k_warn("htt version request timed out\n"); | 106 | ath10k_warn(ar, "htt version request timed out\n"); |
104 | return -ETIMEDOUT; | 107 | return -ETIMEDOUT; |
105 | } | 108 | } |
106 | 109 | ||