2 files changed, 79 insertions, 68 deletions

diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c
index 1bae2e42a7..3a2e9a6018 100644
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
@@ -44,18 +44,18 @@
 #define _COMPONENT              ACPI_PROCESSOR_COMPONENT
 ACPI_MODULE_NAME("processor_throttling");
 
-static int acpi_processor_get_throttling (struct acpi_processor *pr);
-int acpi_processor_set_throttling (struct acpi_processor *pr, int state);
+static int acpi_processor_get_throttling(struct acpi_processor *pr);
+int acpi_processor_set_throttling(struct acpi_processor *pr, int state);
 
 static int acpi_processor_get_platform_limit(struct acpi_processor *pr)
 {
         acpi_status status = 0;
         unsigned long tpc = 0;
 
-        if(!pr) 
+        if (!pr)
                 return -EINVAL;
         status = acpi_evaluate_integer(pr->handle, "_TPC", NULL, &tpc);
-        if(ACPI_FAILURE(status) && status != AE_NOT_FOUND){
+        if (ACPI_FAILURE(status) && status != AE_NOT_FOUND) {
                 ACPI_EXCEPTION((AE_INFO, status, "Evaluating _TPC"));
                 return -ENODEV;
         }
@@ -102,7 +102,8 @@ static int acpi_processor_get_throttling_control(struct acpi_processor *pr)
         if ((obj.type != ACPI_TYPE_BUFFER)
             || (obj.buffer.length < sizeof(struct acpi_ptc_register))
             || (obj.buffer.pointer == NULL)) {
-                printk(KERN_ERR PREFIX "Invalid _PTC data (control_register)\n");
+                printk(KERN_ERR PREFIX
+                       "Invalid _PTC data (control_register)\n");
                 result = -EFAULT;
                 goto end;
         }
@@ -124,9 +125,9 @@ static int acpi_processor_get_throttling_control(struct acpi_processor *pr)
         }
 
         memcpy(&pr->throttling.status_register, obj.buffer.pointer,
-                sizeof(struct acpi_ptc_register));
+               sizeof(struct acpi_ptc_register));
 
-        end:
+      end:
         kfree(buffer.pointer);
 
         return result;
@@ -168,7 +169,9 @@ static int acpi_processor_get_throttling_states(struct acpi_processor *pr)
 
         for (i = 0; i < pr->throttling.state_count; i++) {
 
-                struct acpi_processor_tx_tss *tx = (struct acpi_processor_tx_tss *) &(pr->throttling.states_tss[i]);
+                struct acpi_processor_tx_tss *tx =
+                    (struct acpi_processor_tx_tss *)&(pr->throttling.
+                                                      states_tss[i]);
 
                 state.length = sizeof(struct acpi_processor_tx_tss);
                 state.pointer = tx;
@@ -186,7 +189,7 @@ static int acpi_processor_get_throttling_states(struct acpi_processor *pr)
 
                 if (!tx->freqpercentage) {
                         printk(KERN_ERR PREFIX
-                                    "Invalid _TSS data: freq is zero\n");
+                               "Invalid _TSS data: freq is zero\n");
                         result = -EFAULT;
                         kfree(pr->throttling.states_tss);
                         goto end;
@@ -198,14 +201,14 @@ static int acpi_processor_get_throttling_states(struct acpi_processor *pr)
 
         return result;
 }
-static int acpi_processor_get_tsd(struct acpi_processor *pr)
+static int acpi_processor_get_tsd(struct acpi_processor *pr)
 {
         int result = 0;
         acpi_status status = AE_OK;
-        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-        struct acpi_buffer format = {sizeof("NNNNN"), "NNNNN"};
-        struct acpi_buffer state = {0, NULL};
-        union acpi_object  *tsd = NULL;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        struct acpi_buffer format = { sizeof("NNNNN"), "NNNNN" };
+        struct acpi_buffer state = { 0, NULL };
+        union acpi_object *tsd = NULL;
         struct acpi_tsd_package *pdomain;
 
         status = acpi_evaluate_object(pr->handle, "_TSD", NULL, &buffer);
@@ -232,7 +235,7 @@ static int acpi_processor_get_tsd(struct acpi_processor	*pr)
         state.pointer = pdomain;
 
         status = acpi_extract_package(&(tsd->package.elements[0]),
-                &format, &state);
+                                      &format, &state);
         if (ACPI_FAILURE(status)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _TSD data\n"));
                 result = -EFAULT;
@@ -251,7 +254,7 @@ static int acpi_processor_get_tsd(struct acpi_processor	*pr)
                 goto end;
         }
 
-end:
+      end:
         kfree(buffer.pointer);
         return result;
 }
@@ -266,7 +269,6 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
         u32 duty_mask = 0;
         u32 duty_value = 0;
 
-
         if (!pr)
                 return -EINVAL;
 
@@ -306,65 +308,75 @@ static int acpi_processor_get_throttling_fadt(struct acpi_processor *pr)
         return 0;
 }
 
-static int acpi_read_throttling_status(struct acpi_processor_throttling *throttling)
+static int acpi_read_throttling_status(struct acpi_processor_throttling
+                                       *throttling)
 {
         int value = -1;
         switch (throttling->status_register.space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
-                acpi_os_read_port((acpi_io_address)throttling->status_register.address,
-                                &value,
-                                (u32)throttling->status_register.bit_width*8);
+                acpi_os_read_port((acpi_io_address) throttling->status_register.
+                                  address, &value,
+                                  (u32) throttling->status_register.bit_width *
+                                  8);
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                printk(KERN_ERR PREFIX "HARDWARE addr space,NOT supported yet\n");
+                printk(KERN_ERR PREFIX
+                       "HARDWARE addr space,NOT supported yet\n");
                 break;
         default:
                 printk(KERN_ERR PREFIX "Unknown addr space %d\n",
-                        (u32) (throttling->status_register.space_id));
+                       (u32) (throttling->status_register.space_id));
         }
         return value;
 }
 
-static int acpi_write_throttling_state(struct acpi_processor_throttling *throttling,int value)
+static int acpi_write_throttling_state(struct acpi_processor_throttling
+                                       *throttling, int value)
 {
         int ret = -1;
 
         switch (throttling->control_register.space_id) {
         case ACPI_ADR_SPACE_SYSTEM_IO:
-                acpi_os_write_port((acpi_io_address)throttling->control_register.address,
-                                value,
-                                (u32)throttling->control_register.bit_width*8);
+                acpi_os_write_port((acpi_io_address) throttling->
+                                   control_register.address, value,
+                                   (u32) throttling->control_register.
+                                   bit_width * 8);
                 ret = 0;
                 break;
         case ACPI_ADR_SPACE_FIXED_HARDWARE:
-                printk(KERN_ERR PREFIX "HARDWARE addr space,NOT supported yet\n");
+                printk(KERN_ERR PREFIX
+                       "HARDWARE addr space,NOT supported yet\n");
                 break;
         default:
                 printk(KERN_ERR PREFIX "Unknown addr space %d\n",
-                        (u32) (throttling->control_register.space_id));
+                       (u32) (throttling->control_register.space_id));
         }