From 8510e2c28ba5d64efa3fd18fbab7f549786b5dbb Mon Sep 17 00:00:00 2001
From: Paul Zhang <paulz@codeaurora.org>
Date: Wed, 14 Jun 2017 17:38:43 +0800
Subject: [PATCH] icnss: change the cnss name to icnss

Refine the code change for this changeID:
I335a046a886ac3ce35cf96eb71231bfe75d33c60

CRs-Fixed: 2058348
Change-Id: I9a734c8bed284870562ff2d096e7316328f37e02
Signed-off-by: Paul Zhang <paulz@codeaurora.org>
---
 drivers/soc/qcom/icnss.c       | 14 --------------
 drivers/soc/qcom/icnss_utils.c | 14 ++++++++++++++
 include/soc/qcom/icnss.h       |  2 ++
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index 78c52cd943bf..b5bb719df848 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -366,8 +366,6 @@ static struct icnss_priv {
 	bool bypass_s1_smmu;
 } *penv;
 
-static enum cnss_cc_src cnss_cc_source = CNSS_SOURCE_CORE;
-
 #ifdef CONFIG_ICNSS_DEBUG
 static void icnss_ignore_qmi_timeout(bool ignore)
 {
@@ -941,18 +939,6 @@ static int icnss_hw_power_off(struct icnss_priv *priv)
 	return ret;
 }
 
-void cnss_set_cc_source(enum cnss_cc_src cc_source)
-{
-	cnss_cc_source = cc_source;
-}
-EXPORT_SYMBOL(cnss_set_cc_source);
-
-enum cnss_cc_src cnss_get_cc_source(void)
-{
-	return cnss_cc_source;
-}
-EXPORT_SYMBOL(cnss_get_cc_source);
-
 int icnss_power_on(struct device *dev)
 {
 	struct icnss_priv *priv = dev_get_drvdata(dev);
diff --git a/drivers/soc/qcom/icnss_utils.c b/drivers/soc/qcom/icnss_utils.c
index 6974146c6112..ca22b6cdf4a1 100644
--- a/drivers/soc/qcom/icnss_utils.c
+++ b/drivers/soc/qcom/icnss_utils.c
@@ -19,6 +19,7 @@
 static DEFINE_MUTEX(unsafe_channel_list_lock);
 static DEFINE_SPINLOCK(dfs_nol_info_lock);
 static int driver_load_cnt;
+static enum cnss_cc_src icnss_cc_source = CNSS_SOURCE_CORE;
 
 static struct icnss_unsafe_channel_list {
 	u16 unsafe_ch_count;
@@ -138,3 +139,16 @@ int icnss_get_driver_load_cnt(void)
 	return driver_load_cnt;
 }
 EXPORT_SYMBOL(icnss_get_driver_load_cnt);
+
+
+void icnss_set_cc_source(enum cnss_cc_src cc_source)
+{
+	icnss_cc_source = cc_source;
+}
+EXPORT_SYMBOL(icnss_set_cc_source);
+
+enum cnss_cc_src icnss_get_cc_source(void)
+{
+	return icnss_cc_source;
+}
+EXPORT_SYMBOL(icnss_get_cc_source);
diff --git a/include/soc/qcom/icnss.h b/include/soc/qcom/icnss.h
index 0764b9e26962..c34a21f355e1 100644
--- a/include/soc/qcom/icnss.h
+++ b/include/soc/qcom/icnss.h
@@ -154,4 +154,6 @@ extern void cnss_set_cc_source(enum cnss_cc_src cc_source);
 extern enum cnss_cc_src cnss_get_cc_source(void);
 extern int icnss_get_driver_load_cnt(void);
 extern void icnss_increment_driver_load_cnt(void);
+extern void icnss_set_cc_source(enum cnss_cc_src cc_source);
+extern enum cnss_cc_src icnss_get_cc_source(void);
 #endif /* _ICNSS_WLAN_H_ */