qcacld-3.0: Change the loglevel of prints appropiately(phase-4)

Currently there are many instances in driver where log levels
are defined as error but actually those are not error level.
This can lead to WD bark if these logs are printed frequently.

Change these log prints to appropiate level.

Change-Id: Ie6a5238c50461d3875febeee7ae37c211c89a4df
CRs-Fixed: 1107878

8 files changed, 85 insertions, 85 deletions

diff --git a/core/hdd/src/wlan_hdd_lro.c b/core/hdd/src/wlan_hdd_lro.c
index 57b1c16fac51..d7064826ee57 100644
--- a/core/hdd/src/wlan_hdd_lro.c
+++ b/core/hdd/src/wlan_hdd_lro.c
@@ -417,7 +417,7 @@ int hdd_lro_init(hdd_context_t *hdd_ctx)
 
 	if ((!hdd_ctx->config->lro_enable) &&
 	    (hdd_napi_enabled(HDD_NAPI_ANY) == 0)) {
-		hdd_err("LRO and NAPI are both disabled.");
+		hdd_warn("LRO and NAPI are both disabled.");
 		return 0;
 	}
 
@@ -549,7 +549,7 @@ int hdd_lro_enable(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter)
 static void hdd_deinit_lro_mgr(void *lro_info)
 {
 	if (lro_info) {
-		hdd_err("LRO instance %p is being freed", lro_info);
+		hdd_notice("LRO instance %p is being freed", lro_info);
 		qdf_mem_free(lro_info);
 	}
 }
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 1c51e34d89b5..3fb7f4e754cc 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -495,7 +495,7 @@ enum phy_ch_width hdd_map_nl_chan_width(enum nl80211_chan_width ch_width)
 	case NL80211_CHAN_WIDTH_10:
 		return CH_WIDTH_10MHZ;
 	default:
-		hdd_err("Invalid channel width %d, setting to default",
+		hdd_warn("Invalid channel width %d, setting to default",
 				ch_width);
 		return CH_WIDTH_INVALID;
 	}
