1 files changed, 69 insertions, 84 deletions

diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c
index 12bd980a12e9..37528c3b64b0 100644
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
@@ -43,20 +43,16 @@
 #define ACPI_PROCESSOR_CLASS            "processor"
 #define ACPI_PROCESSOR_DRIVER_NAME      "ACPI Processor Driver"
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
-ACPI_MODULE_NAME                ("acpi_processor")
-
+ACPI_MODULE_NAME("acpi_processor")
 
 /* --------------------------------------------------------------------------
                                  Limit Interface
    -------------------------------------------------------------------------- */
-
-static int
-acpi_processor_apply_limit (
-        struct acpi_processor*  pr)
+static int acpi_processor_apply_limit(struct acpi_processor *pr)
 {
-        int                     result = 0;
-        u16                     px = 0;
-        u16                     tx = 0;
+        int result = 0;
+        u16 px = 0;
+        u16 tx = 0;
 
         ACPI_FUNCTION_TRACE("acpi_processor_apply_limit");
 
@@ -80,19 +76,17 @@ acpi_processor_apply_limit (
         pr->limit.state.px = px;
         pr->limit.state.tx = tx;
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Processor [%d] limit set to (P%d:T%d)\n",
-                pr->id,
-                pr->limit.state.px,
-                pr->limit.state.tx));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
+                          "Processor [%d] limit set to (P%d:T%d)\n", pr->id,
+                          pr->limit.state.px, pr->limit.state.tx));
 
-end:
+      end:
         if (result)
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Unable to set limit\n"));
 
         return_VALUE(result);
 }
 
-
 #ifdef CONFIG_CPU_FREQ
 
 /* If a passive cooling situation is detected, primarily CPUfreq is used, as it
@@ -104,7 +98,6 @@ end:
 static unsigned int cpufreq_thermal_reduction_pctg[NR_CPUS];
 static unsigned int acpi_thermal_cpufreq_is_init = 0;
 
-
 static int cpu_has_cpufreq(unsigned int cpu)
 {
         struct cpufreq_policy policy;
@@ -115,7 +108,6 @@ static int cpu_has_cpufreq(unsigned int cpu)
         return 0;
 }
 
-
 static int acpi_thermal_cpufreq_increase(unsigned int cpu)
 {
         if (!cpu_has_cpufreq(cpu))
@@ -130,7 +122,6 @@ static int acpi_thermal_cpufreq_increase(unsigned int cpu)
         return -ERANGE;
 }
 
-
 static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
 {
         if (!cpu_has_cpufreq(cpu))
@@ -145,11 +136,8 @@ static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
         return -ERANGE;
 }
 
-
-static int acpi_thermal_cpufreq_notifier(
-        struct notifier_block *nb,
-        unsigned long event,
-        void *data)
+static int acpi_thermal_cpufreq_notifier(struct notifier_block *nb,
+                                         unsigned long event, void *data)
 {
         struct cpufreq_policy *policy = data;
         unsigned long max_freq = 0;
@@ -157,68 +145,74 @@ static int acpi_thermal_cpufreq_notifier(
         if (event != CPUFREQ_ADJUST)
                 goto out;
 
-        max_freq = (policy->cpuinfo.max_freq * (100 - cpufreq_thermal_reduction_pctg[policy->cpu])) / 100;
+        max_freq =
+            (policy->cpuinfo.max_freq *
+             (100 - cpufreq_thermal_reduction_pctg[policy->cpu])) / 100;
 
         cpufreq_verify_within_limits(policy, 0, max_freq);
 
- out:
+      out:
         return 0;
 }
 
-
 static struct notifier_block acpi_thermal_cpufreq_notifier_block = {
         .notifier_call = acpi_thermal_cpufreq_notifier,
 };
 
-
-void acpi_thermal_cpufreq_init(void) {
+void acpi_thermal_cpufreq_init(void)
+{
         int i;
 
-        for (i=0; i<NR_CPUS; i++)
+        for (i = 0; i < NR_CPUS; i++)
                 cpufreq_thermal_reduction_pctg[i] = 0;
 
-        i = cpufreq_register_notifier(&acpi_thermal_cpufreq_notifier_block, CPUFREQ_POLICY_NOTIFIER);
+        i = cpufreq_register_notifier(&acpi_thermal_cpufreq_notifier_block,
+                                      CPUFREQ_POLICY_NOTIFIER);
         if (!i)
                 acpi_thermal_cpufreq_is_init = 1;
 }
 
-void acpi_thermal_cpufreq_exit(void) {
+void acpi_thermal_cpufreq_exit(void)
+{
         if (acpi_thermal_cpufreq_is_init)
-                cpufreq_unregister_notifier(&acpi_thermal_cpufreq_notifier_block, CPUFREQ_POLICY_NOTIFIER);
+                cpufreq_unregister_notifier
+                    (&acpi_thermal_cpufreq_notifier_block,
+                     CPUFREQ_POLICY_NOTIFIER);
 
         acpi_thermal_cpufreq_is_init = 0;
 }
 
-#else /* ! CONFIG_CPU_FREQ */
-
-static int acpi_thermal_cpufreq_increase(unsigned int cpu) { return -ENODEV; }
-static int acpi_thermal_cpufreq_decrease(unsigned int cpu) { return -ENODEV; }
+#else                           /* ! CONFIG_CPU_FREQ */
 
+static int acpi_thermal_cpufreq_increase(unsigned int cpu)
+{
+        return -ENODEV;
+}
+static int acpi_thermal_cpufreq_decrease(unsigned int cpu)
+{
+        return -ENODEV;
+}
 
 #endif
 
