Merge branch 'cpu_cooling-doc-comments-update' of .git into next

2 files changed, 37 insertions, 29 deletions

diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index a294921be650..c94bf2e5de62 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -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)
 {
@@ -75,6 +80,7 @@ static int get_idr(struct idr *idr, int *id)
         if (unlikely(ret < 0))
                 return ret;
         *id = ret;
+
         return 0;
 }
 
@@ -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);
 }
 
@@ -134,7 +141,8 @@ enum cpufreq_cooling_property {
  * Return: 0 on success, -EINVAL when invalid parameters are passed.
  */
 static int get_property(unsigned int cpu, unsigned long input,
-        unsigned int* output, enum cpufreq_cooling_property property)
+                        unsigned int *output,
+                        enum cpufreq_cooling_property property)
 {
         int i, j;
         unsigned long max_level = 0, level = 0;
@@ -142,14 +150,13 @@ static int get_property(unsigned int cpu, unsigned long input,
         int descend = -1;
         struct cpufreq_frequency_table *table =
                                         cpufreq_frequency_get_table(cpu);
-        
+
         if (!output)
                 return -EINVAL;
 
         if (!table)
                 return -EINVAL;
 
-        
         for (i = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
                 /* ignore invalid entries */
                 if (table[i].frequency == CPUFREQ_ENTRY_INVALID)
@@ -174,8 +181,7 @@ static int get_property(unsigned int cpu, unsigned long input,
         }
 
         if (property == GET_FREQ)
-                level = descend ? input : (max_level - input -1);
-
+                level = descend ? input : (max_level - input - 1);
 
         for (i = 0, j = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) {
                 /* ignore invalid entry */
@@ -201,6 +207,7 @@ static int get_property(unsigned int cpu, unsigned long input,
                 }
                 j++;
         }
+
         return -EINVAL;
 }
 
@@ -221,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);
@@ -245,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;
 }
 
@@ -261,7 +270,7 @@ static unsigned int get_cpu_frequency(unsigned int cpu, unsigned long level)
  * cooling state).
  */
 static int cpufreq_apply_cooling(struct cpufreq_cooling_device *cpufreq_device,
-                                unsigned long cooling_state)
+                                 unsigned long cooling_state)
 {
         unsigned int cpuid, clip_freq;
         struct cpumask *mask = &cpufreq_device->allowed_cpus;
@@ -303,7 +312,7 @@ static int cpufreq_apply_cooling(struct cpufreq_cooling_device *cpufreq_device,
  * Return: 0 (success)
  */
 static int cpufreq_thermal_notifier(struct notifier_block *nb,
-                                        unsigned long event, void *data)
+                                    unsigned long event, void *data)
 {
         struct cpufreq_policy *policy = data;
         unsigned long max_freq = 0;
@@ -314,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;
 
@@ -324,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.
@@ -373,6 +380,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;
 }
 
@@ -417,8 +425,8 @@ static struct notifier_block thermal_cpufreq_notifier_block = {
  * Return: a valid struct thermal_cooling_device pointer on success,
  * on failure, it returns a corresponding ERR_PTR().
  */
-struct thermal_cooling_device *cpufreq_cooling_register(
-        const struct cpumask *clip_cpus)
+struct thermal_cooling_device *
+cpufreq_cooling_register(const struct cpumask *clip_cpus)
 {
         struct thermal_cooling_device *cool_dev;
         struct cpufreq_cooling_device *cpufreq_dev = NULL;
@@ -427,9 +435,9 @@ struct thermal_cooling_device *cpufreq_cooling_register(
         int ret = 0, i;
         struct cpufreq_policy policy;