Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 374602
b: refs/heads/master
c: 79491e5
h: refs/heads/master
v: v3
  • Loading branch information
Eduardo Valentin authored and Zhang Rui committed Apr 27, 2013
1 parent ad07b9e commit d781554
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 79d264016ac011b74497b553022d2fc45bf9d9f2
refs/heads/master: 79491e53dcd73175473e3293a574f5e006b468be
12 changes: 12 additions & 0 deletions trunk/drivers/thermal/cpu_cooling.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ static struct cpufreq_cooling_device *notify_device;
* get_idr - function to get a unique id.
* @idr: struct idr * handle used to create a id.
* @id: int * value generated by this function.
*
* This function will populate @id with an unique
* id, using the idr API.
*
* Return: 0 on success, an error code on failure.
*/
static int get_idr(struct idr *idr, int *id)
{
Expand All @@ -75,6 +80,7 @@ static int get_idr(struct idr *idr, int *id)
if (unlikely(ret < 0))
return ret;
*id = ret;

return 0;
}

Expand Down Expand Up @@ -105,6 +111,7 @@ static void release_idr(struct idr *idr, int id)
static int is_cpufreq_valid(int cpu)
{
struct cpufreq_policy policy;

return !cpufreq_get_policy(&policy, cpu);
}

Expand Down Expand Up @@ -200,6 +207,7 @@ static int get_property(unsigned int cpu, unsigned long input,
}
j++;
}

return -EINVAL;
}

Expand All @@ -220,6 +228,7 @@ unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq)

if (get_property(cpu, (unsigned long)freq, &val, GET_LEVEL))
return THERMAL_CSTATE_INVALID;

return (unsigned long)val;
}
EXPORT_SYMBOL_GPL(cpufreq_cooling_get_level);
Expand All @@ -244,6 +253,7 @@ static unsigned int get_cpu_frequency(unsigned int cpu, unsigned long level)
ret = get_property(cpu, level, &freq, GET_FREQ);
if (ret)
return 0;

return freq;
}

Expand Down Expand Up @@ -372,6 +382,7 @@ static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev,
struct cpufreq_cooling_device *cpufreq_device = cdev->devdata;

*state = cpufreq_device->cpufreq_state;

return 0;
}

Expand Down Expand Up @@ -474,6 +485,7 @@ struct thermal_cooling_device *cpufreq_cooling_register(
cpufreq_dev_count++;

mutex_unlock(&cooling_cpufreq_lock);

return cool_dev;
}
EXPORT_SYMBOL_GPL(cpufreq_cooling_register);
Expand Down

0 comments on commit d781554

Please sign in to comment.