| Message ID | 20220310143830.4677-1-zhanglianjie@uniontech.com (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | [v3] cpufreq: unify the show() and store() styles of attr and use __ATTR_XX macro | expand |
On Thu, Mar 10, 2022 at 3:38 PM Lianjie Zhang <zhanglianjie@uniontech.com> wrote: > > Usually /sys directory under the file, the corresponding Attribute > contains .show and .store, and their naming style is filename_show() and > filename_store(). But all naming style in 'cpufreq' is show_filename() > and store_filename(), resulting in __ATTR_RW() and __ATTR_RO() macros > cannot be used to simplify code, So need to change naming style. > Use helper macro __ATTR_XX to make code more clear. > > Signed-off-by: Lianjie Zhang <zhanglianjie@uniontech.com> > > diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c > index 08515f7e515f..b6bd0ff35323 100644 > --- a/drivers/cpufreq/cpufreq_conservative.c > +++ b/drivers/cpufreq/cpufreq_conservative.c > @@ -146,7 +146,7 @@ static unsigned int cs_dbs_update(struct cpufreq_policy *policy) > > /************************** sysfs interface ************************/ > > -static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, > +static ssize_t sampling_down_factor_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -161,7 +161,7 @@ static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, > return count; > } > > -static ssize_t store_up_threshold(struct gov_attr_set *attr_set, > +static ssize_t up_threshold_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -177,7 +177,7 @@ static ssize_t store_up_threshold(struct gov_attr_set *attr_set, > return count; > } > > -static ssize_t store_down_threshold(struct gov_attr_set *attr_set, > +static ssize_t down_threshold_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -195,7 +195,7 @@ static ssize_t store_down_threshold(struct gov_attr_set *attr_set, > return count; > } > > -static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, > +static ssize_t ignore_nice_load_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -220,7 +220,7 @@ static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, > return count; > } > > -static ssize_t store_freq_step(struct gov_attr_set *attr_set, const char *buf, > +static ssize_t freq_step_store(struct gov_attr_set *attr_set, const char *buf, > size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c > index 63f7c219062b..0d42cf8b88d8 100644 > --- a/drivers/cpufreq/cpufreq_governor.c > +++ b/drivers/cpufreq/cpufreq_governor.c > @@ -27,7 +27,7 @@ static DEFINE_MUTEX(gov_dbs_data_mutex); > > /* Common sysfs tunables */ > /* > - * store_sampling_rate - update sampling rate effective immediately if needed. > + * sampling_rate_store - update sampling rate effective immediately if needed. > * > * If new rate is smaller than the old, simply updating > * dbs.sampling_rate might not be appropriate. For example, if the > @@ -41,7 +41,7 @@ static DEFINE_MUTEX(gov_dbs_data_mutex); > * This must be called with dbs_data->mutex held, otherwise traversing > * policy_dbs_list isn't safe. > */ > -ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, > +ssize_t sampling_rate_store(struct gov_attr_set *attr_set, const char *buf, > size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -80,7 +80,7 @@ ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, > > return count; > } > -EXPORT_SYMBOL_GPL(store_sampling_rate); > +EXPORT_SYMBOL_GPL(sampling_rate_store); > > /** > * gov_update_cpu_data - Update CPU load data. > diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h > index bab8e6140377..a5a0bc3cc23e 100644 > --- a/drivers/cpufreq/cpufreq_governor.h > +++ b/drivers/cpufreq/cpufreq_governor.h > @@ -51,7 +51,7 @@ static inline struct dbs_data *to_dbs_data(struct gov_attr_set *attr_set) > } > > #define gov_show_one(_gov, file_name) \ > -static ssize_t show_##file_name \ > +static ssize_t file_name##_show \ > (struct gov_attr_set *attr_set, char *buf) \ > { \ > struct dbs_data *dbs_data = to_dbs_data(attr_set); \ > @@ -60,7 +60,7 @@ static ssize_t show_##file_name \ > } > > #define gov_show_one_common(file_name) \ > -static ssize_t show_##file_name \ > +static ssize_t file_name##_show \ > (struct gov_attr_set *attr_set, char *buf) \ > { \ > struct dbs_data *dbs_data = to_dbs_data(attr_set); \ > @@ -68,12 +68,10 @@ static ssize_t show_##file_name \ > } > > #define gov_attr_ro(_name) \ > -static struct governor_attr _name = \ > -__ATTR(_name, 0444, show_##_name, NULL) > +static struct governor_attr _name = __ATTR_RO(_name) > > #define gov_attr_rw(_name) \ > -static struct governor_attr _name = \ > -__ATTR(_name, 0644, show_##_name, store_##_name) > +static struct governor_attr _name = __ATTR_RW(_name) > > /* Common to all CPUs of a policy */ > struct policy_dbs_info { > @@ -176,7 +174,7 @@ void od_register_powersave_bias_handler(unsigned int (*f) > (struct cpufreq_policy *, unsigned int, unsigned int), > unsigned int powersave_bias); > void od_unregister_powersave_bias_handler(void); > -ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, > +ssize_t sampling_rate_store(struct gov_attr_set *attr_set, const char *buf, > size_t count); > void gov_update_cpu_data(struct dbs_data *dbs_data); > #endif /* _CPUFREQ_GOVERNOR_H */ > diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c > index 6a41ea4729b8..e8fbf970ff07 100644 > --- a/drivers/cpufreq/cpufreq_ondemand.c > +++ b/drivers/cpufreq/cpufreq_ondemand.c > @@ -202,7 +202,7 @@ static unsigned int od_dbs_update(struct cpufreq_policy *policy) > /************************** sysfs interface ************************/ > static struct dbs_governor od_dbs_gov; > > -static ssize_t store_io_is_busy(struct gov_attr_set *attr_set, const char *buf, > +static ssize_t io_is_busy_store(struct gov_attr_set *attr_set, const char *buf, > size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -220,7 +220,7 @@ static ssize_t store_io_is_busy(struct gov_attr_set *attr_set, const char *buf, > return count; > } > > -static ssize_t store_up_threshold(struct gov_attr_set *attr_set, > +static ssize_t up_threshold_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -237,7 +237,7 @@ static ssize_t store_up_threshold(struct gov_attr_set *attr_set, > return count; > } > > -static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, > +static ssize_t sampling_down_factor_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -265,7 +265,7 @@ static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, > return count; > } > > -static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, > +static ssize_t ignore_nice_load_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > @@ -290,7 +290,7 @@ static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, > return count; > } > > -static ssize_t store_powersave_bias(struct gov_attr_set *attr_set, > +static ssize_t powersave_bias_store(struct gov_attr_set *attr_set, > const char *buf, size_t count) > { > struct dbs_data *dbs_data = to_dbs_data(attr_set); > -- Applied as 5.18 material with some edits in the subject and changelog. Thanks!
diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 08515f7e515f..b6bd0ff35323 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -146,7 +146,7 @@ static unsigned int cs_dbs_update(struct cpufreq_policy *policy) /************************** sysfs interface ************************/ -static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, +static ssize_t sampling_down_factor_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -161,7 +161,7 @@ static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, return count; } -static ssize_t store_up_threshold(struct gov_attr_set *attr_set, +static ssize_t up_threshold_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -177,7 +177,7 @@ static ssize_t store_up_threshold(struct gov_attr_set *attr_set, return count; } -static ssize_t store_down_threshold(struct gov_attr_set *attr_set, +static ssize_t down_threshold_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -195,7 +195,7 @@ static ssize_t store_down_threshold(struct gov_attr_set *attr_set, return count; } -static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, +static ssize_t ignore_nice_load_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -220,7 +220,7 @@ static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, return count; } -static ssize_t store_freq_step(struct gov_attr_set *attr_set, const char *buf, +static ssize_t freq_step_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c index 63f7c219062b..0d42cf8b88d8 100644 --- a/drivers/cpufreq/cpufreq_governor.c +++ b/drivers/cpufreq/cpufreq_governor.c @@ -27,7 +27,7 @@ static DEFINE_MUTEX(gov_dbs_data_mutex); /* Common sysfs tunables */ /* - * store_sampling_rate - update sampling rate effective immediately if needed. + * sampling_rate_store - update sampling rate effective immediately if needed. * * If new rate is smaller than the old, simply updating * dbs.sampling_rate might not be appropriate. For example, if the @@ -41,7 +41,7 @@ static DEFINE_MUTEX(gov_dbs_data_mutex); * This must be called with dbs_data->mutex held, otherwise traversing * policy_dbs_list isn't safe. */ -ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, +ssize_t sampling_rate_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -80,7 +80,7 @@ ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, return count; } -EXPORT_SYMBOL_GPL(store_sampling_rate); +EXPORT_SYMBOL_GPL(sampling_rate_store); /** * gov_update_cpu_data - Update CPU load data. diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h index bab8e6140377..a5a0bc3cc23e 100644 --- a/drivers/cpufreq/cpufreq_governor.h +++ b/drivers/cpufreq/cpufreq_governor.h @@ -51,7 +51,7 @@ static inline struct dbs_data *to_dbs_data(struct gov_attr_set *attr_set) } #define gov_show_one(_gov, file_name) \ -static ssize_t show_##file_name \ +static ssize_t file_name##_show \ (struct gov_attr_set *attr_set, char *buf) \ { \ struct dbs_data *dbs_data = to_dbs_data(attr_set); \ @@ -60,7 +60,7 @@ static ssize_t show_##file_name \ } #define gov_show_one_common(file_name) \ -static ssize_t show_##file_name \ +static ssize_t file_name##_show \ (struct gov_attr_set *attr_set, char *buf) \ { \ struct dbs_data *dbs_data = to_dbs_data(attr_set); \ @@ -68,12 +68,10 @@ static ssize_t show_##file_name \ } #define gov_attr_ro(_name) \ -static struct governor_attr _name = \ -__ATTR(_name, 0444, show_##_name, NULL) +static struct governor_attr _name = __ATTR_RO(_name) #define gov_attr_rw(_name) \ -static struct governor_attr _name = \ -__ATTR(_name, 0644, show_##_name, store_##_name) +static struct governor_attr _name = __ATTR_RW(_name) /* Common to all CPUs of a policy */ struct policy_dbs_info { @@ -176,7 +174,7 @@ void od_register_powersave_bias_handler(unsigned int (*f) (struct cpufreq_policy *, unsigned int, unsigned int), unsigned int powersave_bias); void od_unregister_powersave_bias_handler(void); -ssize_t store_sampling_rate(struct gov_attr_set *attr_set, const char *buf, +ssize_t sampling_rate_store(struct gov_attr_set *attr_set, const char *buf, size_t count); void gov_update_cpu_data(struct dbs_data *dbs_data); #endif /* _CPUFREQ_GOVERNOR_H */ diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 6a41ea4729b8..e8fbf970ff07 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -202,7 +202,7 @@ static unsigned int od_dbs_update(struct cpufreq_policy *policy) /************************** sysfs interface ************************/ static struct dbs_governor od_dbs_gov; -static ssize_t store_io_is_busy(struct gov_attr_set *attr_set, const char *buf, +static ssize_t io_is_busy_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -220,7 +220,7 @@ static ssize_t store_io_is_busy(struct gov_attr_set *attr_set, const char *buf, return count; } -static ssize_t store_up_threshold(struct gov_attr_set *attr_set, +static ssize_t up_threshold_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -237,7 +237,7 @@ static ssize_t store_up_threshold(struct gov_attr_set *attr_set, return count; } -static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, +static ssize_t sampling_down_factor_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -265,7 +265,7 @@ static ssize_t store_sampling_down_factor(struct gov_attr_set *attr_set, return count; } -static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, +static ssize_t ignore_nice_load_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set); @@ -290,7 +290,7 @@ static ssize_t store_ignore_nice_load(struct gov_attr_set *attr_set, return count; } -static ssize_t store_powersave_bias(struct gov_attr_set *attr_set, +static ssize_t powersave_bias_store(struct gov_attr_set *attr_set, const char *buf, size_t count) { struct dbs_data *dbs_data = to_dbs_data(attr_set);
Usually /sys directory under the file, the corresponding Attribute contains .show and .store, and their naming style is filename_show() and filename_store(). But all naming style in 'cpufreq' is show_filename() and store_filename(), resulting in __ATTR_RW() and __ATTR_RO() macros cannot be used to simplify code, So need to change naming style. Use helper macro __ATTR_XX to make code more clear. Signed-off-by: Lianjie Zhang <zhanglianjie@uniontech.com> -- 2.20.1