1 files changed, 17 insertions, 82 deletions

diff --git a/lib/cpufreq.c b/lib/cpufreq.c
index 0c9f28e..603dbf8 100644
--- a/lib/cpufreq.c
+++ b/lib/cpufreq.c
@@ -11,60 +11,39 @@
 #include <string.h>
 
 #include "cpufreq.h"
-#include "interfaces.h"
+#include "sysfs.h"
 
 int cpufreq_cpu_exists(unsigned int cpu)
 {
-	int ret = sysfs_cpu_exists(cpu);
-	if (ret == -ENOSYS)
-		ret = proc_cpu_exists(cpu);
-	return (ret);
+	return sysfs_cpu_exists(cpu);
 }
 
 unsigned long cpufreq_get_freq_kernel(unsigned int cpu)
 {
-	unsigned long ret = sysfs_get_freq_kernel(cpu);
-	if (!ret)
-		ret = proc_get_freq_kernel(cpu);
-	return (ret);
+	return sysfs_get_freq_kernel(cpu);
 }
 
 unsigned long cpufreq_get_freq_hardware(unsigned int cpu)
 {
-	unsigned long ret = sysfs_get_freq_hardware(cpu);
-	if (!ret)
-		ret = proc_get_freq_hardware(cpu);
-	return (ret);
+	return sysfs_get_freq_hardware(cpu);
 }
 
 unsigned long cpufreq_get_transition_latency(unsigned int cpu)
 {
-	unsigned long ret = sysfs_get_transition_latency(cpu);
-	if (!ret)
-		ret = proc_get_transition_latency(cpu);
-	return (ret);
+	return sysfs_get_transition_latency(cpu);
 }
 
 int cpufreq_get_hardware_limits(unsigned int cpu,
 				unsigned long *min,
 				unsigned long *max)
 {
-	int ret;
 	if ((!min) || (!max))
 		return -EINVAL;
-	ret = sysfs_get_hardware_limits(cpu, min, max);
-	if (ret)
-		ret = proc_get_hardware_limits(cpu, min, max);
-	return (ret);
+	return sysfs_get_hardware_limits(cpu, min, max);
 }
 
 char * cpufreq_get_driver(unsigned int cpu) {
-	char * ret;
-	ret = sysfs_get_driver(cpu);
-	if (!ret) {
-		ret = proc_get_driver(cpu);
-	}
-	return (ret);
+	return sysfs_get_driver(cpu);
 }
 
 void cpufreq_put_driver(char * ptr) {
@@ -74,11 +53,7 @@ void cpufreq_put_driver(char * ptr) {
 }
 
 struct cpufreq_policy * cpufreq_get_policy(unsigned int cpu) {
-	struct cpufreq_policy * ret;
-	ret = sysfs_get_policy(cpu);
-	if (!ret)
-		ret = proc_get_policy(cpu);
-	return (ret);
+	return sysfs_get_policy(cpu);
 }
 
 void cpufreq_put_policy(struct cpufreq_policy *policy) {
@@ -91,11 +66,7 @@ void cpufreq_put_policy(struct cpufreq_policy *policy) {
 }
 
 struct cpufreq_available_governors * cpufreq_get_available_governors(unsigned int cpu) {
-	struct cpufreq_available_governors *ret;
-	ret = sysfs_get_available_governors(cpu);
-	if (!ret)
-		ret = proc_get_available_governors(cpu);
-	return (ret);
+	return sysfs_get_available_governors(cpu);
 }
 
 void cpufreq_put_available_governors(struct cpufreq_available_governors *any) {
@@ -116,11 +87,7 @@ void cpufreq_put_available_governors(struct cpufreq_available_governors *any) {
 
 
 struct cpufreq_available_frequencies * cpufreq_get_available_frequencies(unsigned int cpu) {
-	struct cpufreq_available_frequencies * ret;
-	ret = sysfs_get_available_frequencies(cpu);
-	if (!ret)
-		ret = proc_get_available_frequencies(cpu);
-	return (ret);
+	return sysfs_get_available_frequencies(cpu);
 }
 
 void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any) {
@@ -139,11 +106,7 @@ void cpufreq_put_available_frequencies(struct cpufreq_available_frequencies *any
 
 
 struct cpufreq_affected_cpus * cpufreq_get_affected_cpus(unsigned int cpu) {
-	struct cpufreq_affected_cpus * ret;
-	ret = sysfs_get_affected_cpus(cpu);
-	if (!ret)
-		ret = proc_get_affected_cpus(cpu);
-	return (ret);
+	return sysfs_get_affected_cpus(cpu);
 }
 
 void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) {
@@ -162,11 +125,7 @@ void cpufreq_put_affected_cpus(struct cpufreq_affected_cpus *any) {
 
 
 struct cpufreq_affected_cpus * cpufreq_get_related_cpus(unsigned int cpu) {
-	struct cpufreq_affected_cpus * ret;
-	ret = sysfs_get_related_cpus(cpu);
-	if (!ret)
-		ret = proc_get_related_cpus(cpu);
-	return (ret);
+	return sysfs_get_related_cpus(cpu);
 }
 
 void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) {
@@ -175,56 +134,32 @@ void cpufreq_put_related_cpus(struct cpufreq_affected_cpus *any) {
 
 
 int cpufreq_set_policy(unsigned int cpu, struct cpufreq_policy *policy) {
-	int ret;
 	if (!policy || !(policy->governor))
 		return -EINVAL;
 
-	ret = sysfs_set_policy(cpu, policy);
-	if (ret)
-		ret = proc_set_policy(cpu, policy);
-	return (ret);
+	return sysfs_set_policy(cpu, policy);
 }
 
 
 int cpufreq_modify_policy_min(unsigned int cpu, unsigned long min_freq) {
-	int ret;
-
-	ret = sysfs_modify_policy_min(cpu, min_freq);
-	if (ret)
-		ret = proc_modify_policy_min(cpu, min_freq);
-	return (ret);
+	return sysfs_modify_policy_min(cpu, min_freq);
 }
 
 
 int cpufreq_modify_policy_max(unsigned int cpu, unsigned long max_freq) {
-	int ret;
-
-	ret = sysfs_modify_policy_max(cpu, max_freq);
-	if (ret)
-		ret = proc_modify_policy_max(cpu, max_freq);
-	return (ret);
+	return sysfs_modify_policy_max(cpu, max_freq);
 }
 
 
 int cpufreq_modify_policy_governor(unsigned int cpu, char *governor) {
-	int ret;
-
 	if ((!governor) || (strlen(governor) > 19))
 		return -EINVAL;
 
-	ret = sysfs_modify_policy_governor(cpu, governor);
-	if (ret)
-		ret = proc_modify_policy_governor(cpu, governor);
-	return (ret);
+	return sysfs_modify_policy_governor(cpu, governor);
 }
 
 int cpufreq_set_frequency(unsigned int cpu, unsigned long target_frequency) {
-	int ret;
-
-	ret = sysfs_set_frequency(cpu, target_frequency);
-	if (ret)
-		ret = proc_set_frequency(cpu, target_frequency);
-	return (ret);
+	return sysfs_set_frequency(cpu, target_frequency);
 }
 
 struct cpufreq_stats * cpufreq_get_stats(unsigned int cpu, unsigned long long *total_time) {