From 85c0abffbacadf4f3201568d7f51404e871a4de3 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 5 Aug 2016 12:28:24 -0700 Subject: [PATCH] qcacld-3.0: Convert wlan_hdd_debugfs.c to unified logging Currently the HDD code uses a variety of logging APIs. In qcacld-3.0 HDD should converge on a unified set of logging APIs. Update wlan_hdd_debugfs.c to use the unified set of APIs. Change-Id: I3981157eb8e285bc7259279fccd582a896eab36b CRs-Fixed: 937649 --- core/hdd/src/wlan_hdd_debugfs.c | 82 +++++++++++---------------------- 1 file changed, 28 insertions(+), 54 deletions(-) diff --git a/core/hdd/src/wlan_hdd_debugfs.c b/core/hdd/src/wlan_hdd_debugfs.c index dd9fc15957ad..cb1155f8e161 100644 --- a/core/hdd/src/wlan_hdd_debugfs.c +++ b/core/hdd/src/wlan_hdd_debugfs.c @@ -35,6 +35,9 @@ */ #ifdef WLAN_OPEN_SOURCE +/* denote that this file does not allow legacy hddLog */ +#define HDD_DISALLOW_LEGACY_HDDLOG 1 + #include #include #include @@ -69,9 +72,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, pAdapter = (hdd_adapter_t *)file->private_data; if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, - "%s: Invalid adapter or adapter has invalid magic.", - __func__); + hdd_alert("Invalid adapter or adapter has invalid magic."); return -EINVAL; } @@ -83,17 +84,14 @@ static ssize_t __wcnss_wowenable_write(struct file *file, if (!sme_is_feature_supported_by_fw(WOW)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Wake-on-Wireless feature is not supported in firmware!", - __func__); + hdd_err("Wake-on-Wireless feature is not supported in firmware!"); return -EINVAL; } if (count > MAX_USER_COMMAND_SIZE_WOWL_ENABLE) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Command length is larger than %d bytes.", - __func__, MAX_USER_COMMAND_SIZE_WOWL_ENABLE); + hdd_err("Command length is larger than %d bytes.", + MAX_USER_COMMAND_SIZE_WOWL_ENABLE); return -EINVAL; } @@ -114,8 +112,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, /* Disable wow */ if (!wow_enable) { if (!hdd_exit_wowl(pAdapter)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: hdd_exit_wowl failed!", __func__); + hdd_err("hdd_exit_wowl failed!"); return -EFAULT; } @@ -142,8 +139,7 @@ static ssize_t __wcnss_wowenable_write(struct file *file, wow_pbm = 1; if (!hdd_enter_wowl(pAdapter, wow_mp, wow_pbm)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: hdd_enter_wowl failed!", __func__); + hdd_err("hdd_enter_wowl failed!"); return -EFAULT; } @@ -199,9 +195,7 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, ENTER(); if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, - "%s: Invalid adapter or adapter has invalid magic.", - __func__); + hdd_alert("Invalid adapter or adapter has invalid magic."); return -EINVAL; } @@ -212,17 +206,14 @@ static ssize_t __wcnss_wowpattern_write(struct file *file, return ret; if (!sme_is_feature_supported_by_fw(WOW)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Wake-on-Wireless feature is not supported in firmware!", - __func__); + hdd_err("Wake-on-Wireless feature is not supported in firmware!"); return -EINVAL; } if (count > MAX_USER_COMMAND_SIZE_WOWL_PATTERN) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Command length is larger than %d bytes.", - __func__, MAX_USER_COMMAND_SIZE_WOWL_PATTERN); + hdd_err("Command length is larger than %d bytes.", + MAX_USER_COMMAND_SIZE_WOWL_PATTERN); return -EINVAL; } @@ -328,9 +319,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, pAdapter = (hdd_adapter_t *)file->private_data; if ((NULL == pAdapter) || (WLAN_HDD_ADAPTER_MAGIC != pAdapter->magic)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, - "%s: Invalid adapter or adapter has invalid magic.", - __func__); + hdd_alert("Invalid adapter or adapter has invalid magic."); return -EINVAL; } @@ -341,9 +330,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, return ret; if (!sme_is_feature_supported_by_fw(WLAN_PERIODIC_TX_PTRN)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Periodic Tx Pattern Offload feature is not supported in firmware!", - __func__); + hdd_err("Periodic Tx Pattern Offload feature is not supported in firmware!"); return -EINVAL; } @@ -351,16 +338,14 @@ static ssize_t __wcnss_patterngen_write(struct file *file, if (count <= MAX_USER_COMMAND_SIZE_FRAME) cmd = qdf_mem_malloc(count + 1); else { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Command length is larger than %d bytes.", - __func__, MAX_USER_COMMAND_SIZE_FRAME); + hdd_err("Command length is larger than %d bytes.", + MAX_USER_COMMAND_SIZE_FRAME); return -EINVAL; } if (!cmd) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - FL("Memory allocation for cmd failed!")); + hdd_err("Memory allocation for cmd failed!"); return -ENOMEM; } @@ -379,9 +364,8 @@ static ssize_t __wcnss_patterngen_write(struct file *file, goto failure; if (pattern_idx > (MAXNUM_PERIODIC_TX_PTRNS - 1)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Pattern index %d is not in the range (0 ~ %d).", - __func__, pattern_idx, MAXNUM_PERIODIC_TX_PTRNS - 1); + hdd_err("Pattern index %d is not in the range (0 ~ %d).", + pattern_idx, MAXNUM_PERIODIC_TX_PTRNS - 1); goto failure; } @@ -398,8 +382,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, delPeriodicTxPtrnParams = qdf_mem_malloc(sizeof(tSirDelPeriodicTxPtrn)); if (!delPeriodicTxPtrnParams) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - FL("Memory allocation failed!")); + hdd_err("Memory allocation failed!"); qdf_mem_free(cmd); return -ENOMEM; } @@ -412,9 +395,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, status = sme_del_periodic_tx_ptrn(pHddCtx->hHal, delPeriodicTxPtrnParams); if (QDF_STATUS_SUCCESS != status) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: sme_del_periodic_tx_ptrn() failed!", - __func__); + hdd_err("sme_del_periodic_tx_ptrn() failed!"); qdf_mem_free(delPeriodicTxPtrnParams); goto failure; @@ -432,8 +413,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, hdd_info("device mode %d", pAdapter->device_mode); if ((QDF_STA_MODE == pAdapter->device_mode) && (!hdd_conn_is_connected(WLAN_HDD_GET_STATION_CTX_PTR(pAdapter)))) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Not in Connected state!", __func__); + hdd_err("Not in Connected state!"); goto failure; } @@ -448,24 +428,21 @@ static ssize_t __wcnss_patterngen_write(struct file *file, /* Since the pattern is a hex string, 2 characters represent 1 byte. */ if (pattern_len % 2) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Malformed pattern!", __func__); + hdd_err("Malformed pattern!"); goto failure; } else pattern_len >>= 1; if (pattern_len < 14 || pattern_len > PERIODIC_TX_PTRN_MAX_SIZE) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: Not an 802.3 frame!", __func__); + hdd_err("Not an 802.3 frame!"); goto failure; } addPeriodicTxPtrnParams = qdf_mem_malloc(sizeof(tSirAddPeriodicTxPtrn)); if (!addPeriodicTxPtrnParams) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - FL("Memory allocation failed!")); + hdd_err("Memory allocation failed!"); qdf_mem_free(cmd); return -ENOMEM; } @@ -490,8 +467,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file, status = sme_add_periodic_tx_ptrn(pHddCtx->hHal, addPeriodicTxPtrnParams); if (QDF_STATUS_SUCCESS != status) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR, - "%s: sme_add_periodic_tx_ptrn() failed!", __func__); + hdd_err("sme_add_periodic_tx_ptrn() failed!"); qdf_mem_free(addPeriodicTxPtrnParams); goto failure; @@ -549,9 +525,7 @@ static int __wcnss_debugfs_open(struct inode *inode, struct file *file) adapter = (hdd_adapter_t *)file->private_data; if ((NULL == adapter) || (WLAN_HDD_ADAPTER_MAGIC != adapter->magic)) { - QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_FATAL, - "%s: Invalid adapter or adapter has invalid magic.", - __func__); + hdd_alert("Invalid adapter or adapter has invalid magic."); return -EINVAL; }