Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 374603
b: refs/heads/master
c: 1b9e352
h: refs/heads/master
i:
  374601: ad07b9e
  374599: f934331
v: v3
  • Loading branch information
Eduardo Valentin authored and Zhang Rui committed Apr 27, 2013
1 parent d781554 commit 06ff3dd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79491e53dcd73175473e3293a574f5e006b468be
refs/heads/master: 1b9e35265903c2e0e484dc224e8f7de506e3353f
10 changes: 4 additions & 6 deletions trunk/drivers/thermal/cpu_cooling.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb,
if (cpumask_test_cpu(policy->cpu, &notify_device->allowed_cpus))
max_freq = notify_device->cpufreq_val;

/* Never exceed user_policy.max*/
/* Never exceed user_policy.max */
if (max_freq > policy->user_policy.max)
max_freq = policy->user_policy.max;

Expand All @@ -333,9 +333,7 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb,
return 0;
}

/*
* cpufreq cooling device callback functions are defined below
*/
/* cpufreq cooling device callback functions are defined below */

/**
* cpufreq_get_max_state - callback function to get the max cooling state.
Expand Down Expand Up @@ -437,9 +435,9 @@ struct thermal_cooling_device *cpufreq_cooling_register(
int ret = 0, i;
struct cpufreq_policy policy;

/*Verify that all the clip cpus have same freq_min, freq_max limit*/
/* Verify that all the clip cpus have same freq_min, freq_max limit */
for_each_cpu(i, clip_cpus) {
/*continue if cpufreq policy not found and not return error*/
/* continue if cpufreq policy not found and not return error */
if (!cpufreq_get_policy(&policy, i))
continue;
if (min == 0 && max == 0) {
Expand Down

0 comments on commit 06ff3dd

Please sign in to comment.