@@ -1320,7 +1320,7 @@ void hdd_update_tgt_cfg(void *context, void *param)
 	if (cds_cfg) {
 		if (hdd_ctx->config->enable_sub_20_channel_width !=
 			WLAN_SUB_20_CH_WIDTH_NONE && !cfg->sub_20_support) {
-			hdd_err("User requested sub 20 MHz channel width but unsupported by FW.");
+			hdd_warn("User requested sub 20 MHz channel width but unsupported by FW.");
 			cds_cfg->sub_20_channel_width =
 				WLAN_SUB_20_CH_WIDTH_NONE;
 		} else {
@@ -1363,12 +1363,12 @@ void hdd_update_tgt_cfg(void *context, void *param)
 		if (qdf_is_macaddr_equal(&hdd_ctx->config->intfMacAddr[0],
 					 &default_mac_addr)) {
 			if (hdd_generate_macaddr_auto(hdd_ctx) != 0)
-				hdd_err("Fail to auto-generate MAC, using MAC from ini file "
+				hdd_warn("Fail to auto-generate MAC, using MAC from ini file "
 					MAC_ADDRESS_STR,
 					MAC_ADDR_ARRAY(hdd_ctx->config->
 						       intfMacAddr[0].bytes));
 		} else {
-			hdd_err("Invalid MAC passed from target, using MAC from ini file "
+			hdd_warn("Invalid MAC passed from target, using MAC from ini file "
 				MAC_ADDRESS_STR,
 				MAC_ADDR_ARRAY(hdd_ctx->config->
 					       intfMacAddr[0].bytes));
@@ -2980,7 +2980,7 @@ static void hdd_set_fw_log_params(hdd_context_t *hdd_ctx,
 			hdd_ctx->config->enableFwLogType,
 			DBG_CMD);
 	if (ret != 0)
-		hdd_err("Failed to enable FW log type ret %d",
+		hdd_warn("Failed to enable FW log type ret %d",
 			ret);
 
 	hdd_ctx->fw_log_settings.dl_loglevel =
@@ -2990,7 +2990,7 @@ static void hdd_set_fw_log_params(hdd_context_t *hdd_ctx,
 			hdd_ctx->config->enableFwLogLevel,
 			DBG_CMD);
 	if (ret != 0)
-		hdd_err("Failed to enable FW log level ret %d",
+		hdd_warn("Failed to enable FW log level ret %d",
 			ret);
 
 	hdd_string_to_u8_array(
@@ -3597,10 +3597,10 @@ QDF_STATUS hdd_stop_adapter(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter,
 					msecs_to_jiffies
 						(WLAN_WAIT_TIME_DISCONNECT));
 				if (!rc) {
-					hdd_err("wait on disconnect_comp_var failed");
+					hdd_warn("wait on disconnect_comp_var failed");
 				}
 			} else {
-				hdd_err("failed to post disconnect event to SME");
+				hdd_warn("failed to post disconnect event to SME");
 			}
 			memset(&wrqu, '\0', sizeof(wrqu));
 			wrqu.ap_addr.sa_family = ARPHRD_ETHER;
@@ -4068,10 +4068,10 @@ QDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx)
 
 		case QDF_P2P_GO_MODE:
 #ifdef MSM_PLATFORM
-			hdd_err("[SSR] send stop ap to supplicant");
+			hdd_notice("[SSR] send stop ap to supplicant");
 			cfg80211_ap_stopped(adapter->dev, GFP_KERNEL);
 #else
-			hdd_err("[SSR] send restart supplicant");
+			hdd_notice("[SSR] send restart supplicant");
 			/* event supplicant to restart */
 			cfg80211_del_sta(adapter->dev,
 					 (const u8 *)&bcastMac.bytes[0],
@@ -5341,7 +5341,7 @@ static void hdd_pld_request_bus_bandwidth(hdd_context_t *hdd_ctx,
 				hdd_ctx->hbw_requested = false;
 			}
 			if (cds_sched_handle_throughput_req(false))
-				hdd_err("low bandwidth set rx affinity fail");
+				hdd_warn("low bandwidth set rx affinity fail");
 		 } else {
 			if (!hdd_ctx->hbw_requested) {
 				pld_request_pm_qos(hdd_ctx->parent_dev, 1);
@@ -5349,7 +5349,7 @@ static void hdd_pld_request_bus_bandwidth(hdd_context_t *hdd_ctx,
 			}
 
 			if (cds_sched_handle_throughput_req(true))
-				hdd_err("high bandwidth set rx affinity fail");
+				hdd_warn("high bandwidth set rx affinity fail");
 		 }
 		hdd_napi_apply_throughput_policy(hdd_ctx, tx_packets, rx_packets);
 	}
@@ -5646,25 +5646,25 @@ void wlan_hdd_display_tx_rx_histogram(hdd_context_t *hdd_ctx)
 	int i;
 
 #ifdef MSM_PLATFORM
-	hdd_err("BW compute Interval: %dms",
+	hdd_notice("BW compute Interval: %dms",
 		hdd_ctx->config->busBandwidthComputeInterval);
-	hdd_err("BW High TH: %d BW Med TH: %d BW Low TH: %d",
+	hdd_notice("BW High TH: %d BW Med TH: %d BW Low TH: %d",
 		hdd_ctx->config->busBandwidthHighThreshold,
 		hdd_ctx->config->busBandwidthMediumThreshold,
 		hdd_ctx->config->busBandwidthLowThreshold);
-	hdd_err("Enable TCP DEL ACK: %d",
+	hdd_notice("Enable TCP DEL ACK: %d",
 		hdd_ctx->config->enable_tcp_delack);
-	hdd_err("TCP DEL High TH: %d TCP DEL Low TH: %d",
+	hdd_notice("TCP DEL High TH: %d TCP DEL Low TH: %d",
 		hdd_ctx->config->tcpDelackThresholdHigh,
 		hdd_ctx->config->tcpDelackThresholdLow);
-	hdd_err("TCP TX HIGH TP TH: %d (Use to set tcp_output_bytes_limit)",
+	hdd_notice("TCP TX HIGH TP TH: %d (Use to set tcp_output_bytes_limit)",
 		hdd_ctx->config->tcp_tx_high_tput_thres);
 #endif
 
-	hdd_err("Total entries: %d Current index: %d",
+	hdd_notice("Total entries: %d Current index: %d",
 		NUM_TX_RX_HISTOGRAM, hdd_ctx->hdd_txrx_hist_idx);
 
-	hdd_err("[index][timestamp]: interval_rx, interval_tx, bus_bw_level, RX TP Level, TX TP Level");
+	hdd_notice("[index][timestamp]: interval_rx, interval_tx, bus_bw_level, RX TP Level, TX TP Level");
 
 	for (i = 0; i < NUM_TX_RX_HISTOGRAM; i++) {
 		/* using hdd_log to avoid printing function name */
@@ -5719,10 +5719,10 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx)
 	while (NULL != adapter_node && QDF_STATUS_SUCCESS == status) {
 		adapter = adapter_node->pAdapter;
 
-		hdd_err("Netif queue operation statistics:");
-		hdd_err("Session_id %d device mode %d",
+		hdd_notice("Netif queue operation statistics:");
+		hdd_notice("Session_id %d device mode %d",
 			adapter->sessionId, adapter->device_mode);
-		hdd_err("Current pause_map value %x", adapter->pause_map);
+		hdd_notice("Current pause_map value %x", adapter->pause_map);
 		curr_time = qdf_system_ticks();
 		total = curr_time - adapter->start_time;
 		delta = curr_time - adapter->last_time;
@@ -5733,11 +5733,11 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx)
 			unpause = adapter->total_unpause_time + delta;
 			pause = adapter->total_pause_time;
 		}
-		hdd_err("Total: %ums Pause: %ums Unpause: %ums",
+		hdd_notice("Total: %ums Pause: %ums Unpause: %ums",
 			qdf_system_ticks_to_msecs(total),
 			qdf_system_ticks_to_msecs(pause),
 			qdf_system_ticks_to_msecs(unpause));
-		hdd_err("reason_type: pause_cnt: unpause_cnt: pause_time");
+		hdd_info("reason_type: pause_cnt: unpause_cnt: pause_time");
 
 		for (i = WLAN_CONTROL_PATH; i < WLAN_REASON_TYPE_MAX; i++) {
 			qdf_time_t pause_delta = 0;
@@ -5756,11 +5756,11 @@ void wlan_hdd_display_netif_queue_history(hdd_context_t *hdd_ctx)
 				pause_delta));
 		}
 
-		hdd_err("Netif queue operation history:");
-		hdd_err("Total entries: %d current index %d",
+		hdd_notice("Netif queue operation history:");
+		hdd_notice("Total entries: %d current index %d",
 			WLAN_HDD_MAX_HISTORY_ENTRY, adapter->history_index);
 
-		hdd_err("index: time: action_type: reason_type: pause_map");
+		hdd_notice("index: time: action_type: reason_type: pause_map");
 
 		for (i = 0; i < WLAN_HDD_MAX_HISTORY_ENTRY; i++) {
 			/* using hdd_log to avoid printing function name */
@@ -7094,7 +7094,7 @@ static int hdd_update_cds_config(hdd_context_t *hdd_ctx)
 	cds_cfg->uc_offload_enabled = hdd_ipa_uc_is_enabled(hdd_ctx);
 	if (!is_power_of_2(hdd_ctx->config->IpaUcTxBufCount)) {
 		/* IpaUcTxBufCount should be power of 2 */
-		hdd_err("Round down IpaUcTxBufCount %d to nearest power of 2",
+		hdd_warn("Round down IpaUcTxBufCount %d to nearest power of 2",
 			hdd_ctx->config->IpaUcTxBufCount);
 		hdd_ctx->config->IpaUcTxBufCount =
 			rounddown_pow_of_two(
@@ -7103,14 +7103,14 @@ static int hdd_update_cds_config(hdd_context_t *hdd_ctx)
 			hdd_err("Failed to round down IpaUcTxBufCount");
 			return -EINVAL;
 		}
-		hdd_err("IpaUcTxBufCount rounded down to %d",
+		hdd_warn("IpaUcTxBufCount rounded down to %d",
 			hdd_ctx->config->IpaUcTxBufCount);
 	}
 	cds_cfg->uc_txbuf_count = hdd_ctx->config->IpaUcTxBufCount;
 	cds_cfg->uc_txbuf_size = hdd_ctx->config->IpaUcTxBufSize;
 	if (!is_power_of_2(hdd_ctx->config->IpaUcRxIndRingCount)) {
 		/* IpaUcRxIndRingCount should be power of 2 */
-		hdd_err("Round down IpaUcRxIndRingCount %d to nearest power of 2",
+		hdd_warn("Round down IpaUcRxIndRingCount %d to nearest power of 2",
 			hdd_ctx->config->IpaUcRxIndRingCount);
 		hdd_ctx->config->IpaUcRxIndRingCount =
 			rounddown_pow_of_two(
@@ -7119,7 +7119,7 @@ static int hdd_update_cds_config(hdd_context_t *hdd_ctx)
 			hdd_err("Failed to round down IpaUcRxIndRingCount");
 			return -EINVAL;
 		}
-		hdd_err("IpaUcRxIndRingCount rounded down to %d",
+		hdd_info("IpaUcRxIndRingCount rounded down to %d",
 			hdd_ctx->config->IpaUcRxIndRingCount);
 	}
 	cds_cfg->uc_rxind_ringcount =
@@ -7810,10 +7810,10 @@ static int hdd_features_init(hdd_context_t *hdd_ctx, hdd_adapter_t *adapter)
 		hdd_set_idle_ps_config(hdd_ctx, false);
 
 	if (hdd_lro_init(hdd_ctx))
-		hdd_err("Unable to initialize LRO in fw");
+		hdd_warn("Unable to initialize LRO in fw");
 
 	if (hdd_adaptive_dwelltime_init(hdd_ctx))
-		hdd_err("Unable to send adaptive dwelltime setting to FW");
+		hdd_warn("Unable to send adaptive dwelltime setting to FW");
 
 	ret = hdd_init_thermal_info(hdd_ctx);
 	if (ret) {
@@ -8338,7 +8338,7 @@ int hdd_wlan_startup(struct device *dev)
 	hdd_driver_memdump_init();
 
 	if (hdd_enable_egap(hdd_ctx))
-		hdd_err("enhance green ap is not enabled");
+		hdd_warn("enhance green ap is not enabled");
 
 	if (hdd_ctx->config->fIsImpsEnabled)
 		hdd_set_idle_ps_config(hdd_ctx, true);
@@ -8523,13 +8523,13 @@ void hdd_deregister_cb(hdd_context_t *hdd_ctx)
 	sme_reset_link_layer_stats_ind_cb(hdd_ctx->hHal);
 	status = sme_bpf_offload_deregister_callback(hdd_ctx->hHal);
 	if (!QDF_IS_STATUS_SUCCESS(status))
-		hdd_err("De-register bpf offload callback failed: %d",
+		hdd_warn("De-register bpf offload callback failed: %d",
 			status);
 	sme_reset_rssi_threshold_breached_cb(hdd_ctx->hHal);
 
 	status = cds_deregister_sap_restart_channel_switch_cb();
 	if (!QDF_IS_STATUS_SUCCESS(status))
-		hdd_err("De-register restart cb registration failed: %d",
+		hdd_warn("De-register restart cb registration failed: %d",
 			status);
 
 	sme_stats_ext_register_callback(hdd_ctx->hHal,
@@ -8596,7 +8596,7 @@ void hdd_softap_sta_disassoc(hdd_adapter_t *adapter,
 {
 	ENTER();
 
-	hdd_err("hdd_softap_sta_disassoc:(%p, false)",
+	hdd_notice("hdd_softap_sta_disassoc:(%p, false)",
 	       (WLAN_HDD_GET_CTX(adapter))->pcds_context);
 
 	/* Ignore request to disassoc bcmc station */
@@ -8612,7 +8612,7 @@ void hdd_softap_tkip_mic_fail_counter_measure(hdd_adapter_t *adapter,
 {
 	ENTER();
 
-	hdd_err("hdd_softap_tkip_mic_fail_counter_measure:(%p, false)",
+	hdd_notice("hdd_softap_tkip_mic_fail_counter_measure:(%p, false)",
 	       (WLAN_HDD_GET_CTX(adapter))->pcds_context);
 
 	wlansap_set_counter_measure(WLAN_HDD_GET_SAP_CTX_PTR(adapter),
@@ -8832,7 +8832,7 @@ void wlan_hdd_auto_shutdown_cb(void)
 	if (!hdd_ctx)
 		return;
 
-	hdd_err("Wlan Idle. Sending Shutdown event..");
+	hdd_notice("Wlan Idle. Sending Shutdown event..");
 	wlan_hdd_send_svc_nlink_msg(hdd_ctx->radio_index,
 			WLAN_SVC_WLAN_AUTO_SHUTDOWN_IND, NULL, 0);
 }
diff --git a/core/hdd/src/wlan_hdd_memdump.c b/core/hdd/src/wlan_hdd_memdump.c
index bb23d3ab7df6..69325de4b76f 100644
--- a/core/hdd/src/wlan_hdd_memdump.c
+++ b/core/hdd/src/wlan_hdd_memdump.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -421,7 +421,7 @@ static ssize_t memdump_read(struct file *file, char __user *buf,
 		hdd_err("Invalid start offset for memdump read");
 		return -EINVAL;
 	} else if (*pos >= FW_MEM_DUMP_SIZE || !count) {
-		hdd_err("No more data to copy");
+		hdd_warn("No more data to copy");
 		return 0;
 	} else if (count > FW_MEM_DUMP_SIZE - *pos) {
 		count = FW_MEM_DUMP_SIZE - *pos;
@@ -703,7 +703,7 @@ static ssize_t hdd_driver_memdump_read(struct file *file, char __user *buf,
 		return -EINVAL;
 	} else if (!count || (hdd_ctx->driver_dump_size &&
 				(*pos >= hdd_ctx->driver_dump_size))) {
-		hdd_err("No more data to copy");
+		hdd_warn("No more data to copy");
 		return 0;
 	} else if ((*pos == 0) || (hdd_ctx->driver_dump_mem == NULL)) {
 		/*
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index b40b3cb055c8..98372ece75f5 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -444,7 +444,7 @@ static int hdd_ndi_delete_req_handler(hdd_context_t *hdd_ctx,
 	if (ret < 0)
 		hdd_err("NDI delete request failed");
 	else
-		hdd_err("NDI delete request successfully issued");
+		hdd_notice("NDI delete request successfully issued");
 
 	return ret;
 }
@@ -913,7 +913,7 @@ static void hdd_ndp_iface_create_rsp_handler(hdd_adapter_t *adapter,
 	cfg80211_vendor_event(vendor_event, GFP_KERNEL);
 
 	if (!create_fail && ndi_rsp->status == QDF_STATUS_SUCCESS) {
-		hdd_err("NDI interface successfully created");
+		hdd_notice("NDI interface successfully created");
 		ndp_ctx->ndp_create_transaction_id = 0;
 		ndp_ctx->state = NAN_DATA_NDI_CREATED_STATE;
 		wlan_hdd_netif_queue_control(adapter,
@@ -969,7 +969,7 @@ static void hdd_ndp_iface_delete_rsp_handler(hdd_adapter_t *adapter,
 	}
 
 	if (ndi_rsp->status == NDP_RSP_STATUS_SUCCESS)
-		hdd_err("NDI BSS successfully stopped");
+		hdd_notice("NDI BSS successfully stopped");
 	else
 		hdd_err("NDI BSS stop failed with reason %d", ndi_rsp->reason);
 
@@ -1199,7 +1199,7 @@ static void hdd_ndp_new_peer_ind_handler(hdd_adapter_t *adapter,
 	/* save peer in ndp ctx */
 	if (false == hdd_save_peer(sta_ctx, new_peer_ind->sta_id,
 				   &new_peer_ind->peer_mac_addr)) {
-		hdd_err("Ndp peer table full. cannot save new peer");
+		hdd_warn("Ndp peer table full. cannot save new peer");
 		return;
 	}
 
@@ -1293,7 +1293,7 @@ static void hdd_ndp_confirm_ind_handler(hdd_adapter_t *adapter,
 	/* ndp_confirm is called each time user generated ndp req succeeds */
 	idx = hdd_get_peer_idx(sta_ctx, &ndp_confirm->peer_ndi_mac_addr);
 	if (idx == INVALID_PEER_IDX)
-		hdd_err("can't find addr: %pM in vdev_id: %d, peer table.",
+		hdd_warn("can't find addr: %pM in vdev_id: %d, peer table.",
 			&ndp_confirm->peer_ndi_mac_addr, adapter->sessionId);
 	else if (ndp_confirm->rsp_code == NDP_RESPONSE_ACCEPT)
 		ndp_ctx->active_ndp_sessions[idx]++;
@@ -1709,20 +1709,20 @@ static void hdd_ndp_end_ind_handler(hdd_adapter_t *adapter,
 		ndi_adapter = hdd_get_adapter_by_vdev(hdd_ctx,
 					end_ind->ndp_map[i].vdev_id);
 		if (ndi_adapter == NULL) {
-			hdd_err("Adapter not found for vdev_id: %d",
+			hdd_warn("Adapter not found for vdev_id: %d",
 				end_ind->ndp_map[i].vdev_id);
 			continue;
 		}
 		ndp_ctx = WLAN_HDD_GET_NDP_CTX_PTR(ndi_adapter);
 		if (!ndp_ctx) {
-			hdd_err("ndp_ctx is NULL for vdev id: %d",
+			hdd_warn("ndp_ctx is NULL for vdev id: %d",
 				end_ind->ndp_map[i].vdev_id);
 			continue;
 		}
 		idx = hdd_get_peer_idx(sta_ctx,
 				&end_ind->ndp_map[i].peer_ndi_mac_addr);
 		if (idx == INVALID_PEER_IDX) {
-			hdd_err("can't find addr: %pM in sta_ctx.",
+			hdd_warn("can't find addr: %pM in sta_ctx.",
 				&end_ind->ndp_map[i].peer_ndi_mac_addr);
 			continue;
 		}
@@ -1885,10 +1885,10 @@ static int __wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
 
 	if (tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]) {
 		iface_name = nla_data(tb[QCA_WLAN_VENDOR_ATTR_NDP_IFACE_STR]);
-		hdd_err("Transaction Id: %d NDP Cmd: %d iface_name: %s",
+		hdd_notice("Transaction Id: %d NDP Cmd: %d iface_name: %s",
 			transaction_id, ndp_cmd_type, iface_name);
 	} else {
-		hdd_err("Transaction Id: %d NDP Cmd: %d iface_name: unspecified",
+		hdd_notice("Transaction Id: %d NDP Cmd: %d iface_name: unspecified",
 			transaction_id, ndp_cmd_type);
 	}
 
diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c
index 874b880662db..36431a62643f 100644
--- a/core/hdd/src/wlan_hdd_napi.c
+++ b/core/hdd/src/wlan_hdd_napi.c
@@ -178,7 +178,7 @@ int hdd_napi_destroy(int force)
 						rc++;
 						hdd_napi_map &= ~(0x01 << i);
 					} else
-						hdd_err("cannot destroy napi %d: (pipe:%d), f=%d\n",
+						hdd_warn("cannot destroy napi %d: (pipe:%d), f=%d\n",
 							i,
 							NAPI_PIPE2ID(i), force);
 				}
diff --git a/core/hdd/src/wlan_hdd_ocb.c b/core/hdd/src/wlan_hdd_ocb.c
index 45e75ec0b704..5d10f2d9a8dd 100644
--- a/core/hdd/src/wlan_hdd_ocb.c
+++ b/core/hdd/src/wlan_hdd_ocb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -280,7 +280,7 @@ static int hdd_ocb_register_sta(hdd_adapter_t *adapter)
 
 	if (pHddStaCtx->conn_info.staId[0] != 0 &&
 	     pHddStaCtx->conn_info.staId[0] != peer_id) {
-		hdd_err("The ID for the OCB station has changed.");
+		hdd_warn("The ID for the OCB station has changed.");
 	}
 
 	pHddStaCtx->conn_info.staId[0] = peer_id;
@@ -364,7 +364,7 @@ static void hdd_ocb_set_config_callback(void *context_ptr, void *response_ptr)
 		return;
 
 	if (resp && resp->status)
-		hdd_err("Operation failed: %d", resp->status);
+		hdd_warn("Operation failed: %d", resp->status);
 
 	spin_lock(&hdd_context_lock);
 	if (context->magic == HDD_OCB_MAGIC) {
@@ -1411,7 +1411,7 @@ __wlan_hdd_cfg80211_ocb_get_tsf_timer(struct wiphy *wiphy,
 		goto end;
 	}
 
-	hdd_err("Got TSF timer response, high=%d, low=%d",
+	hdd_notice("Got TSF timer response, high=%d, low=%d",
 	       adapter->ocb_get_tsf_timer_resp.timer_high,
 	       adapter->ocb_get_tsf_timer_resp.timer_low);
 
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index 1f9e6392ec01..6196b904ff57 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index b72e6864f8e5..014ec754012c 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -187,10 +187,10 @@ QDF_STATUS wlan_hdd_remain_on_channel_callback(tHalHandle hHal, void *pCtx,
 	hdd_notice("Received remain on channel rsp");
 	if (qdf_mc_timer_stop(&pRemainChanCtx->hdd_remain_on_chan_timer)
 			!= QDF_STATUS_SUCCESS)
-		hdd_err("Failed to stop hdd_remain_on_chan_timer");
+		hdd_warn("Failed to stop hdd_remain_on_chan_timer");
 	if (qdf_mc_timer_destroy(&pRemainChanCtx->hdd_remain_on_chan_timer)
 			!= QDF_STATUS_SUCCESS)
-		hdd_err("Failed to destroy hdd_remain_on_chan_timer");
+		hdd_warn("Failed to destroy hdd_remain_on_chan_timer");
 	cfgState->remain_on_chan_ctx = NULL;
 	/*
 	 * Resetting the roc in progress early ensures that the subsequent
@@ -277,20 +277,20 @@ void wlan_hdd_cancel_existing_remain_on_channel(hdd_adapter_t *pAdapter)
 
 	mutex_lock(&cfgState->remain_on_chan_ctx_lock);
 	if (cfgState->remain_on_chan_ctx != NULL) {
-		hdd_err("Cancel Existing Remain on Channel");
+		hdd_notice("Cancel Existing Remain on Channel");
 
 		if (QDF_TIMER_STATE_RUNNING == qdf_mc_timer_get_current_state(
 		    &cfgState->remain_on_chan_ctx->hdd_remain_on_chan_timer)) {
 			if (qdf_mc_timer_stop(&cfgState->remain_on_chan_ctx->
 				hdd_remain_on_chan_timer) != QDF_STATUS_SUCCESS)
-				hdd_err("Failed to stop hdd_remain_on_chan_timer");
+				hdd_warn("Failed to stop hdd_remain_on_chan_timer");
 		}
 
 		pRemainChanCtx = cfgState->remain_on_chan_ctx;
 		if (pRemainChanCtx->hdd_remain_on_chan_cancel_in_progress ==
 			true) {
 			mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
-			hdd_err("ROC timer cancellation in progress wait for completion");
+			hdd_warn("ROC timer cancellation in progress wait for completion");
 			rc = wait_for_completion_timeout(&pAdapter->
 							 cancel_rem_on_chan_var,
 							 msecs_to_jiffies
@@ -391,7 +391,7 @@ static void wlan_hdd_cancel_pending_roc(hdd_adapter_t *adapter)
 	unsigned long rc;
 	hdd_cfg80211_state_t *cfg_state = WLAN_HDD_GET_CFG_STATE_PTR(adapter);
 
-	hdd_err("ROC completion is not received !!!");
+	hdd_notice("ROC completion is not received !!!");
 
 	mutex_lock(&cfg_state->remain_on_chan_ctx_lock);
 	roc_ctx = cfg_state->remain_on_chan_ctx;
@@ -463,7 +463,7 @@ void wlan_hdd_cleanup_remain_on_channel_ctx(hdd_adapter_t *pAdapter)
 	mutex_lock(&cfgState->remain_on_chan_ctx_lock);
 	while (pAdapter->is_roc_inprogress) {
 		mutex_unlock(&cfgState->remain_on_chan_ctx_lock);
-		hdd_err("ROC in progress for session %d!!!",
+		hdd_notice("ROC in progress for session %d!!!",
 			pAdapter->sessionId);
 		msleep(500);
 		if (retry++ > 3) {
@@ -844,7 +844,7 @@ static int wlan_hdd_request_remain_on_channel(struct wiphy *wiphy,
 	if (0 != ret)
 		return ret;
 	if (cds_is_connection_in_progress(NULL, NULL)) {
-		hdd_err("Connection is in progress");
+		hdd_notice("Connection is in progress");
 		isBusy = true;
 	}
 	pRemainChanCtx = qdf_mem_malloc(sizeof(hdd_remain_on_chan_ctx_t));
@@ -1008,7 +1008,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter,
 		if (QDF_TIMER_STATE_RUNNING ==
 			qdf_mc_timer_get_current_state(
 				&pRemainChanCtx->hdd_remain_on_chan_timer)) {
-			hdd_err("Timer Started before ready event!!!");
+			hdd_notice("Timer Started before ready event!!!");
 			if (qdf_mc_timer_stop(&pRemainChanCtx->
 						hdd_remain_on_chan_timer)
 					!= QDF_STATUS_SUCCESS)
@@ -1039,7 +1039,7 @@ void hdd_remain_chan_ready_handler(hdd_adapter_t *pAdapter,
 		}
 		/* Check for cached action frame */
 		if (pRemainChanCtx->action_pkt_buff.frame_length != 0) {
-			hdd_err("Sent cached action frame to supplicant");
+			hdd_notice("Sent cached action frame to supplicant");
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0))
 			cfg80211_rx_mgmt(pAdapter->dev->ieee80211_ptr,
 				pRemainChanCtx->action_pkt_buff.freq, 0,
@@ -1285,12 +1285,12 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 				[WLAN_HDD_PUBLIC_ACTION_FRAME_BODY_OFFSET])) {
 		actionFrmType = buf[WLAN_HDD_PUBLIC_ACTION_FRAME_TYPE_OFFSET];
 		if (actionFrmType >= MAX_P2P_ACTION_FRAME_TYPE) {
-			hdd_err("[P2P] unknown[%d] ---> OTA to " MAC_ADDRESS_STR,
+			hdd_notice("[P2P] unknown[%d] ---> OTA to " MAC_ADDRESS_STR,
 				actionFrmType,
 				MAC_ADDR_ARRAY(&buf
 					       [WLAN_HDD_80211_FRM_DA_OFFSET]));
 		} else {
-			hdd_err("[P2P] %s ---> OTA to "
+			hdd_notice("[P2P] %s ---> OTA to "
 			       MAC_ADDRESS_STR,
 			       p2p_action_frame_type[actionFrmType],
 			       MAC_ADDR_ARRAY(&buf
@@ -1298,13 +1298,13 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 			if ((actionFrmType == WLAN_HDD_PROV_DIS_REQ)
 			    && (global_p2p_connection_status == P2P_NOT_ACTIVE)) {
 				global_p2p_connection_status = P2P_GO_NEG_PROCESS;
-				hdd_err("[P2P State]Inactive state to GO negotiation progress state");
+				hdd_notice("[P2P State]Inactive state to GO negotiation progress state");
 			} else if ((actionFrmType == WLAN_HDD_GO_NEG_CNF) &&
 				   (global_p2p_connection_status ==
 				    P2P_GO_NEG_PROCESS)) {
 				global_p2p_connection_status =
 					P2P_GO_NEG_COMPLETED;
-				hdd_err("[P2P State]GO nego progress to GO nego completed state");
+				hdd_notice("[P2P State]GO nego progress to GO nego completed state");
 			}
 		}
 	}
@@ -1375,7 +1375,7 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 
 	if (NULL != cfgState->buf) {
 		if (!noack) {
-			hdd_err("Previous P2P Action frame packet pending");
+			hdd_warn("Previous P2P Action frame packet pending");
 			hdd_cleanup_actionframe(pAdapter->pHddCtx, pAdapter);
 		} else {
 			hdd_err("Pending Action frame packet return EBUSY");
@@ -1464,14 +1464,14 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 						remain_on_chan_ctx->
 						hdd_remain_on_chan_timer)
 						!= QDF_STATUS_SUCCESS)
-					hdd_err("Failed to stop hdd_remain_on_chan_timer");
+					hdd_warn("Failed to stop hdd_remain_on_chan_timer");
 				status =
 					qdf_mc_timer_start(&cfgState->
 							   remain_on_chan_ctx->
 							   hdd_remain_on_chan_timer,
 							   wait);
 				if (status != QDF_STATUS_SUCCESS) {
-					hdd_err("Remain on Channel timer start failed");
+					hdd_warn("Remain on Channel timer start failed");
 				}
 				mutex_unlock(&cfgState->
 					     remain_on_chan_ctx_lock);
@@ -1489,7 +1489,7 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
 						     msecs_to_jiffies
 							     (WAIT_CANCEL_REM_CHAN));
 					if (!rc) {
-						hdd_err("wait on cancel_rem_on_chan_var timed out");
+						hdd_warn("wait on cancel_rem_on_chan_var timed out");
 					}
 
 				} else
@@ -2271,26 +2271,26 @@ static void wlan_hdd_p2p_action_debug(tActionFrmType actionFrmType,
 						uint8_t *macFrom)
 {
 	if (actionFrmType >= MAX_P2P_ACTION_FRAME_TYPE) {
-		hdd_err("[P2P] unknown[%d] <--- OTA from " MAC_ADDRESS_STR,
+		hdd_notice("[P2P] unknown[%d] <--- OTA from " MAC_ADDRESS_STR,
 			actionFrmType, MAC_ADDR_ARRAY(macFrom));
 	} else {
-		hdd_err("[P2P] %s <--- OTA from " MAC_ADDRESS_STR,
+		hdd_notice("[P2P] %s <--- OTA from " MAC_ADDRESS_STR,
 			p2p_action_frame_type[actionFrmType],
 			MAC_ADDR_ARRAY(macFrom));
 		if ((actionFrmType == WLAN_HDD_PROV_DIS_REQ)
 		    && (global_p2p_connection_status == P2P_NOT_ACTIVE)) {
 			global_p2p_connection_status = P2P_GO_NEG_PROCESS;
-			hdd_err("[P2P State]Inactive state to GO negotiation progress state");
+			hdd_notice("[P2P State]Inactive state to GO negotiation progress state");
 		} else
 		if ((actionFrmType == WLAN_HDD_GO_NEG_CNF)
 		    && (global_p2p_connection_status == P2P_GO_NEG_PROCESS)) {
 			global_p2p_connection_status = P2P_GO_NEG_COMPLETED;
-			hdd_err("[P2P State]GO negotiation progress to GO negotiation completed state");
+			hdd_notice("[P2P State]GO negotiation progress to GO negotiation completed state");
 		} else
 		if ((actionFrmType == WLAN_HDD_INVITATION_REQ)
 		    && (global_p2p_connection_status == P2P_NOT_ACTIVE)) {
 			global_p2p_connection_status = P2P_GO_NEG_COMPLETED;
-			hdd_err("[P2P State]Inactive state to GO negotiation completed state Autonomous GO formation");
+			hdd_notice("[P2P State]Inactive state to GO negotiation completed state Autonomous GO formation");
 		}
 	}
 }
@@ -2497,9 +2497,9 @@ void __hdd_indicate_mgmt_frame(hdd_adapter_t *pAdapter,
 									frame_ptr,
 									pbFrames,
 									nFrameLength);
-								hdd_err("Action Pkt Cached successfully !!!");
+								hdd_notice("Action Pkt Cached successfully !!!");
 							} else {
-								hdd_err("Frames are pending. dropping frame !!!");
+								hdd_warn("Frames are pending. dropping frame !!!");
 							}
 							mutex_unlock(&cfgState->
 								     remain_on_chan_ctx_lock);