Skip to content

Commit b2cc9f9

Browse files
Tero Kristoij-intel
authored andcommitted
platform/x86/intel-uncore-freq: Rename the sysfs helper macro names
The macros to create sysfs entries are going to be used for other attributes in addition to current min/max frequencies only, so rename these to be more generic. No functional change intended. Signed-off-by: Tero Kristo <[email protected]> Acked-by: Srinivas Pandruvada <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Ilpo Järvinen <[email protected]> Signed-off-by: Ilpo Järvinen <[email protected]>
1 parent d766abf commit b2cc9f9

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ static ssize_t show_package_id(struct kobject *kobj, struct kobj_attribute *attr
4343
return sprintf(buf, "%u\n", data->package_id);
4444
}
4545

46-
static ssize_t show_min_max_freq_khz(struct uncore_data *data,
47-
char *buf, enum uncore_index index)
46+
static ssize_t show_attr(struct uncore_data *data, char *buf, enum uncore_index index)
4847
{
4948
unsigned int value;
5049
int ret;
@@ -58,9 +57,8 @@ static ssize_t show_min_max_freq_khz(struct uncore_data *data,
5857
return sprintf(buf, "%u\n", value);
5958
}
6059

61-
static ssize_t store_min_max_freq_khz(struct uncore_data *data,
62-
const char *buf, ssize_t count,
63-
enum uncore_index index)
60+
static ssize_t store_attr(struct uncore_data *data, const char *buf, ssize_t count,
61+
enum uncore_index index)
6462
{
6563
unsigned int input;
6664
int ret;
@@ -92,24 +90,23 @@ static ssize_t show_perf_status_freq_khz(struct uncore_data *data, char *buf)
9290
return sprintf(buf, "%u\n", freq);
9391
}
9492

95-
#define store_uncore_min_max(name, min_max) \
93+
#define store_uncore_attr(name, index) \
9694
static ssize_t store_##name(struct kobject *kobj, \
9795
struct kobj_attribute *attr, \
9896
const char *buf, size_t count) \
9997
{ \
10098
struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\
10199
\
102-
return store_min_max_freq_khz(data, buf, count, \
103-
min_max); \
100+
return store_attr(data, buf, count, index); \
104101
}
105102

106-
#define show_uncore_min_max(name, min_max) \
103+
#define show_uncore_attr(name, index) \
107104
static ssize_t show_##name(struct kobject *kobj, \
108105
struct kobj_attribute *attr, char *buf)\
109106
{ \
110107
struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\
111108
\
112-
return show_min_max_freq_khz(data, buf, min_max); \
109+
return show_attr(data, buf, index); \
113110
}
114111

115112
#define show_uncore_perf_status(name) \
@@ -121,11 +118,11 @@ static ssize_t show_perf_status_freq_khz(struct uncore_data *data, char *buf)
121118
return show_perf_status_freq_khz(data, buf); \
122119
}
123120

124-
store_uncore_min_max(min_freq_khz, UNCORE_INDEX_MIN_FREQ);
125-
store_uncore_min_max(max_freq_khz, UNCORE_INDEX_MAX_FREQ);
121+
store_uncore_attr(min_freq_khz, UNCORE_INDEX_MIN_FREQ);
122+
store_uncore_attr(max_freq_khz, UNCORE_INDEX_MAX_FREQ);
126123

127-
show_uncore_min_max(min_freq_khz, UNCORE_INDEX_MIN_FREQ);
128-
show_uncore_min_max(max_freq_khz, UNCORE_INDEX_MAX_FREQ);
124+
show_uncore_attr(min_freq_khz, UNCORE_INDEX_MIN_FREQ);
125+
show_uncore_attr(max_freq_khz, UNCORE_INDEX_MAX_FREQ);
129126

130127
show_uncore_perf_status(current_freq_khz);
131128

0 commit comments

Comments
 (0)