With the removal of boardname there is no more intrest in have override paramerters.

Removed the global_fixed_paramerters as it is no longer a valid flag.
Also removed teh global_power_overide from main section that loads parameters, as it will
not be vaild at this point.

4 files changed, 2 insertions, 13 deletions

diff --git a/src/main.cpp b/src/main.cpp
index ad87f74..29b0095 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -322,11 +322,8 @@ static void powertop_init(void)
 	register_parameter("disk-operations", 0.0);
 	register_parameter("xwakes", 0.1);
 
-        if (access("/var/cache/powertop/saved_parameters.powertop", R_OK)){
+        if (access("/var/cache/powertop/saved_parameters.powertop", R_OK))
 	        load_parameters("/var/cache/powertop/saved_parameters.powertop");
-        	global_fixed_parameters = 1;
-	        global_power_override = 1;
-	}
 
 	initialized = 1;
 }
diff --git a/src/parameters/learn.cpp b/src/parameters/learn.cpp
index acb0094..aaef5a2 100644
--- a/src/parameters/learn.cpp
+++ b/src/parameters/learn.cpp
@@ -112,10 +112,6 @@ void learn_parameters(int iterations, int do_base_power)
 	unsigned int i;
 	time_t start;
 
-	if (global_fixed_parameters)
-		return;
-
-
 	/* don't start fitting anything until we have at least 1 more measurement than we have parameters */
 	if (past_results.size() <= all_parameters.parameters.size())
 		return;
@@ -283,4 +279,4 @@ void learn_parameters(int iterations, int do_base_power)
 		printf("Final score %4.2f (%i points)\n", best_so_far->score / past_results.size(), (int)past_results.size());
 //	dump_parameter_bundle(best_so_far);
 //	dump_past_results();
-}
\ No newline at end of file
+}
diff --git a/src/parameters/parameters.cpp b/src/parameters/parameters.cpp
index eded805..1a89b14 100644
--- a/src/parameters/parameters.cpp
+++ b/src/parameters/parameters.cpp
@@ -425,9 +425,6 @@ int utilization_power_valid(int index)
 /* force power data to be valid to the rest of the system  */
 int global_power_override = 0;
 
-/* force no calculations to be done on parameters and trust the current ones */
-int global_fixed_parameters = 0;
-
 /*
  * only report power numbers once we have 3* more measurements than
  * we have parameters; anything less and our model fit is highly suspect
diff --git a/src/parameters/parameters.h b/src/parameters/parameters.h
index 26ce742..a8c1154 100644
--- a/src/parameters/parameters.h
+++ b/src/parameters/parameters.h
@@ -116,7 +116,6 @@ int global_power_valid(void);
 
 
 extern int global_power_override;
-extern int global_fixed_parameters;
 
 
 #endif