Merge branch 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg...

[deliverable/linux.git] / drivers / cpufreq / cpufreq_governor.h

diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index e16a96130cb3491d30f376728144cdca92e441cd..6663ec3b30565ac7efb6a7b5842e301ad2160bba 100644 (file)
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -81,7 +81,7 @@ static ssize_t show_##file_name##_gov_sys                             \
        return sprintf(buf, "%u\n", tuners->file_name);                 \
 }                                                                      \
                                                                        \
-static ssize_t show_##file_name##_gov_pol                                      \
+static ssize_t show_##file_name##_gov_pol                              \
 (struct cpufreq_policy *policy, char *buf)                             \
 {                                                                      \
        struct dbs_data *dbs_data = policy->governor_data;              \
@@ -91,7 +91,7 @@ static ssize_t show_##file_name##_gov_pol                                     \
 
 #define store_one(_gov, file_name)                                     \
 static ssize_t store_##file_name##_gov_sys                             \
-(struct kobject *kobj, struct attribute *attr, const char *buf, size_t count)  \
+(struct kobject *kobj, struct attribute *attr, const char *buf, size_t count) \
 {                                                                      \
        struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;         \
        return store_##file_name(dbs_data, buf, count);                 \
@@ -256,7 +256,6 @@ static ssize_t show_sampling_rate_min_gov_pol                               \
        return sprintf(buf, "%u\n", dbs_data->min_sampling_rate);       \
 }
 
-u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);
 void dbs_check_cpu(struct dbs_data *dbs_data, int cpu);
 bool need_load_eval(struct cpu_dbs_common_info *cdbs,
                unsigned int sampling_rate);