cpufreq: governor: Drop unused macros for creating governor tunable attributes

The previous commit introduced a new set of macros for creating sysfs
attributes that represent governor tunables and the old macros used for
this purpose are not needed any more, so drop them.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Tested-by: Juri Lelli <juri.lelli@arm.com>
Tested-by: Shilpasri G Bhat <shilpa.bhat@linux.vnet.ibm.com>
[ rjw: Subject & changelog ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
index bdb6e4940b756d243240254bf283ba300af0e8d7..0eb66a6c950359e628b2d57496e5dcd7f1b7554b 100644 (file)
--- a/drivers/cpufreq/cpufreq_governor.h
+++ b/drivers/cpufreq/cpufreq_governor.h
@@ -41,95 +41,6 @@
 /* Ondemand Sampling types */
 enum {OD_NORMAL_SAMPLE, OD_SUB_SAMPLE};
 
-/*
- * Macro for creating governors sysfs routines
- *
- * - gov_sys: One governor instance per whole system
- * - gov_pol: One governor instance per policy
- */
-
-/* Create attributes */
-#define gov_sys_attr_ro(_name)                                         \
-static struct global_attr _name##_gov_sys =                            \
-__ATTR(_name, 0444, show_##_name##_gov_sys, NULL)
-
-#define gov_sys_attr_rw(_name)                                         \
-static struct global_attr _name##_gov_sys =                            \
-__ATTR(_name, 0644, show_##_name##_gov_sys, store_##_name##_gov_sys)
-
-#define gov_pol_attr_ro(_name)                                         \
-static struct freq_attr _name##_gov_pol =                              \
-__ATTR(_name, 0444, show_##_name##_gov_pol, NULL)
-
-#define gov_pol_attr_rw(_name)                                         \
-static struct freq_attr _name##_gov_pol =                              \
-__ATTR(_name, 0644, show_##_name##_gov_pol, store_##_name##_gov_pol)
-
-#define gov_sys_pol_attr_rw(_name)                                     \
-       gov_sys_attr_rw(_name);                                         \
-       gov_pol_attr_rw(_name)
-
-#define gov_sys_pol_attr_ro(_name)                                     \
-       gov_sys_attr_ro(_name);                                         \
-       gov_pol_attr_ro(_name)
-
-/* Create show/store routines */
-#define show_one(_gov, file_name)                                      \
-static ssize_t show_##file_name##_gov_sys                              \
-(struct kobject *kobj, struct attribute *attr, char *buf)              \
-{                                                                      \
-       struct _gov##_dbs_tuners *tuners = _gov##_dbs_gov.gdbs_data->tuners; \
-       return sprintf(buf, "%u\n", tuners->file_name);                 \
-}                                                                      \
-                                                                       \
-static ssize_t show_##file_name##_gov_pol                              \
-(struct cpufreq_policy *policy, char *buf)                             \
-{                                                                      \
-       struct policy_dbs_info *policy_dbs = policy->governor_data;     \
-       struct dbs_data *dbs_data = policy_dbs->dbs_data;               \
-       struct _gov##_dbs_tuners *tuners = dbs_data->tuners;            \
-       return sprintf(buf, "%u\n", tuners->file_name);                 \
-}
-
-#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 dbs_data *dbs_data = _gov##_dbs_gov.gdbs_data;           \
-       return store_##file_name(dbs_data, buf, count);                 \
-}                                                                      \
-                                                                       \
-static ssize_t store_##file_name##_gov_pol                             \
-(struct cpufreq_policy *policy, const char *buf, size_t count)         \
-{                                                                      \
-       struct policy_dbs_info *policy_dbs = policy->governor_data;     \
-       return store_##file_name(policy_dbs->dbs_data, buf, count);                     \
-}
-
-#define show_store_one(_gov, file_name)                                        \
-show_one(_gov, file_name);                                             \
-store_one(_gov, file_name)
-
-#define show_one_common(_gov, file_name)                               \
-static ssize_t show_##file_name##_gov_sys                              \
-(struct kobject *kobj, struct attribute *attr, char *buf)              \
-{                                                                      \
-       struct dbs_data *dbs_data = _gov##_dbs_gov.gdbs_data;           \
-       return sprintf(buf, "%u\n", dbs_data->file_name);               \
-}                                                                      \
-                                                                       \
-static ssize_t show_##file_name##_gov_pol                              \
-(struct cpufreq_policy *policy, char *buf)                             \
-{                                                                      \
-       struct policy_dbs_info *policy_dbs = policy->governor_data;     \
-       struct dbs_data *dbs_data = policy_dbs->dbs_data;               \
-       return sprintf(buf, "%u\n", dbs_data->file_name);               \
-}
-
-#define show_store_one_common(_gov, file_name)                         \
-show_one_common(_gov, file_name);                                      \
-store_one(_gov, file_name)
-
 /* create helper routines */
 #define define_get_cpu_dbs_routines(_dbs_info)                         \
 static struct cpu_dbs_info *get_cpu_cdbs(int cpu)                      \