From: Sujith Manoharan Date: Tue, 23 Apr 2013 13:28:42 +0530 Subject: [ath9k-devel] [PATCH 2/3] ath10k: Merge debug levels In-Reply-To: <1366703923-16379-1-git-send-email-sujith@msujith.org> References: <1366703923-16379-1-git-send-email-sujith@msujith.org> Message-ID: <1366703923-16379-2-git-send-email-sujith@msujith.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ath9k-devel@lists.ath9k.org From: Sujith Manoharan BMI, BOOT with CORE and RX with HTT. Signed-off-by: Sujith Manoharan --- drivers/net/wireless/ath/ath10k/bmi.c | 8 ++++---- drivers/net/wireless/ath/ath10k/core.c | 4 ++-- drivers/net/wireless/ath/ath10k/debug.h | 19 ++++++++----------- drivers/net/wireless/ath/ath10k/txrx.c | 2 +- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/bmi.c b/drivers/net/wireless/ath/ath10k/bmi.c index 85bf366..512f54f 100644 --- a/drivers/net/wireless/ath/ath10k/bmi.c +++ b/drivers/net/wireless/ath/ath10k/bmi.c @@ -27,7 +27,7 @@ int ath10k_bmi_done(struct ath10k *ar) int ret; if (ar->bmi.done_sent) { - ath10k_dbg(ATH10K_DBG_BMI, "%s skipped\n", __func__); + ath10k_dbg(ATH10K_DBG_CORE, "%s skipped\n", __func__); return 0; } @@ -91,7 +91,7 @@ int ath10k_bmi_read_memory(struct ath10k *ar, return -EBUSY; } - ath10k_dbg(ATH10K_DBG_BMI, + ath10k_dbg(ATH10K_DBG_CORE, "%s: (device: 0x%p, address: 0x%x, length: %d)\n", __func__, ar, address, length); @@ -130,7 +130,7 @@ int ath10k_bmi_write_memory(struct ath10k *ar, return -EBUSY; } - ath10k_dbg(ATH10K_DBG_BMI, + ath10k_dbg(ATH10K_DBG_CORE, "%s: (device: 0x%p, address: 0x%x, length: %d)\n", __func__, ar, address, length); @@ -176,7 +176,7 @@ int ath10k_bmi_execute(struct ath10k *ar, u32 address, u32 *param) return -EBUSY; } - ath10k_dbg(ATH10K_DBG_BMI, + ath10k_dbg(ATH10K_DBG_CORE, "%s: (device: 0x%p, address: 0x%x, param: %d)\n", __func__, ar, address, *param); diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 07102b8..e2379ff 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -266,7 +266,7 @@ static int ath10k_init_transfer_bin_file(struct ath10k *ar, /* Determine where in Target RAM to write Board Data */ ath10k_bmi_read32(ar, hi_board_ext_data, &board_ext_address); - ath10k_dbg(ATH10K_DBG_BOOT, + ath10k_dbg(ATH10K_DBG_CORE, "ath10k: Board extended Data download addr: 0x%x\n", board_ext_address); @@ -347,7 +347,7 @@ static int ath10k_init_download_firmware(struct ath10k *ar) /* Transfer One Time Programmable data */ address = ar->hw_params.patch_load_addr; - ath10k_dbg(ATH10K_DBG_BOOT, + ath10k_dbg(ATH10K_DBG_CORE, "Using 0x%x for the remainder of init\n", address); status = ath10k_init_transfer_bin_file(ar, ATH10K_FILE_OTP, diff --git a/drivers/net/wireless/ath/ath10k/debug.h b/drivers/net/wireless/ath/ath10k/debug.h index 3ae598a..8c0a499 100644 --- a/drivers/net/wireless/ath/ath10k/debug.h +++ b/drivers/net/wireless/ath/ath10k/debug.h @@ -23,17 +23,14 @@ enum ath10k_debug_mask { ATH10K_DBG_PCI = 0x00000001, - ATH10K_DBG_BMI = 0x00000002, - ATH10K_DBG_WMI = 0x00000004, - ATH10K_DBG_HTC = 0x00000008, - ATH10K_DBG_HTT = 0x00000010, - ATH10K_DBG_MAC = 0x00000020, - ATH10K_DBG_CORE = 0x00000040, - ATH10K_DBG_BOOT = 0x00000080, - ATH10K_DBG_PCI_DUMP = 0x00000100, - ATH10K_DBG_HTT_DUMP = 0x00000200, - ATH10K_DBG_RX = 0x00000400, - ATH10K_DBG_BEACON = 0x00000800, + ATH10K_DBG_WMI = 0x00000002, + ATH10K_DBG_HTC = 0x00000004, + ATH10K_DBG_HTT = 0x00000008, + ATH10K_DBG_MAC = 0x00000010, + ATH10K_DBG_CORE = 0x00000020, + ATH10K_DBG_PCI_DUMP = 0x00000040, + ATH10K_DBG_HTT_DUMP = 0x00000080, + ATH10K_DBG_BEACON = 0x00000100, ATH10K_DBG_ANY = 0xffffffff, }; diff --git a/drivers/net/wireless/ath/ath10k/txrx.c b/drivers/net/wireless/ath/ath10k/txrx.c index 6a66dc2..0e8f86d 100644 --- a/drivers/net/wireless/ath/ath10k/txrx.c +++ b/drivers/net/wireless/ath/ath10k/txrx.c @@ -269,7 +269,7 @@ void ath10k_process_rx(struct ath10k *ar, struct htt_rx_info *info) status->freq = ch->center_freq; rcu_read_unlock(); - ath10k_dbg(ATH10K_DBG_RX, + ath10k_dbg(ATH10K_DBG_HTT, "rx skb %p len %u %s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u\n", info->skb, info->skb->len, -- 1.8.2.1