-
-int
-acpi_processor_set_thermal_limit (
-        acpi_handle             handle,
-        int                     type)
+int acpi_processor_set_thermal_limit(acpi_handle handle, int type)
 {
-        int                     result = 0;
-        struct acpi_processor   *pr = NULL;
-        struct acpi_device      *device = NULL;
-        int                     tx = 0;
+        int result = 0;
+        struct acpi_processor *pr = NULL;
+        struct acpi_device *device = NULL;
+        int tx = 0;
 
         ACPI_FUNCTION_TRACE("acpi_processor_set_thermal_limit");
 
         if ((type < ACPI_PROCESSOR_LIMIT_NONE)
-                || (type > ACPI_PROCESSOR_LIMIT_DECREMENT))
+            || (type > ACPI_PROCESSOR_LIMIT_DECREMENT))
                 return_VALUE(-EINVAL);
 
         result = acpi_bus_get_device(handle, &device);
         if (result)
                 return_VALUE(result);
 
-        pr = (struct acpi_processor *) acpi_driver_data(device);
+        pr = (struct acpi_processor *)acpi_driver_data(device);
         if (!pr)
                 return_VALUE(-ENODEV);
 
@@ -250,12 +244,12 @@ acpi_processor_set_thermal_limit (
                         goto end;
                 else if (result == -ERANGE)
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                        "At maximum performance state\n"));
+                                          "At maximum performance state\n"));
 
                 if (pr->flags.throttling) {
                         if (tx == (pr->throttling.state_count - 1))
                                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                        "At maximum throttling state\n"));
+                                                  "At maximum throttling state\n"));
                         else
                                 tx++;
                 }
@@ -267,7 +261,7 @@ acpi_processor_set_thermal_limit (
                 if (pr->flags.throttling) {
                         if (tx == 0)
                                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                        "At minimum throttling state\n"));
+                                                  "At minimum throttling state\n"));
                         else {
                                 tx--;
                                 goto end;
@@ -277,12 +271,12 @@ acpi_processor_set_thermal_limit (
                 result = acpi_thermal_cpufreq_decrease(pr->id);
                 if (result == -ERANGE)
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                        "At minimum performance state\n"));
+                                          "At minimum performance state\n"));
 
                 break;
         }
 
-end:
+      end:
         if (pr->flags.throttling) {
                 pr->limit.thermal.px = 0;
                 pr->limit.thermal.tx = tx;
@@ -293,18 +287,14 @@ end:
                                           "Unable to set thermal limit\n"));
 
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Thermal limit now (P%d:T%d)\n",
-                                  pr->limit.thermal.px,
-                                  pr->limit.thermal.tx));
+                                  pr->limit.thermal.px, pr->limit.thermal.tx));
         } else
                 result = 0;
 
         return_VALUE(result);
 }
 
-
-int
-acpi_processor_get_limit_info (
-        struct acpi_processor   *pr)
+int acpi_processor_get_limit_info(struct acpi_processor *pr)
 {
         ACPI_FUNCTION_TRACE("acpi_processor_get_limit_info");
 
@@ -317,12 +307,11 @@ acpi_processor_get_limit_info (
         return_VALUE(0);
 }
 
-
 /* /proc interface */
 
 static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor   *pr = (struct acpi_processor *)seq->private;
+        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
 
         ACPI_FUNCTION_TRACE("acpi_processor_limit_seq_show");
 
@@ -335,34 +324,32 @@ static int acpi_processor_limit_seq_show(struct seq_file *seq, void *offset)
         }
 
         seq_printf(seq, "active limit:            P%d:T%d\n"
-                        "user limit:              P%d:T%d\n"
-                        "thermal limit:           P%d:T%d\n",
-                        pr->limit.state.px, pr->limit.state.tx,
-                        pr->limit.user.px, pr->limit.user.tx,
-                        pr->limit.thermal.px, pr->limit.thermal.tx);
+                   "user limit:              P%d:T%d\n"
+                   "thermal limit:           P%d:T%d\n",
+                   pr->limit.state.px, pr->limit.state.tx,
+                   pr->limit.user.px, pr->limit.user.tx,
+                   pr->limit.thermal.px, pr->limit.thermal.tx);
 
-end:
+      end:
         return_VALUE(0);
 }
 
 static int acpi_processor_limit_open_fs(struct inode *inode, struct file *file)
 {
         return single_open(file, acpi_processor_limit_seq_show,
-                                                PDE(inode)->data);
+                           PDE(inode)->data);
 }
 
-ssize_t acpi_processor_write_limit (
-        struct file             *file,
-        const char              __user *buffer,
-        size_t                  count,
-        loff_t                  *data)
+ssize_t acpi_processor_write_limit(struct file * file,
+                                   const char __user * buffer,
+                                   size_t count, loff_t * data)
 {
-        int                     result = 0;
-        struct seq_file         *m = (struct seq_file *)file->private_data;
-        struct acpi_processor   *pr = (struct acpi_processor *)m->private;
-        char                    limit_string[25] = {'\0'};
-        int                     px = 0;
-        int                     tx = 0;
+        int result = 0;
+        struct seq_file *m = (struct seq_file *)file->private_data;
+        struct acpi_processor *pr = (struct acpi_processor *)m->private;
+        char limit_string[25] = { '\0' };
+        int px = 0;
+        int tx = 0;
 
         ACPI_FUNCTION_TRACE("acpi_processor_write_limit");
 
@@ -396,11 +383,9 @@ ssize_t acpi_processor_write_limit (
         return_VALUE(count);
 }
 
-
 struct file_operations acpi_processor_limit_fops = {
-        .open           = acpi_processor_limit_open_fs,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
+        .open = acpi_processor_limit_open_fs,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
-