Skip to content

L
linux
Commit 0a829c5a authored by Dave Jones's avatar Dave Jones
Browse files
Options

[CPUFREQ] checkpatch cleanups for cpufreq_stats 

Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent 9acef487
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 39 deletions
drivers/cpufreq/cpufreq_stats.c
View file @ 0a829c5a
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
static spinlock_t cpufreq_stats_lock; static spinlock_t cpufreq_stats_lock;
#define CPUFREQ_STATDEVICE_ATTR(_name,_mode,_show) \ #define CPUFREQ_STATDEVICE_ATTR(_name, _mode, _show) \
static struct freq_attr _attr_##_name = {\ static struct freq_attr _attr_##_name = {\
.attr = {.name = __stringify(_name), .mode = _mode, }, \ .attr = {.name = __stringify(_name), .mode = _mode, }, \
.show = _show,\ .show = _show,\
...@@ -50,8 +50,7 @@ struct cpufreq_stats_attribute { ...@@ -50,8 +50,7 @@ struct cpufreq_stats_attribute {
ssize_t(*show) (struct cpufreq_stats *, char *); ssize_t(*show) (struct cpufreq_stats *, char *);
}; };
static int static int cpufreq_stats_update(unsigned int cpu)
cpufreq_stats_update (unsigned int cpu)
{ {
struct cpufreq_stats *stat; struct cpufreq_stats *stat;
unsigned long long cur_time; unsigned long long cur_time;
...@@ -68,8 +67,7 @@ cpufreq_stats_update (unsigned int cpu) ...@@ -68,8 +67,7 @@ cpufreq_stats_update (unsigned int cpu)
return 0; return 0;
} }
static ssize_t static ssize_t show_total_trans(struct cpufreq_policy *policy, char *buf)
show_total_trans(struct cpufreq_policy *policy, char *buf)
{ {
struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu); struct cpufreq_stats *stat = per_cpu(cpufreq_stats_table, policy->cpu);
if (!stat) if (!stat)
...@@ -78,8 +76,7 @@ show_total_trans(struct cpufreq_policy *policy, char *buf) ...@@ -78,8 +76,7 @@ show_total_trans(struct cpufreq_policy *policy, char *buf)
per_cpu(cpufreq_stats_table, stat->cpu)->total_trans); per_cpu(cpufreq_stats_table, stat->cpu)->total_trans);
} }
static ssize_t static ssize_t show_time_in_state(struct cpufreq_policy *policy, char *buf)
show_time_in_state(struct cpufreq_policy *policy, char *buf)
{ {
ssize_t len = 0; ssize_t len = 0;
int i; int i;
...@@ -89,14 +86,14 @@ show_time_in_state(struct cpufreq_policy *policy, char *buf) ...@@ -89,14 +86,14 @@ show_time_in_state(struct cpufreq_policy *policy, char *buf)
cpufreq_stats_update(stat->cpu); cpufreq_stats_update(stat->cpu);
for (i = 0; i < stat->state_num; i++) { for (i = 0; i < stat->state_num; i++) {
len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i], len += sprintf(buf + len, "%u %llu\n", stat->freq_table[i],
(unsigned long long)cputime64_to_clock_t(stat->time_in_state[i])); (unsigned long long)
cputime64_to_clock_t(stat->time_in_state[i]));
} }
return len; return len;
} }
#ifdef CONFIG_CPU_FREQ_STAT_DETAILS #ifdef CONFIG_CPU_FREQ_STAT_DETAILS
static ssize_t static ssize_t show_trans_table(struct cpufreq_policy *policy, char *buf)
show_trans_table(struct cpufreq_policy *policy, char *buf)
{ {
ssize_t len = 0; ssize_t len = 0;
int i, j; int i, j;
...@@ -139,11 +136,11 @@ show_trans_table(struct cpufreq_policy *policy, char *buf) ...@@ -139,11 +136,11 @@ show_trans_table(struct cpufreq_policy *policy, char *buf)
return PAGE_SIZE; return PAGE_SIZE;
return len; return len;
} }
CPUFREQ_STATDEVICE_ATTR(trans_table,0444,show_trans_table); CPUFREQ_STATDEVICE_ATTR(trans_table, 0444, show_trans_table);
#endif #endif
CPUFREQ_STATDEVICE_ATTR(total_trans,0444,show_total_trans); CPUFREQ_STATDEVICE_ATTR(total_trans, 0444, show_total_trans);
CPUFREQ_STATDEVICE_ATTR(time_in_state,0444,show_time_in_state); CPUFREQ_STATDEVICE_ATTR(time_in_state, 0444, show_time_in_state);
static struct attribute *default_attrs[] = { static struct attribute *default_attrs[] = {
&_attr_total_trans.attr, &_attr_total_trans.attr,
...@@ -158,8 +155,7 @@ static struct attribute_group stats_attr_group = { ...@@ -158,8 +155,7 @@ static struct attribute_group stats_attr_group = {
.name = "stats" .name = "stats"
}; };
static int static int freq_table_get_index(struct cpufreq_stats *stat, unsigned int freq)
freq_table_get_index(struct cpufreq_stats *stat, unsigned int freq)
{ {
int index; int index;
for (index = 0; index < stat->max_state; index++) for (index = 0; index < stat->max_state; index++)
...@@ -183,8 +179,7 @@ static void cpufreq_stats_free_table(unsigned int cpu) ...@@ -183,8 +179,7 @@ static void cpufreq_stats_free_table(unsigned int cpu)
cpufreq_cpu_put(policy); cpufreq_cpu_put(policy);
} }
static int static int cpufreq_stats_create_table(struct cpufreq_policy *policy,
cpufreq_stats_create_table (struct cpufreq_policy *policy,
struct cpufreq_frequency_table *table) struct cpufreq_frequency_table *table)
{ {
unsigned int i, j, count = 0, ret = 0; unsigned int i, j, count = 0, ret = 0;
...@@ -194,7 +189,8 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy, ...@@ -194,7 +189,8 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
unsigned int cpu = policy->cpu; unsigned int cpu = policy->cpu;
if (per_cpu(cpufreq_stats_table, cpu)) if (per_cpu(cpufreq_stats_table, cpu))
return -EBUSY; return -EBUSY;
if ((stat = kzalloc(sizeof(struct cpufreq_stats), GFP_KERNEL)) == NULL) stat = kzalloc(sizeof(struct cpufreq_stats), GFP_KERNEL);
if ((stat) == NULL)
return -ENOMEM; return -ENOMEM;
data = cpufreq_cpu_get(cpu); data = cpufreq_cpu_get(cpu);
...@@ -203,13 +199,14 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy, ...@@ -203,13 +199,14 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
goto error_get_fail; goto error_get_fail;
} }
if ((ret = sysfs_create_group(&data->kobj, &stats_attr_group))) ret = sysfs_create_group(&data->kobj, &stats_attr_group);
if (ret)
goto error_out; goto error_out;
stat->cpu = cpu; stat->cpu = cpu;
per_cpu(cpufreq_stats_table, cpu) = stat; per_cpu(cpufreq_stats_table, cpu) = stat;
for (i=0; table[i].frequency != CPUFREQ_TABLE_END; i++) { for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
unsigned int freq = table[i].frequency; unsigned int freq = table[i].frequency;
if (freq == CPUFREQ_ENTRY_INVALID) if (freq == CPUFREQ_ENTRY_INVALID)
continue; continue;
...@@ -255,9 +252,8 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy, ...@@ -255,9 +252,8 @@ cpufreq_stats_create_table (struct cpufreq_policy *policy,
return ret; return ret;
} }
static int static int cpufreq_stat_notifier_policy(struct notifier_block *nb,
cpufreq_stat_notifier_policy (struct notifier_block *nb, unsigned long val, unsigned long val, void *data)
void *data)
{ {
int ret; int ret;
struct cpufreq_policy *policy = data; struct cpufreq_policy *policy = data;
...@@ -268,14 +264,14 @@ cpufreq_stat_notifier_policy (struct notifier_block *nb, unsigned long val, ...@@ -268,14 +264,14 @@ cpufreq_stat_notifier_policy (struct notifier_block *nb, unsigned long val,
table = cpufreq_frequency_get_table(cpu); table = cpufreq_frequency_get_table(cpu);
if (!table) if (!table)
return 0; return 0;
if ((ret = cpufreq_stats_create_table(policy, table))) ret = cpufreq_stats_create_table(policy, table);
if (ret)
return ret; return ret;
return 0; return 0;
} }
static int static int cpufreq_stat_notifier_trans(struct notifier_block *nb,
cpufreq_stat_notifier_trans (struct notifier_block *nb, unsigned long val, unsigned long val, void *data)
void *data)
{ {
struct cpufreq_freqs *freq = data; struct cpufreq_freqs *freq = data;
struct cpufreq_stats *stat; struct cpufreq_stats *stat;
...@@ -340,19 +336,20 @@ static struct notifier_block notifier_trans_block = { ...@@ -340,19 +336,20 @@ static struct notifier_block notifier_trans_block = {
.notifier_call = cpufreq_stat_notifier_trans .notifier_call = cpufreq_stat_notifier_trans
}; };
static int static int __init cpufreq_stats_init(void)
__init cpufreq_stats_init(void)
{ {
int ret; int ret;
unsigned int cpu; unsigned int cpu;
spin_lock_init(&cpufreq_stats_lock); spin_lock_init(&cpufreq_stats_lock);
if ((ret = cpufreq_register_notifier(&notifier_policy_block, ret = cpufreq_register_notifier(&notifier_policy_block,
CPUFREQ_POLICY_NOTIFIER))) CPUFREQ_POLICY_NOTIFIER);
if (ret)
return ret; return ret;
if ((ret = cpufreq_register_notifier(&notifier_trans_block, ret = cpufreq_register_notifier(&notifier_trans_block,
CPUFREQ_TRANSITION_NOTIFIER))) { CPUFREQ_TRANSITION_NOTIFIER);
if (ret) {
cpufreq_unregister_notifier(&notifier_policy_block, cpufreq_unregister_notifier(&notifier_policy_block,
CPUFREQ_POLICY_NOTIFIER); CPUFREQ_POLICY_NOTIFIER);
return ret; return ret;
...@@ -364,8 +361,7 @@ __init cpufreq_stats_init(void) ...@@ -364,8 +361,7 @@ __init cpufreq_stats_init(void)
} }
return 0; return 0;
} }
static void static void __exit cpufreq_stats_exit(void)
__exit cpufreq_stats_exit(void)
{ {
unsigned int cpu; unsigned int cpu;
...@@ -379,10 +375,10 @@ __exit cpufreq_stats_exit(void) ...@@ -379,10 +375,10 @@ __exit cpufreq_stats_exit(void)
} }
} }
MODULE_AUTHOR ("Zou Nan hai <nanhai.zou@intel.com>"); MODULE_AUTHOR("Zou Nan hai <nanhai.zou@intel.com>");
MODULE_DESCRIPTION ("'cpufreq_stats' - A driver to export cpufreq stats " MODULE_DESCRIPTION("'cpufreq_stats' - A driver to export cpufreq stats "
"through sysfs filesystem"); "through sysfs filesystem");
MODULE_LICENSE ("GPL"); MODULE_LICENSE("GPL");
module_init(cpufreq_stats_init); module_init(cpufreq_stats_init);
module_exit(cpufreq_stats_exit); module_exit(cpufreq_stats_exit);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7