qcacmn: Fix debug log string

Add change to print debug log without function name and line number.

Change-Id: I0d07c42e5a3b0f6e5e17d77b94c1dc70d52fa744
CRs-Fixed: 2382526

qdf/linux/src/qdf_trace.c

@@ -2867,7 +2867,7 @@ struct category_name_info g_qdf_category_name[MAX_SUPPORTED_CATEGORY] = {
 	[QDF_MODULE_ID_TARGET] = {"TARGET"},
 	[QDF_MODULE_ID_MBSSIE] = {"MBSSIE"},
 	[QDF_MODULE_ID_FWOL] = {"fwol"},
-	[QDF_MODULE_ID_SM_ENGINE] = {"SM_ENGINE"},
+	[QDF_MODULE_ID_SM_ENGINE] = {"SM_ENG"},
 	[QDF_MODULE_ID_CMN_MLME] = {"CMN_MLME"},
 	[QDF_MODULE_ID_BSSCOLOR] = {"BSSCOLOR"},
 	[QDF_MODULE_ID_ANY] = {"ANY"},

umac/cmn_services/sm_engine/src/wlan_sm_engine.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -53,14 +53,12 @@ QDF_STATUS wlan_sm_dispatch(struct wlan_sm *sm, uint16_t event,
 		if (event < sm->num_event_names)
 			event_name = sm->event_names[event];
 
-		sm_engine_debug("%s: current state %s[%d] event %s[%d]",
-				sm->name, sm->state_info[state].name, state,
-				event_name ? event_name : "UNKNOWN_EVENT",
-				event);
+		sm_engine_nofl_debug("%s: %s, %s", sm->name,
+				     sm->state_info[state].name,
+				     event_name ? event_name : "UNKNOWN_EVENT");
 	} else {
-		sm_engine_debug("%s: current state %s[%d] event %d",
-				sm->name, sm->state_info[state].name, state,
-				event);
+		sm_engine_nofl_debug("%s: %s ev [%d]", sm->name,
+				     sm->state_info[state].name, event);
 	}
 
 	if (state != WLAN_SM_ENGINE_STATE_NONE) {
@@ -144,15 +142,11 @@ void wlan_sm_transition_to(struct wlan_sm *sm, uint8_t state)
 	else
 		new_sub_st = 0;
 
-	sm_engine_debug("%s: transition(state) %s[%d] => %s[%d]",
-			sm->name, state_info[old_state].name, old_state,
-			state_info[new_state].name, new_state);
-	sm_engine_debug("%s: transition(sub_state) %s[%d] => %s[%d]",
-			sm->name,
-			ol_sub_st ? state_info[ol_sub_st].name : "IDLE",
-			ol_sub_st,
-			new_sub_st ? state_info[new_sub_st].name : "IDLE",
-			new_sub_st);
+	sm_engine_nofl_debug("%s: %s > %s, %s > %s", sm->name,
+			     state_info[old_state].name,
+			     state_info[new_state].name,
+			     ol_sub_st ? state_info[ol_sub_st].name : "IDLE",
+			     new_sub_st ? state_info[new_sub_st].name : "IDLE");
 
 	/*
 	 * call the exit function(s) of the current state hierarchy
@@ -178,8 +172,9 @@ void wlan_sm_transition_to(struct wlan_sm *sm, uint8_t state)
 		cur_state = state_info[cur_state].initial_substate;
 
 		if (cur_state != WLAN_SM_ENGINE_STATE_NONE)
-			sm_engine_debug("%s: Entering Initial sub state %s",
-					sm->name, state_info[cur_state].name);
+			sm_engine_nofl_debug("%s: Initial sub state %s",
+					     sm->name,
+					     state_info[cur_state].name);
 	}
 	qdf_atomic_set(&sm->in_state_transition, 0);
 }

umac/mlme/vdev_mgr/core/src/vdev_mlme_sm.c

@@ -1698,7 +1698,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_START,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"START-START_PROGRESS",
+		"ST-START_PROG",
 		mlme_vdev_subst_start_start_progress_entry,
 		mlme_vdev_subst_start_start_progress_exit,
 		mlme_vdev_subst_start_start_progress_event
@@ -1708,7 +1708,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_START,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"START-RESTART_PROGRESS",
+		"ST-RESTART_PROG",
 		mlme_vdev_subst_start_restart_progress_entry,
 		mlme_vdev_subst_start_restart_progress_exit,
 		mlme_vdev_subst_start_restart_progress_event
@@ -1718,7 +1718,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_START,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"START-CONN_PROGRESS",
+		"ST-CONN_PROG",
 		mlme_vdev_subst_start_conn_progress_entry,
 		mlme_vdev_subst_start_conn_progress_exit,
 		mlme_vdev_subst_start_conn_progress_event
@@ -1728,7 +1728,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_START,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"START-DISCONN_PROGRESS",
+		"ST-DISCONN_PROG",
 		mlme_vdev_subst_start_disconn_progress_entry,
 		mlme_vdev_subst_start_disconn_progress_exit,
 		mlme_vdev_subst_start_disconn_progress_event
@@ -1738,7 +1738,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_SUSPEND,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"SUSPEND-SUSPEND_DOWN",
+		"SP-SUSPEND_DOWN",
 		mlme_vdev_subst_suspend_suspend_down_entry,
 		mlme_vdev_subst_suspend_suspend_down_exit,
 		mlme_vdev_subst_suspend_suspend_down_event
@@ -1748,7 +1748,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_SUSPEND,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"SUSPEND-SUSPEND_RESTART",
+		"SP-SUSPEND_RESTART",
 		mlme_vdev_subst_suspend_suspend_restart_entry,
 		mlme_vdev_subst_suspend_suspend_restart_exit,
 		mlme_vdev_subst_suspend_suspend_restart_event
@@ -1758,7 +1758,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_SUSPEND,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"SUSPEND-HOST_RESTART",
+		"SP-HOST_RESTART",
 		mlme_vdev_subst_suspend_host_restart_entry,
 		mlme_vdev_subst_suspend_host_restart_exit,
 		mlme_vdev_subst_suspend_host_restart_event
@@ -1768,7 +1768,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_SUSPEND,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"SUSPEND-CSA_RESTART",
+		"SP-CSA_RESTART",
 		mlme_vdev_subst_suspend_csa_restart_entry,
 		mlme_vdev_subst_suspend_csa_restart_exit,
 		mlme_vdev_subst_suspend_csa_restart_event
@@ -1778,7 +1778,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_STOP,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"STOP-STOP_PROGRESS",
+		"STOP-STOP_PROG",
 		mlme_vdev_subst_stop_stop_progress_entry,
 		mlme_vdev_subst_stop_stop_progress_exit,
 		mlme_vdev_subst_stop_stop_progress_event
@@ -1788,7 +1788,7 @@ struct wlan_sm_state_info sm_info[] = {
 		(uint8_t)WLAN_VDEV_S_STOP,
 		(uint8_t)WLAN_SM_ENGINE_STATE_NONE,
 		false,
-		"STOP-DOWN_PROGRESS",
+		"STOP-DOWN_PROG",
 		mlme_vdev_subst_stop_down_progress_entry,
 		mlme_vdev_subst_stop_down_progress_exit,
 		mlme_vdev_subst_stop_down_progress_event