qcacld-3.0: Fix code readability in single ndev changes

To fix the code segments which are less reader friendly.
The changes are identified from single netdev changes
in Ia1f01865277c3e08254f44a39ba6675a9fea6c65

Change-Id: I3d09fb5d9f578514b00c9c9045acf7bd7e208140
CRs-Fixed: 3445321

core/hdd/src/wlan_hdd_cfg80211.c

@@ -2337,8 +2337,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
 	 * so no need to set acs in progress
 	 */
 	if (!sap_config->acs_cfg.skip_acs_scan)
-		qdf_atomic_set(&adapter->deflink->session.ap.acs_in_progress,
-			       1);
+		qdf_atomic_set(&adapter->deflink->session.ap.acs_in_progress, 1);
 
 	return 0;
 }
@@ -3674,8 +3673,7 @@ static int __wlan_hdd_cfg80211_do_acs(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	if (qdf_atomic_read(
-		&adapter->deflink->session.ap.acs_in_progress) > 0) {
+	if (qdf_atomic_read(&adapter->deflink->session.ap.acs_in_progress) > 0) {
 		if (wlan_hdd_check_is_acs_request_same(adapter,
 						       data, data_len)) {
 			hdd_debug("Same ACS req as ongoing is received, return success");
@@ -15753,8 +15751,7 @@ static int hdd_update_acs_channel(struct hdd_adapter *adapter, uint8_t reason,
 
 	if (QDF_TIMER_STATE_RUNNING ==
 	    qdf_mc_timer_get_current_state(&hdd_ap_ctx->vendor_acs_timer)) {
-		qdf_mc_timer_stop(
-			&hdd_ap_ctx->vendor_acs_timer);
+		qdf_mc_timer_stop(&hdd_ap_ctx->vendor_acs_timer);
 	}
 
 	if (channel_list->pri_chan_freq == 0) {

core/hdd/src/wlan_hdd_hostapd.c

@@ -2313,8 +2313,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 	case eSAP_DFS_RADAR_DETECT:
 	{
 		int i;
-		struct sap_config *sap_config =
-				&adapter->deflink->session.ap.sap_config;
 
 		hdd_dfs_indicate_radar(hdd_ctx);
 		wlan_hdd_send_svc_nlink_msg(hdd_ctx->radio_index,
@@ -2868,8 +2866,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 			      ap_ctx->sap_config.acs_cfg.pri_ch_freq,
 			      ap_ctx->sap_config.acs_cfg.ch_width);
 
-		if (qdf_atomic_read(
-		    &adapter->deflink->session.ap.acs_in_progress) &&
+		if (qdf_atomic_read(&ap_ctx->acs_in_progress) &&
 		    test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
 			hdd_dcs_chan_select_complete(adapter);
 		} else {
@@ -5171,7 +5168,7 @@ QDF_STATUS wlan_hdd_config_acs(struct hdd_context *hdd_ctx,
 
 		if (con_sap_adapter)
 			con_sap_config =
-			    &con_sap_adapter->deflink->session.ap.sap_config;
+				&con_sap_adapter->deflink->session.ap.sap_config;
 
 		sap_config->acs_cfg.skip_scan_status = eSAP_DO_NEW_ACS_SCAN;
 
@@ -6799,10 +6796,8 @@ int hdd_destroy_acs_timer(struct hdd_adapter *adapter)
 	ap_ctx->vendor_acs_timer_initialized = false;
 
 	clear_bit(VENDOR_ACS_RESPONSE_PENDING, &adapter->event_flags);
-	if (QDF_TIMER_STATE_RUNNING ==
-			ap_ctx->vendor_acs_timer.state) {
-		qdf_status =
-			qdf_mc_timer_stop(&ap_ctx->vendor_acs_timer);
+	if (QDF_TIMER_STATE_RUNNING == ap_ctx->vendor_acs_timer.state) {
+		qdf_status = qdf_mc_timer_stop(&ap_ctx->vendor_acs_timer);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status))
 			hdd_err("Failed to stop ACS timer");
 	}
@@ -8138,8 +8133,8 @@ bool hdd_sap_is_acs_in_progress(struct wlan_objmgr_vdev *vdev)
 		return in_progress;
 	}
 
-	in_progress = qdf_atomic_read(
-				&adapter->deflink->session.ap.acs_in_progress);
+	in_progress =
+		qdf_atomic_read(&adapter->deflink->session.ap.acs_in_progress);
 
 	return in_progress;
 }

core/hdd/src/wlan_hdd_hostapd_wext.c

@@ -999,10 +999,9 @@ static __iw_softap_setparam(struct net_device *dev,
 	}
 	case QCSAP_START_FW_PROFILING:
 		hdd_debug("QCSAP_START_FW_PROFILING %d", set_value);
-		ret = wma_cli_set_command(
-					adapter->deflink->vdev_id,
-					WMI_WLAN_PROFILE_TRIGGER_CMDID,
-					set_value, DBG_CMD);
+		ret = wma_cli_set_command(adapter->deflink->vdev_id,
+					  WMI_WLAN_PROFILE_TRIGGER_CMDID,
+					  set_value, DBG_CMD);
 		break;
 	case QCASAP_PARAM_LDPC:
 		ret = hdd_set_ldpc(adapter, set_value);
@@ -1015,8 +1014,7 @@ static __iw_softap_setparam(struct net_device *dev,
 		break;
 	case QCASAP_SET_11AX_RATE:
 		ret = hdd_set_11ax_rate(adapter, set_value,
-					&adapter->deflink->session.ap.
-					sap_config);
+					&adapter->deflink->session.ap.sap_config);
 		break;
 	case QCASAP_PARAM_DCM:
 		hdd_debug("Set wmi_vdev_param_he_dcm_enable: %d", set_value);

core/hdd/src/wlan_hdd_ioctl.c

@@ -6394,6 +6394,7 @@ static void disconnect_sta_and_restart_sap(struct hdd_context *hdd_ctx,
 {
 	struct hdd_adapter *adapter, *next = NULL;
 	QDF_STATUS status;
+	struct hdd_ap_ctx *ap_ctx;
 
 	if (!hdd_ctx)
 		return;
@@ -6402,15 +6403,16 @@ static void disconnect_sta_and_restart_sap(struct hdd_context *hdd_ctx,
 
 	status = hdd_get_front_adapter(hdd_ctx, &adapter);
 	while (adapter && (status == QDF_STATUS_SUCCESS)) {
-		if (!hdd_validate_adapter(adapter) &&
-		    adapter->device_mode == QDF_SAP_MODE) {
-			if (check_disable_channels(hdd_ctx,
-			    adapter->deflink->session.ap.operating_chan_freq))
-				policy_mgr_check_sap_restart(
-						hdd_ctx->psoc,
-						adapter->deflink->vdev_id);
+		if (hdd_validate_adapter(adapter) ||
+		    adapter->device_mode != QDF_SAP_MODE) {
+			goto next_adapter;
 		}
 
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		if (check_disable_channels(hdd_ctx, ap_ctx->operating_chan_freq))
+			policy_mgr_check_sap_restart(hdd_ctx->psoc,
+						     adapter->deflink->vdev_id);
+next_adapter:
 		status = hdd_get_next_adapter(hdd_ctx, adapter, &next);
 		adapter = next;
 	}

core/hdd/src/wlan_hdd_main.c

@@ -504,10 +504,8 @@ QDF_STATUS hdd_common_roam_callback(struct wlan_objmgr_psoc *psoc,
 		break;
 	case QDF_SAP_MODE:
 	case QDF_P2P_GO_MODE:
-		status = wlansap_roam_callback(
-				adapter->deflink->session.ap.sap_context,
-				roam_info, roam_status,
-				roam_result);
+		status = wlansap_roam_callback(adapter->deflink->session.ap.sap_context,
+					       roam_info, roam_status, roam_result);
 		break;
 	default:
 		hdd_err("Wrong device mode");
@@ -684,8 +682,7 @@ enum phy_ch_width hdd_get_adapter_width(struct hdd_adapter *adapter)
 	if ((adapter->device_mode == QDF_SAP_MODE ||
 	     adapter->device_mode == QDF_P2P_GO_MODE) &&
 	    test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
-		width =
-		adapter->deflink->session.ap.sap_config.ch_params.ch_width;
+		width = adapter->deflink->session.ap.sap_config.ch_params.ch_width;
 	} else if ((adapter->device_mode == QDF_STA_MODE ||
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) &&
 		   hdd_cm_is_vdev_associated(adapter)) {
@@ -8103,7 +8100,7 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 {
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
 	struct hdd_station_ctx *sta_ctx;
-	struct sap_context *sap_ctx;
+	struct hdd_ap_ctx *ap_ctx;
 	union iwreq_data wrqu;
 	tSirUpdateIE update_ie;
 	unsigned long rc;
@@ -8304,12 +8301,11 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 		fallthrough;
 
 	case QDF_P2P_GO_MODE:
-		sap_ctx = WLAN_HDD_GET_SAP_CTX_PTR(adapter);
-		wlansap_cleanup_cac_timer(sap_ctx);
+		ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
+		wlansap_cleanup_cac_timer(ap_ctx->sap_context);
 
 		cds_flush_work(&adapter->sap_stop_bss_work);
-		if (qdf_atomic_read(
-			&adapter->deflink->session.ap.acs_in_progress)) {
+		if (qdf_atomic_read(&ap_ctx->acs_in_progress)) {
 			hdd_info("ACS in progress, wait for complete");
 			qdf_wait_for_event_completion(
 				&adapter->acs_complete_event,
@@ -8386,8 +8382,8 @@ QDF_STATUS hdd_stop_adapter_ext(struct hdd_context *hdd_ctx,
 		 */
 		if (!cds_is_driver_recovering()) {
 			clear_bit(SOFTAP_INIT_DONE, &adapter->event_flags);
-			qdf_mem_free(adapter->deflink->session.ap.beacon);
-			adapter->deflink->session.ap.beacon = NULL;
+			qdf_mem_free(ap_ctx->beacon);
+			ap_ctx->beacon = NULL;
 		}
 
 		/* Clear all the cached sta info */
@@ -8600,8 +8596,7 @@ static void hdd_reset_scan_operation(struct hdd_context *hdd_ctx,
 		wlan_hdd_cleanup_remain_on_channel_ctx(adapter);
 		break;
 	case QDF_SAP_MODE:
-		qdf_atomic_set(&adapter->deflink->session.ap.acs_in_progress,
-			       0);
+		qdf_atomic_set(&adapter->deflink->session.ap.acs_in_progress, 0);
 		break;
 	default:
 		break;
@@ -11681,20 +11676,20 @@ int hdd_update_acs_timer_reason(struct hdd_adapter *adapter, uint8_t reason)
 	struct hdd_external_acs_timer_context *timer_context;
 	int status;
 	QDF_STATUS qdf_status;
+	qdf_mc_timer_t *vendor_acs_timer;
 
 	set_bit(VENDOR_ACS_RESPONSE_PENDING, &adapter->event_flags);
 
-	if (QDF_TIMER_STATE_RUNNING == qdf_mc_timer_get_current_state(
-			&adapter->deflink->session.ap.vendor_acs_timer)) {
-		qdf_mc_timer_stop(
-			&adapter->deflink->session.ap.vendor_acs_timer);
+	vendor_acs_timer = &adapter->deflink->session.ap.vendor_acs_timer;
+	if (QDF_TIMER_STATE_RUNNING ==
+	    qdf_mc_timer_get_current_state(vendor_acs_timer)) {
+		qdf_mc_timer_stop(vendor_acs_timer);
 	}
-	timer_context = (struct hdd_external_acs_timer_context *)
-			adapter->deflink->session.ap.vendor_acs_timer.user_data;
+	timer_context =
+		(struct hdd_external_acs_timer_context *)vendor_acs_timer->user_data;
 	timer_context->reason = reason;
-	qdf_status = qdf_mc_timer_start(
-				&adapter->deflink->session.ap.vendor_acs_timer,
-				WLAN_VENDOR_ACS_WAIT_TIME);
+	qdf_status =
+		qdf_mc_timer_start(vendor_acs_timer, WLAN_VENDOR_ACS_WAIT_TIME);
 	if (qdf_status != QDF_STATUS_SUCCESS) {
 		hdd_err("failed to start external acs timer");
 		return -ENOSPC;
@@ -11768,7 +11763,7 @@ hdd_store_sap_restart_channel(qdf_freq_t restart_chan, qdf_freq_t *restart_chan_
 void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 {
 	struct hdd_adapter *adapter, *next_adapter = NULL;
-	struct hdd_ap_ctx *ap_ctx = NULL;
+	struct hdd_ap_ctx *ap_ctx;
 	uint32_t i;
 	bool found = false;
 	qdf_freq_t restart_chan_store[SAP_MAX_NUM_SESSION] = {0};
@@ -11793,7 +11788,7 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 			continue;
 		}
 
-		ap_chan_freq = adapter->deflink->session.ap.operating_chan_freq;
+		ap_chan_freq = ap_ctx->operating_chan_freq;
 
 		found = false;
 		status =
@@ -11805,13 +11800,10 @@ void hdd_unsafe_channel_restart_sap(struct hdd_context *hdd_ctxt)
 		 * If STA+SAP is doing SCC & g_sta_sap_scc_on_lte_coex_chan
 		 * is set, no need to move SAP.
 		 */
-		if ((policy_mgr_is_sta_sap_scc(
-		    hdd_ctxt->psoc,
-		    adapter->deflink->session.ap.operating_chan_freq) &&
-		    scc_on_lte_coex) ||
-		    policy_mgr_nan_sap_scc_on_unsafe_ch_chk(
-		    hdd_ctxt->psoc,
-		    adapter->deflink->session.ap.operating_chan_freq)) {
+		if ((policy_mgr_is_sta_sap_scc(hdd_ctxt->psoc, ap_ctx->operating_chan_freq) &&
+		     scc_on_lte_coex) ||
+		    policy_mgr_nan_sap_scc_on_unsafe_ch_chk(hdd_ctxt->psoc,
+							    ap_ctx->operating_chan_freq)) {
 			hdd_debug("SAP allowed in unsafe SCC channel");
 		} else {
 			for (i = 0; i < hdd_ctxt->unsafe_channel_count; i++) {

core/hdd/src/wlan_hdd_scan.c

@@ -820,12 +820,13 @@ static inline void wlan_hdd_copy_bssid(struct cfg80211_scan_request *request,
 
 static void hdd_process_vendor_acs_response(struct hdd_adapter *adapter)
 {
+	qdf_mc_timer_t *vendor_acs_timer;
+
+	vendor_acs_timer = &adapter->deflink->session.ap.vendor_acs_timer;
 	if (test_bit(VENDOR_ACS_RESPONSE_PENDING, &adapter->event_flags)) {
 		if (QDF_TIMER_STATE_RUNNING ==
-		    qdf_mc_timer_get_current_state(
-			&adapter->deflink->session.ap.vendor_acs_timer)) {
-			qdf_mc_timer_stop(
-				&adapter->deflink->session.ap.vendor_acs_timer);
+		    qdf_mc_timer_get_current_state(vendor_acs_timer)) {
+			qdf_mc_timer_stop(vendor_acs_timer);
 		}
 	}
 }

core/hdd/src/wlan_hdd_son.c

@@ -92,8 +92,8 @@ static uint32_t hdd_son_is_acs_in_progress(struct wlan_objmgr_vdev *vdev)
 		return in_progress;
 	}
 
-	in_progress = qdf_atomic_read(
-			&adapter->deflink->session.ap.acs_in_progress);
+	in_progress =
+		qdf_atomic_read(&adapter->deflink->session.ap.acs_in_progress);
 
 	return in_progress;
 }

core/hdd/src/wlan_hdd_stats.c

@@ -920,9 +920,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 	    (adapter->device_mode == QDF_P2P_GO_MODE)) {
 		if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
 			config = &adapter->deflink->session.ap.sap_config;
-
-			qdf_copy_macaddr(&info->bssid,
-					 &config->self_macaddr);
+			qdf_copy_macaddr(&info->bssid, &config->self_macaddr);
 		}
 	}
 	wlan_reg_get_cc_and_src(adapter->hdd_ctx->psoc, info->countryStr);