From: Wook Song <wook16.song@samsung.com>
Date: Tue, 28 Feb 2017 05:38:59 +0000 (+0900)
Subject: pass: Remove policy-specific data from struct pass_governor
X-Git-Tag: submit/tizen/20170328.004502~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=61a676d38ea6d126ef6abb7775e5a08e148682ed;p=platform%2Fcore%2Fsystem%2Fpass.git

pass: Remove policy-specific data from struct pass_governor

This patch removes policy-specific data from struct pass_governor. The
policy-specific data should be included in struct pass_policy only.

Change-Id: Id9bd77e9dbd8b0668170696b40a0d40c9c166e42
Signed-off-by: Wook Song <wook16.song@samsung.com>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
---

diff --git a/src/pass/pass-gov.c b/src/pass/pass-gov.c
index 5e94a9b..27d72d6 100644
--- a/src/pass/pass-gov.c
+++ b/src/pass/pass-gov.c
@@ -417,18 +417,18 @@ static Eina_Bool pass_governor_core_timer(void *data)
 	 * Change the period of govenor timer according to PASS level
 	 */
 	if (policy->pass_table[level].gov_timeout >= PASS_MIN_GOV_TIMEOUT &&
-		(policy->governor->gov_timeout
+		(policy->gov_timeout
 		 != policy->pass_table[level].gov_timeout)) {
 
 		_I("Change the period of governor timer from %fs to %fs\n",
-				policy->governor->gov_timeout,
+				policy->gov_timeout,
 				policy->pass_table[level].gov_timeout);
 
-		policy->governor->gov_timeout =
+		policy->gov_timeout =
 			policy->pass_table[level].gov_timeout;
-		ecore_timer_interval_set(policy->governor->gov_timer_id,
-					policy->governor->gov_timeout);
-		ecore_timer_reset(policy->governor->gov_timer_id);
+		ecore_timer_interval_set(policy->gov_timer_id,
+					policy->gov_timeout);
+		ecore_timer_reset(policy->gov_timer_id);
 	}
 
 	return ECORE_CALLBACK_RENEW;
@@ -455,18 +455,18 @@ static void __pass_governor_start(struct pass_policy *policy)
 	}
 
 	/* Create the core timer of PASS governor */
-	if (policy->governor->gov_timeout > 0) {
-		policy->governor->gov_timer_id = ecore_timer_add(
-				policy->governor->gov_timeout,
+	if (policy->gov_timeout > 0) {
+		policy->gov_timer_id = ecore_timer_add(
+				policy->gov_timeout,
 				(Ecore_Task_Cb)pass_governor_core_timer,
 				(void *)policy);
-		if (!policy->governor->gov_timer_id) {
+		if (!policy->gov_timer_id) {
 			_E("cannot add core timer for governor");
 			pass_governor_update(policy, PASS_GOV_STOP);
 			return;
 		}
 	} else {
-		policy->governor->gov_timer_id = NULL;
+		policy->gov_timer_id = NULL;
 	}
 
 	/*
@@ -509,9 +509,9 @@ static void __pass_governor_stop(struct pass_policy *policy)
 
 	pass_hotplug_stop(policy);
 
-	if (policy->governor->gov_timer_id) {
-		ecore_timer_del(policy->governor->gov_timer_id);
-		policy->governor->gov_timer_id = NULL;
+	if (policy->gov_timer_id) {
+		ecore_timer_del(policy->gov_timer_id);
+		policy->gov_timer_id = NULL;
 	}
 
 	/* Set PASS state as PASS_GOV_STOP */
@@ -525,9 +525,8 @@ static int __pass_governor_init(struct pass_policy *policy)
 	struct pass_resource *res = to_pass_resource(policy);
 	struct pass_conf_data *cdata = &res->cdata;
 
-	if(policy->governor->gov_timeout < 0) {
-		_E("invalid timeout value [%d]!",
-			policy->governor->gov_timeout);
+	if(policy->gov_timeout < 0) {
+		_E("invalid timeout value [%d]!", policy->gov_timeout);
 		pass_governor_update(policy, PASS_GOV_STOP);
 		return -EINVAL;
 	}
@@ -583,7 +582,7 @@ static int __pass_governor_exit(struct pass_policy *policy)
 	policy->pass_table = NULL;
 	policy->num_pass_cpu_stats = 0;
 
-	policy->governor->gov_timeout = 0;
+	policy->gov_timeout = 0;
 
 	policy->governor = NULL;
 
diff --git a/src/pass/pass.c b/src/pass/pass.c
index 0fe797d..c7399dc 100644
--- a/src/pass/pass.c
+++ b/src/pass/pass.c
@@ -182,7 +182,6 @@ static int pass_resource_init(struct pass_policy *policy)
 		_E("cannot get the instance of PASS governor");
 		return -1;
 	}
-	policy->governor->gov_timeout	= policy->gov_timeout;
 
 	/* Get the instance of PASS hotplug */
 	policy->hotplug = pass_get_hotplug(policy, policy->gov_type);
diff --git a/src/pass/pass.h b/src/pass/pass.h
index 6271799..8eaa82e 100644
--- a/src/pass/pass.h
+++ b/src/pass/pass.h
@@ -95,8 +95,6 @@ struct pass_governor {
 	int (*exit)(struct pass_policy *);
 	int (*update)(struct pass_policy *, enum pass_gov_state state);
 	int (*governor)(struct pass_policy *);
-	Ecore_Timer *gov_timer_id;
-	double gov_timeout;
 };
 
 /******************************************************
@@ -247,6 +245,7 @@ struct pass_policy {
 
 	struct pass_governor *governor;
 	double gov_timeout;
+	Ecore_Timer *gov_timer_id;
 	struct pass_hotplug *hotplug;
 };