From 64a419a8ad4dbd939f0f2cbdbf779f2cd39c0bd6 Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Wed, 19 Dec 2018 12:29:23 -0800
Subject: [PATCH] qcacld-3.0: Remove sap_dfs_is_channel_in_preferred_location()

Change Ia0fa016b174ef4b50e2cc339e4e476ec65642dbf ("qcacld-3.0:
Use dfs component support") removed the last client of
sap_dfs_is_channel_in_preferred_location().  Since this function
is now obsolete, remove it.

Change-Id: I137a00699511c7f019f6cf3b8f0579aeb52c7778
CRs-Fixed: 2371144
---
 core/sap/src/sap_fsm.c      | 32 --------------------------------
 core/sap/src/sap_internal.h | 16 ----------------
 2 files changed, 48 deletions(-)

diff --git a/core/sap/src/sap_fsm.c b/core/sap/src/sap_fsm.c
index bb4e8523fd..5eb6099517 100644
--- a/core/sap/src/sap_fsm.c
+++ b/core/sap/src/sap_fsm.c
@@ -554,38 +554,6 @@ void sap_dfs_set_current_channel(void *ctx)
 	}
 }
 
-bool sap_dfs_is_channel_in_preferred_location(mac_handle_t mac_handle,
-					      uint8_t channel_id)
-{
-	struct mac_context *mac;
-
-	mac = MAC_CONTEXT(mac_handle);
-	if (NULL == mac) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_ERROR,
-			  FL("invalid mac"));
-		return true;
-	}
-	if ((SAP_CHAN_PREFERRED_INDOOR ==
-	     mac->sap.SapDfsInfo.sap_operating_chan_preferred_location) &&
-	    (true == IS_CHAN_JAPAN_OUTDOOR(channel_id))) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
-			  FL
-				  ("CHAN=%d is Outdoor so invalid,preferred Indoor only"),
-			  channel_id);
-		return false;
-	} else if ((SAP_CHAN_PREFERRED_OUTDOOR ==
-		    mac->sap.SapDfsInfo.sap_operating_chan_preferred_location)
-		   && (true == IS_CHAN_JAPAN_INDOOR(channel_id))) {
-		QDF_TRACE(QDF_MODULE_ID_SAP, QDF_TRACE_LEVEL_INFO_LOW,
-			  FL
-				  ("CHAN=%d is Indoor so invalid,preferred Outdoor only"),
-			  channel_id);
-		return false;
-	}
-
-	return true;
-}
-
 #ifdef FEATURE_AP_MCC_CH_AVOIDANCE
 /**
  * sap_check_in_avoid_ch_list() - checks if given channel present is channel
diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h
index f3cd44a7b9..59045a8cad 100644
--- a/core/sap/src/sap_internal.h
+++ b/core/sap/src/sap_internal.h
@@ -384,22 +384,6 @@ bool sap_is_conc_sap_doing_scc_dfs(mac_handle_t mac_handle,
 
 uint8_t sap_get_total_number_sap_intf(mac_handle_t mac_handle);
 
-/**
- * sap_dfs_is_channel_in_preferred_location() - Verify a channel is valid
- *	with respect to indoor/outdoor location setting
- * @mac_handle: Opaque handle to the global MAC context
- * @channel_id: Channel number to be verified
- *
- * This function checks if the passed @channel_id is in accordance
- * with preferred Channel location settings.
- *
- * Return:
- * * true - Channel location is same as the preferred location
- * * false - Channel location is not same as the preferred location
- */
-bool sap_dfs_is_channel_in_preferred_location(mac_handle_t mac_handle,
-					      uint8_t channel_id);
-
 /**
  * sap_channel_sel - Function for initiating scan request for ACS
  * @sap_context: Sap Context value.