lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Remove hdd_notice

Browse Source 
hdd_notice() is a redundant re-definition of hdd_info(), so remove it.
Replace existing usages with hdd_info() or hdd_debug() as appropriate.

Change-Id: Ie8ce7530c0118eff740975dcce396b68c2115429
CRs-Fixed: 2205815
This commit is contained in:
Dustin Brown 2018-03-14 11:50:23 -07:00 committed by nshrivas
parent 813b2bf082
commit 5e89ef8673
8 changed files with 63 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/hdd/inc/wlan_hdd_main.h
View File

@ -258,8 +258,6 @@
hdd_logfl(QDF_TRACE_LEVEL_ERROR, format, ## args)
#define hdd_warn(format, args...) \
hdd_logfl(QDF_TRACE_LEVEL_WARN, format, ## args)
#define hdd_notice(format, args...) \
hdd_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
#define hdd_info(format, args...) \
hdd_logfl(QDF_TRACE_LEVEL_INFO, format, ## args)
#define hdd_debug(format, args...) \

8
core/hdd/src/wlan_hdd_cfg.c
View File

@ -7059,9 +7059,9 @@ void hdd_cfg_print(struct hdd_context *hdd_ctx)
hdd_ctx->config->force_ssc_disable_indoor_channel);
#ifdef FEATURE_LFR_SUBNET_DETECTION
hdd_notice("Name = [%s] Value = [%d]",
CFG_ENABLE_LFR_SUBNET_DETECTION,
hdd_ctx->config->enable_lfr_subnet_detection);
hdd_debug("Name = [%s] Value = [%d]",
CFG_ENABLE_LFR_SUBNET_DETECTION,
hdd_ctx->config->enable_lfr_subnet_detection);
#endif
hdd_debug("Name = [%s] Value = [%u]",
CFG_ROAM_DENSE_TRAFFIC_THRESHOLD,
@ -7803,7 +7803,7 @@ QDF_STATUS hdd_set_idle_ps_config(struct hdd_context *hdd_ctx, bool val)
hdd_debug("Enter Val %d", val);
if (hdd_ctx->imps_enabled == val) {
hdd_notice("Already in the requested power state:%d", val);
hdd_info("Already in the requested power state:%d", val);
return QDF_STATUS_SUCCESS;
}

15
core/hdd/src/wlan_hdd_cfg80211.c
View File

@ -1885,7 +1885,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
qdf_mem_copy(sap_config->self_macaddr.bytes,
adapter->mac_addr.bytes, sizeof(struct qdf_mac_addr));
hdd_notice("ACS Started for %s", adapter->dev->name);
hdd_info("ACS Started for %s", adapter->dev->name);
status = wlansap_acs_chselect(
WLAN_HDD_GET_SAP_CTX_PTR(adapter),
acs_event_callback, sap_config, adapter->dev);
@ -4118,7 +4118,7 @@ void hdd_chip_pwr_save_fail_detected_cb(void *hddctx,
flags);
if (!skb) {
hdd_notice("cfg80211_vendor_event_alloc failed");
hdd_info("cfg80211_vendor_event_alloc failed");
return;
}
@ -7693,7 +7693,7 @@ static int __wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy,
* As part of DRIVER ring ID, flush both driver and fw logs.
* For other Ring ID's driver doesn't have any rings to flush
*/
hdd_notice("Bug report triggered by framework");
hdd_info("Bug report triggered by framework");
status = cds_flush_logs(WLAN_LOG_TYPE_NON_FATAL,
WLAN_LOG_INDICATOR_FRAMEWORK,
@ -11326,14 +11326,14 @@ static QDF_STATUS wlan_hdd_validate_acs_channel(struct hdd_adapter *adapter,
if ((wlansap_is_channel_in_nol_list(WLAN_HDD_GET_SAP_CTX_PTR(adapter),
channel,
PHY_SINGLE_CHANNEL_CENTERED))) {
hdd_notice("channel %d is in nol", channel);
hdd_info("channel %d is in nol", channel);
return -EINVAL;
}
if ((wlansap_is_channel_leaking_in_nol(
WLAN_HDD_GET_SAP_CTX_PTR(adapter),
channel, chan_bw))) {
hdd_notice("channel %d is leaking in nol", channel);
hdd_info("channel %d is leaking in nol", channel);
return -EINVAL;
}
@ -16695,8 +16695,7 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(struct hdd_adapter *adapter,
return -EINVAL;
}
hdd_notice(MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(roam_info->bssid.bytes));
hdd_info(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(roam_info->bssid.bytes));
cfg80211_pmksa_candidate_notify(dev, index,
roam_info->bssid.bytes,
preauth, GFP_KERNEL);
@ -17468,7 +17467,7 @@ static int wlan_hdd_cfg80211_set_auth_type(struct hdd_adapter *adapter,
(defined(CFG80211_FILS_SK_OFFLOAD_SUPPORT) || \
(LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)))
case NL80211_AUTHTYPE_FILS_SK:
hdd_notice("set authentication type to FILS SHARED");
hdd_debug("set authentication type to FILS SHARED");
sta_ctx->conn_info.authType = eCSR_AUTH_TYPE_OPEN_SYSTEM;
break;
#endif

32
core/hdd/src/wlan_hdd_hostapd.c
View File

@ -2108,16 +2108,16 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
case eSAP_STA_REASSOC_EVENT:
event = &pSapEvent->sapevt.sapStationAssocReassocCompleteEvent;
if (eSAP_STATUS_FAILURE == event->status) {
hdd_notice("assoc failure: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
hdd_info("assoc failure: " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
break;
}
wrqu.addr.sa_family = ARPHRD_ETHER;
memcpy(wrqu.addr.sa_data,
&event->staMac, QDF_MAC_ADDR_SIZE);
hdd_notice(" associated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
hdd_info("associated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
we_event = IWEVREGISTERED;
if ((eCSR_ENCRYPT_TYPE_NONE == ap_ctx->encryption_type) ||
@ -2279,8 +2279,8 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
&pSapEvent->sapevt.sapStationDisassocCompleteEvent;
memcpy(wrqu.addr.sa_data,
&disassoc_comp->staMac, QDF_MAC_ADDR_SIZE);
hdd_notice(" disassociated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
hdd_info("disassociated " MAC_ADDRESS_STR,
MAC_ADDR_ARRAY(wrqu.addr.sa_data));
stainfo = hdd_get_stainfo(adapter->cache_sta_info,
disassoc_comp->staMac);
@ -2415,12 +2415,12 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
i <
pSapEvent->sapevt.sapAssocStaListEvent.
noOfAssocSta; i++) {
hdd_notice("Associated Sta Num %d:assocId=%d, staId=%d, staMac="
MAC_ADDRESS_STR, i + 1,
pAssocStasArray->assocId,
pAssocStasArray->staId,
MAC_ADDR_ARRAY(pAssocStasArray->staMac.
bytes));
hdd_info("Associated Sta Num %d:assocId=%d, staId=%d, staMac="
MAC_ADDRESS_STR, i + 1,
pAssocStasArray->assocId,
pAssocStasArray->staId,
MAC_ADDR_ARRAY(pAssocStasArray->staMac.
bytes));
pAssocStasArray++;
}
}
@ -2587,7 +2587,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
return QDF_STATUS_SUCCESS;
case eSAP_DFS_NEXT_CHANNEL_REQ:
hdd_notice("Sending next channel query to userspace");
hdd_debug("Sending next channel query to userspace");
hdd_update_acs_timer_reason(adapter,
QCA_WLAN_VENDOR_ACS_SELECT_REASON_DFS);
return QDF_STATUS_SUCCESS;
@ -3494,7 +3494,7 @@ static __iw_softap_setparam(struct net_device *dev,
}
req.stats = set_value;
req.channel = adapter->session.ap.operating_channel;
hdd_notice("QCSAP_PARAM_SET_TXRX_STATS val %d", set_value);
hdd_info("QCSAP_PARAM_SET_TXRX_STATS val %d", set_value);
ret = cdp_txrx_stats_request(soc, vdev, &req);
break;
}
@ -3996,13 +3996,13 @@ static __iw_softap_setparam(struct net_device *dev,
ret = hdd_set_peer_rate(adapter, set_value);
break;
case QCASAP_PARAM_DCM:
hdd_notice("Set WMI_VDEV_PARAM_HE_DCM: %d", set_value);
hdd_debug("Set WMI_VDEV_PARAM_HE_DCM: %d", set_value);
ret = wma_cli_set_command(adapter->session_id,
WMI_VDEV_PARAM_HE_DCM, set_value,
VDEV_CMD);
break;
case QCASAP_PARAM_RANGE_EXT:
hdd_notice("Set WMI_VDEV_PARAM_HE_RANGE_EXT: %d", set_value);
hdd_debug("Set WMI_VDEV_PARAM_HE_RANGE_EXT: %d", set_value);
ret = wma_cli_set_command(adapter->session_id,
WMI_VDEV_PARAM_HE_RANGE_EXT,
set_value, VDEV_CMD);

38
core/hdd/src/wlan_hdd_main.c
View File

@ -1023,8 +1023,8 @@ bool wlan_hdd_validate_modules_state(struct hdd_context *hdd_ctx)
mutex_lock(&hdd_ctx->iface_change_lock);
if (hdd_ctx->driver_status != DRIVER_MODULES_ENABLED) {
mutex_unlock(&hdd_ctx->iface_change_lock);
hdd_notice("Modules not enabled, Present status: %d",
hdd_ctx->driver_status);
hdd_info("Modules not enabled, Present status: %d",
hdd_ctx->driver_status);
return false;
}
mutex_unlock(&hdd_ctx->iface_change_lock);
@ -3060,7 +3060,7 @@ static int __hdd_stop(struct net_device *dev)
* Disable TX on the interface, after this hard_start_xmit() will not
* be called on that interface
*/
hdd_notice("Disabling queues, adapter device mode: %s(%d)",
hdd_info("Disabling queues, adapter device mode: %s(%d)",
hdd_device_mode_to_string(adapter->device_mode),
adapter->device_mode);
@ -5145,9 +5145,9 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
cds_flush_work(&hdd_ctx->sap_pre_cac_work);
hdd_for_each_adapter(hdd_ctx, adapter) {
hdd_notice("[SSR] reset adapter with device mode %s(%d)",
hdd_device_mode_to_string(adapter->device_mode),
adapter->device_mode);
hdd_info("[SSR] reset adapter with device mode %s(%d)",
hdd_device_mode_to_string(adapter->device_mode),
adapter->device_mode);
if ((adapter->device_mode == QDF_STA_MODE) ||
(adapter->device_mode == QDF_P2P_CLIENT_MODE)) {
@ -7861,7 +7861,7 @@ int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason)
}
/* Update config to application */
status = hdd_cfg80211_update_acs_config(adapter, reason);
hdd_notice("Updated ACS config to nl with reason %d", reason);
hdd_info("Updated ACS config to nl with reason %d", reason);
return status;
}
@ -10747,16 +10747,16 @@ static void hdd_get_nud_stats_cb(void *data, struct rsp_stats *rsp)
return;
}
hdd_notice("rsp->arp_req_enqueue :%x", rsp->arp_req_enqueue);
hdd_notice("rsp->arp_req_tx_success :%x", rsp->arp_req_tx_success);
hdd_notice("rsp->arp_req_tx_failure :%x", rsp->arp_req_tx_failure);
hdd_notice("rsp->arp_rsp_recvd :%x", rsp->arp_rsp_recvd);
hdd_notice("rsp->out_of_order_arp_rsp_drop_cnt :%x",
rsp->out_of_order_arp_rsp_drop_cnt);
hdd_notice("rsp->dad_detected :%x", rsp->dad_detected);
hdd_notice("rsp->connect_status :%x", rsp->connect_status);
hdd_notice("rsp->ba_session_establishment_status :%x",
rsp->ba_session_establishment_status);
hdd_info("rsp->arp_req_enqueue :%x", rsp->arp_req_enqueue);
hdd_info("rsp->arp_req_tx_success :%x", rsp->arp_req_tx_success);
hdd_info("rsp->arp_req_tx_failure :%x", rsp->arp_req_tx_failure);
hdd_info("rsp->arp_rsp_recvd :%x", rsp->arp_rsp_recvd);
hdd_info("rsp->out_of_order_arp_rsp_drop_cnt :%x",
rsp->out_of_order_arp_rsp_drop_cnt);
hdd_info("rsp->dad_detected :%x", rsp->dad_detected);
hdd_info("rsp->connect_status :%x", rsp->connect_status);
hdd_info("rsp->ba_session_establishment_status :%x",
rsp->ba_session_establishment_status);
adapter->hdd_stats.hdd_arp_stats.rx_fw_cnt = rsp->arp_rsp_recvd;
adapter->dad |= rsp->dad_detected;
@ -11228,8 +11228,8 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
!= QDF_STATUS_SUCCESS)
hdd_err("Failed to start wlan auto shutdown timer");
else
hdd_notice("Auto Shutdown timer for %d seconds enabled",
hdd_ctx->config->WlanAutoShutdown);
hdd_info("Auto Shutdown timer for %d seconds enabled",
hdd_ctx->config->WlanAutoShutdown);
}
#endif

2
core/hdd/src/wlan_hdd_power.c
View File

@ -931,7 +931,7 @@ void hdd_enable_arp_offload(struct hdd_adapter *adapter,
} else
hdd_info("fail to cache arp offload request");
} else {
hdd_notice("IP Address is not assigned");
hdd_info("IP Address is not assigned");
status = QDF_STATUS_NOT_INITIALIZED;
}
out:

27
core/hdd/src/wlan_hdd_wext.c
View File

@ -4390,8 +4390,8 @@ int hdd_set_11ax_rate(struct hdd_adapter *adapter, int set_value,
set_value = hdd_assemble_rate_code(preamble, nss, rix);
}
hdd_notice("SET_11AX_RATE val %d rix %d preamble %x nss %d",
set_value, rix, preamble, nss);
hdd_info("SET_11AX_RATE val %d rix %d preamble %x nss %d",
set_value, rix, preamble, nss);
ret = wma_cli_set_command(adapter->session_id,
WMI_VDEV_PARAM_FIXED_RATE,
@ -5732,7 +5732,7 @@ static int __iw_setint_getnone(struct net_device *dev,
if (!hHal)
return -EINVAL;
hdd_notice("Set Thermal Mitigation Level %d", set_value);
hdd_debug("Set Thermal Mitigation Level %d", set_value);
(void)sme_set_thermal_level(hHal, set_value);
break;
}
@ -5755,7 +5755,7 @@ static int __iw_setint_getnone(struct net_device *dev,
if (!hHal)
return -EINVAL;
hdd_notice("Set NSS = %d", set_value);
hdd_debug("Set NSS = %d", set_value);
if ((set_value > 2) || (set_value <= 0)) {
hdd_err("NSS greater than 2 not supported");
ret = -EINVAL;
@ -5873,7 +5873,7 @@ static int __iw_setint_getnone(struct net_device *dev,
if (!hHal)
return -EINVAL;
hdd_notice("WMI_VDEV_PARAM_SGI val %d", set_value);
hdd_debug("WMI_VDEV_PARAM_SGI val %d", set_value);
ret = sme_update_ht_config(hHal, adapter->session_id,
WNI_CFG_HT_CAP_INFO_SHORT_GI_20MHZ,
set_value);
@ -5889,8 +5889,7 @@ static int __iw_setint_getnone(struct net_device *dev,
if (!hHal)
return -EINVAL;
hdd_notice("WMI_VDEV_PARAM_ENABLE_RTSCTS val 0x%x",
set_value);
hdd_debug("WMI_VDEV_PARAM_ENABLE_RTSCTS val 0x%x", set_value);
if ((set_value & HDD_RTSCTS_EN_MASK) ==
HDD_RTSCTS_ENABLE)
@ -6301,7 +6300,7 @@ static int __iw_setint_getnone(struct net_device *dev,
case WE_SET_TXRX_STATS:
{
hdd_notice("WE_SET_TXRX_STATS val %d", set_value);
hdd_debug("WE_SET_TXRX_STATS val %d", set_value);
ret = cds_get_datapath_handles(&soc, &pdev, &vdev,
adapter->session_id);
@ -6653,7 +6652,7 @@ static int __iw_setint_getnone(struct net_device *dev,
if (!hHal)
return -EINVAL;
hdd_notice("SET SCAN DISABLE %d", set_value);
hdd_debug("SET SCAN DISABLE %d", set_value);
sme_set_scan_disable(WLAN_HDD_GET_HAL_CTX(adapter), set_value);
break;
}
@ -6708,13 +6707,13 @@ static int __iw_setint_getnone(struct net_device *dev,
ret = hdd_set_11ax_rate(adapter, set_value, NULL);
break;
case WE_SET_DCM:
hdd_notice("Set WMI_VDEV_PARAM_HE_DCM: %d", set_value);
hdd_debug("Set WMI_VDEV_PARAM_HE_DCM: %d", set_value);
ret = wma_cli_set_command(adapter->session_id,
WMI_VDEV_PARAM_HE_DCM, set_value,
VDEV_CMD);
break;
case WE_SET_RANGE_EXT:
hdd_notice("Set WMI_VDEV_PARAM_HE_RANGE_EXT: %d", set_value);
hdd_debug("Set WMI_VDEV_PARAM_HE_RANGE_EXT: %d", set_value);
ret = wma_cli_set_command(adapter->session_id,
WMI_VDEV_PARAM_HE_RANGE_EXT,
set_value, VDEV_CMD);
@ -7460,13 +7459,13 @@ static int __iw_setnone_getint(struct net_device *dev,
break;
}
case WE_GET_DCM:
hdd_notice("GET WMI_VDEV_PARAM_HE_DCM");
hdd_debug("GET WMI_VDEV_PARAM_HE_DCM");
*value = wma_cli_get_command(adapter->session_id,
WMI_VDEV_PARAM_HE_DCM,
VDEV_CMD);
break;
case WE_GET_RANGE_EXT:
hdd_notice("GET WMI_VDEV_PARAM_HE_RANGE_EXT");
hdd_debug("GET WMI_VDEV_PARAM_HE_RANGE_EXT");
*value = wma_cli_get_command(adapter->session_id,
WMI_VDEV_PARAM_HE_RANGE_EXT,
VDEV_CMD);
@ -8516,7 +8515,7 @@ static int iw_get_policy_manager_ut_ops(struct hdd_context *hdd_ctx,
{
bool allow;
hdd_notice("<iwpriv wlan0 pm_query_allow> is called");
hdd_debug("<iwpriv wlan0 pm_query_allow> is called");
allow = policy_mgr_allow_concurrency(hdd_ctx->hdd_psoc,
apps_args[0], apps_args[1], apps_args[2]);
pr_info("allow %d {0 = don't allow, 1 = allow}", allow);

7
core/hdd/src/wlan_hdd_wmm.c
View File

@ -1,9 +1,8 @@
/*
* Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
* Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all
@ -626,7 +625,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
case SME_QOS_STATUS_SETUP_NOT_QOS_AP_RSP:
hdd_err("Setup failed, not a QoS AP");
if (HDD_WMM_HANDLE_IMPLICIT != pQosContext->handle) {
hdd_notice("Explicit Qos, notifying user space");
hdd_info("Explicit Qos, notifying user space");
/* this was triggered by an application */
pQosContext->lastStatus =
@ -702,7 +701,7 @@ static QDF_STATUS hdd_wmm_sme_callback(tHalHandle hHal,
pAc->wmmAcAccessPending = false;
} else {
hdd_notice("Explicit Qos, notifying user space");
hdd_info("Explicit Qos, notifying user space");
/* this was triggered by an application */
pQosContext->lastStatus =