[ACPI] Lindent all ACPI files

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 159 insertions, 156 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 2c04740c6543..26a3a4016115 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -48,15 +48,12 @@
 #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")
 #define ACPI_PROCESSOR_FILE_POWER       "power"
-
 #define US_TO_PM_TIMER_TICKS(t)         ((t * (PM_TIMER_FREQUENCY/1000)) / 1000)
 #define C2_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
 #define C3_OVERHEAD                     4       /* 1us (3.579 ticks per us) */
-
-static void (*pm_idle_save)(void);
+static void (*pm_idle_save) (void);
 module_param(max_cstate, uint, 0644);
 
 static unsigned int nocst = 0;
@@ -69,7 +66,8 @@ module_param(nocst, uint, 0000);
  * 100 HZ: 0x0000000F: 4 jiffies = 40ms
  * reduce history for more aggressive entry into C3
  */
-static unsigned int bm_history = (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
+static unsigned int bm_history =
+    (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));
 module_param(bm_history, uint, 0644);
 /* --------------------------------------------------------------------------
                                 Power Management
@@ -87,34 +85,36 @@ static int set_max_cstate(struct dmi_system_id *id)
                 return 0;
 
         printk(KERN_NOTICE PREFIX "%s detected - limiting to C%ld max_cstate."
-                " Override with \"processor.max_cstate=%d\"\n", id->ident,
-                (long)id->driver_data, ACPI_PROCESSOR_MAX_POWER + 1);
+               " Override with \"processor.max_cstate=%d\"\n", id->ident,
+               (long)id->driver_data, ACPI_PROCESSOR_MAX_POWER + 1);
 
         max_cstate = (long)id->driver_data;
 
         return 0;
 }
 
-
 static struct dmi_system_id __initdata processor_power_dmi_table[] = {
-        { set_max_cstate, "IBM ThinkPad R40e", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"IBM"),
-          DMI_MATCH(DMI_BIOS_VERSION,"1SET60WW") }, (void*)1},
-        { set_max_cstate, "Medion 41700", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
-          DMI_MATCH(DMI_BIOS_VERSION,"R01-A1J") }, (void*)1},
-        { set_max_cstate, "Clevo 5600D", {
-          DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"),
-          DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307") },
-          (void*)2},
+        {set_max_cstate, "IBM ThinkPad R40e", {
+                                               DMI_MATCH(DMI_BIOS_VENDOR,
+                                                         "IBM"),
+                                               DMI_MATCH(DMI_BIOS_VERSION,
+                                                         "1SET60WW")},
+         (void *)1},
+        {set_max_cstate, "Medion 41700", {
+                                          DMI_MATCH(DMI_BIOS_VENDOR,
+                                                    "Phoenix Technologies LTD"),
+                                          DMI_MATCH(DMI_BIOS_VERSION,
+                                                    "R01-A1J")}, (void *)1},
+        {set_max_cstate, "Clevo 5600D", {
+                                         DMI_MATCH(DMI_BIOS_VENDOR,
+                                                   "Phoenix Technologies LTD"),
+                                         DMI_MATCH(DMI_BIOS_VERSION,
+                                                   "SHE845M0.86C.0013.D.0302131307")},
+         (void *)2},
         {},
 };
 
-
-static inline u32
-ticks_elapsed (
-        u32                     t1,
-        u32                     t2)
+static inline u32 ticks_elapsed(u32 t1, u32 t2)
 {
         if (t2 >= t1)
                 return (t2 - t1);
@@ -124,13 +124,11 @@ ticks_elapsed (
                 return ((0xFFFFFFFF - t1) + t2);
 }
 
-
 static void
-acpi_processor_power_activate (
-        struct acpi_processor   *pr,
-        struct acpi_processor_cx  *new)
+acpi_processor_power_activate(struct acpi_processor *pr,
+                              struct acpi_processor_cx *new)
 {
-        struct acpi_processor_cx  *old;
+        struct acpi_processor_cx *old;
 
         if (!pr || !new)
                 return;
@@ -139,7 +137,7 @@ acpi_processor_power_activate (
 
         if (old)
                 old->promotion.count = 0;
-        new->demotion.count = 0;
+        new->demotion.count = 0;
 
         /* Cleanup from old state. */
         if (old) {
@@ -147,7 +145,8 @@ acpi_processor_power_activate (
                 case ACPI_STATE_C3:
                         /* Disable bus master reload */
                         if (new->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0, ACPI_MTX_DO_NOT_LOCK);
+                                acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0,
+                                                  ACPI_MTX_DO_NOT_LOCK);
                         break;
                 }
         }
@@ -157,7 +156,8 @@ acpi_processor_power_activate (
         case ACPI_STATE_C3:
                 /* Enable bus master reload */
                 if (old->type != ACPI_STATE_C3 && pr->flags.bm_check)
-                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1, ACPI_MTX_DO_NOT_LOCK);
+                        acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1,
+                                          ACPI_MTX_DO_NOT_LOCK);
                 break;
         }
 
@@ -166,17 +166,15 @@ acpi_processor_power_activate (
         return;
 }
 
+static atomic_t c3_cpu_count;
 
-static atomic_t         c3_cpu_count;
-
-
-static void acpi_processor_idle (void)
+static void acpi_processor_idle(void)
 {
-        struct acpi_processor   *pr = NULL;
+        struct acpi_processor *pr = NULL;
         struct acpi_processor_cx *cx = NULL;
         struct acpi_processor_cx *next_state = NULL;
-        int                     sleep_ticks = 0;
-        u32                     t1, t2 = 0;
+        int sleep_ticks = 0;
+        u32 t1, t2 = 0;
 
         pr = processors[raw_smp_processor_id()];
         if (!pr)
@@ -208,8 +206,8 @@ static void acpi_processor_idle (void)
          * for demotion.
          */
         if (pr->flags.bm_check) {
-                u32             bm_status = 0;
-                unsigned long   diff = jiffies - pr->power.bm_check_timestamp;
+                u32 bm_status = 0;
+                unsigned long diff = jiffies - pr->power.bm_check_timestamp;
 
                 if (diff > 32)
                         diff = 32;
@@ -223,11 +221,11 @@ static void acpi_processor_idle (void)
                 }
 
                 acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS,
-                        &bm_status, ACPI_MTX_DO_NOT_LOCK);
+                                  &bm_status, ACPI_MTX_DO_NOT_LOCK);
                 if (bm_status) {
                         pr->power.bm_activity++;
                         acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS,
-                                1, ACPI_MTX_DO_NOT_LOCK);
+                                          1, ACPI_MTX_DO_NOT_LOCK);
                 }
                 /*
                  * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
@@ -236,7 +234,7 @@ static void acpi_processor_idle (void)
                  */
                 else if (errata.piix4.bmisx) {
                         if ((inb_p(errata.piix4.bmisx + 0x02) & 0x01)
-                                || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
+                            || (inb_p(errata.piix4.bmisx + 0x0A) & 0x01))
                                 pr->power.bm_activity++;
                 }
 
@@ -281,7 +279,7 @@ static void acpi_processor_idle (void)
                 else
                         safe_halt();
                 /*
-                 * TBD: Can't get time duration while in C1, as resumes
+                 * TBD: Can't get time duration while in C1, as resumes
                  *      go to an ISR rather than here.  Need to instrument
                  *      base interrupt handler.
                  */
@@ -300,26 +298,27 @@ static void acpi_processor_idle (void)
                 /* Re-enable interrupts */
                 local_irq_enable();
                 /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD;
+                sleep_ticks =
+                    ticks_elapsed(t1, t2) - cx->latency_ticks - C2_OVERHEAD;
                 break;
 
         case ACPI_STATE_C3:
-                
+
                 if (pr->flags.bm_check) {
                         if (atomic_inc_return(&c3_cpu_count) ==
-                                        num_online_cpus()) {
+                            num_online_cpus()) {
                                 /*
                                  * All CPUs are trying to go to C3
                                  * Disable bus master arbitration
                                  */
                                 acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1,
-                                        ACPI_MTX_DO_NOT_LOCK);
+                                                  ACPI_MTX_DO_NOT_LOCK);
                         }
                 } else {
                         /* SMP with no shared cache... Invalidate cache  */
                         ACPI_FLUSH_CPU_CACHE();
                 }
-                
+
                 /* Get start time (ticks) */
                 t1 = inl(acpi_fadt.xpm_tmr_blk.address);
                 /* Invoke C3 */
@@ -331,13 +330,15 @@ static void acpi_processor_idle (void)
                 if (pr->flags.bm_check) {
                         /* Enable bus master arbitration */
                         atomic_dec(&c3_cpu_count);
-                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0, ACPI_MTX_DO_NOT_LOCK);
+                        acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0,
+                                          ACPI_MTX_DO_NOT_LOCK);
                 }
 
                 /* Re-enable interrupts */
                 local_irq_enable();
                 /* Compute time (ticks) that we were actually asleep */
-                sleep_ticks = ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD;
+                sleep_ticks =
+                    ticks_elapsed(t1, t2) - cx->latency_ticks - C3_OVERHEAD;
                 break;
 
         default:
@@ -359,15 +360,18 @@ static void acpi_processor_idle (void)
             ((cx->promotion.state - pr->power.states) <= max_cstate)) {
                 if (sleep_ticks > cx->promotion.threshold.ticks) {
                         cx->promotion.count++;
-                        cx->demotion.count = 0;
-                        if (cx->promotion.count >= cx->promotion.threshold.count) {
+                        cx->demotion.count = 0;
+                        if (cx->promotion.count >=
+                            cx->promotion.threshold.count) {
                                 if (pr->flags.bm_check) {
-                                        if (!(pr->power.bm_activity & cx->promotion.threshold.bm)) {
-                                                next_state = cx->promotion.state;
+                                        if (!
+                                            (pr->power.bm_activity & cx->
+                                             promotion.threshold.bm)) {
+                                                next_state =
+                                                    cx->promotion.state;
                                                 goto end;
                                         }
-                                }
-                                else {
+                                } else {
                                         next_state = cx->promotion.state;
                                         goto end;
                                 }
@@ -392,7 +396,7 @@ static void acpi_processor_idle (void)
                 }
         }
 
-end:
+      end:
         /*
          * Demote if current state exceeds max_cstate
          */
@@ -412,7 +416,7 @@ end:
 
         return;
 
- easy_out:
+      easy_out:
         /* do C1 instead of busy loop */
         if (pm_idle_save)
                 pm_idle_save();
@@ -421,10 +425,7 @@ end:
         return;
 }
 
-
-static int
-acpi_processor_set_power_policy (
-        struct acpi_processor   *pr)
+static int acpi_processor_set_power_policy(struct acpi_processor *pr)
 {
         unsigned int i;
         unsigned int state_is_set = 0;
@@ -432,7 +433,7 @@ acpi_processor_set_power_policy (
         struct acpi_processor_cx *higher = NULL;
         struct acpi_processor_cx *cx;
 
-        ACPI_FUNCTION_TRACE("acpi_processor_set_power_policy");
+        ACPI_FUNCTION_TRACE("acpi_processor_set_power_policy");
 
         if (!pr)
                 return_VALUE(-EINVAL);
@@ -447,7 +448,7 @@ acpi_processor_set_power_policy (
          */
 
         /* startup state */
-        for (i=1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
                 cx = &pr->power.states[i];
                 if (!cx->valid)
                         continue;
@@ -456,13 +457,13 @@ acpi_processor_set_power_policy (
                         pr->power.state = cx;
                 state_is_set++;
                 break;
-        }
+        }
 
         if (!state_is_set)
                 return_VALUE(-ENODEV);
 
         /* demotion */
-        for (i=1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
                 cx = &pr->power.states[i];
                 if (!cx->valid)
                         continue;
@@ -485,7 +486,7 @@ acpi_processor_set_power_policy (
                         continue;
 
                 if (higher) {
-                        cx->promotion.state  = higher;
+                        cx->promotion.state = higher;
                         cx->promotion.threshold.ticks = cx->latency_ticks;
                         if (cx->type >= ACPI_STATE_C2)
                                 cx->promotion.threshold.count = 4;
@@ -498,11 +499,10 @@ acpi_processor_set_power_policy (
                 higher = cx;
         }
 
-        return_VALUE(0);
+        return_VALUE(0);
 }
 
-
-static int acpi_processor_get_power_info_fadt (struct acpi_processor *pr)
+static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 {
         int i;
 
@@ -543,15 +543,14 @@ static int acpi_processor_get_power_info_fadt (struct acpi_processor *pr)
         return_VALUE(0);
 }
 
-
-static int acpi_processor_get_power_info_default_c1 (struct acpi_processor *pr)
+static int acpi_processor_get_power_info_default_c1(struct acpi_processor *pr)
 {
         int i;
 
         ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_default_c1");
 
         for (i = 0; i < ACPI_PROCESSOR_MAX_POWER; i++)
-                memset(&(pr->power.states[i]), 0, 
+                memset(&(pr->power.states[i]), 0,
                        sizeof(struct acpi_processor_cx));
 
         /* if info is obtained from pblk/fadt, type equals state */
@@ -567,14 +566,13 @@ static int acpi_processor_get_power_info_default_c1 (struct acpi_processor *pr)
         return_VALUE(0);
 }
 
-
-static int acpi_processor_get_power_info_cst (struct acpi_processor *pr)
+static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 {
-        acpi_status             status = 0;
-        acpi_integer            count;
-        int                     i;
-        struct acpi_buffer      buffer = {ACPI_ALLOCATE_BUFFER, NULL};
-        union acpi_object       *cst;
+        acpi_status status = 0;
+        acpi_integer count;
+        int i;
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
+        union acpi_object *cst;
 
         ACPI_FUNCTION_TRACE("acpi_processor_get_power_info_cst");
 
@@ -583,20 +581,21 @@ static int acpi_processor_get_power_info_cst (struct acpi_processor *pr)
 
         pr->power.count = 0;
         for (i = 0; i < ACPI_PROCESSOR_MAX_POWER; i++)
-                memset(&(pr->power.states[i]), 0, 
+                memset(&(pr->power.states[i]), 0,
                        sizeof(struct acpi_processor_cx));
 
         status = acpi_evaluate_object(pr->handle, "_CST", NULL, &buffer);
         if (ACPI_FAILURE(status)) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO, "No _CST, giving up\n"));
                 return_VALUE(-ENODEV);
-        }
+        }
 
-        cst = (union acpi_object *) buffer.pointer;
+        cst = (union acpi_object *)buffer.pointer;
 
         /* There must be at least 2 elements */
         if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "not enough elements in _CST\n"));
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                  "not enough elements in _CST\n"));
                 status = -EFAULT;
                 goto end;
         }
@@ -605,15 +604,19 @@ static int acpi_processor_get_power_info_cst (struct acpi_processor *pr)
 
         /* Validate number of power states. */
         if (count < 1 || count != cst->package.count - 1) {
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "count given by _CST is not valid\n"));
+                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
+                                  "count given by _CST is not valid\n"));
                 status = -EFAULT;
                 goto end;
         }
 
         /* We support up to ACPI_PROCESSOR_MAX_POWER. */
         if (count > ACPI_PROCESSOR_MAX_POWER) {
-                printk(KERN_WARNING "Limiting number of power states to max (%d)\n", ACPI_PROCESSOR_MAX_POWER);
-                printk(KERN_WARNING "Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");
+                printk(KERN_WARNING
+                       "Limiting number of power states to max (%d)\n",
+                       ACPI_PROCESSOR_MAX_POWER);
+                printk(KERN_WARNING
+                       "Please increase ACPI_PROCESSOR_MAX_POWER if needed.\n");
                 count = ACPI_PROCESSOR_MAX_POWER;
         }
 
@@ -628,29 +631,29 @@ static int acpi_processor_get_power_info_cst (struct acpi_processor *pr)
 
                 memset(&cx, 0, sizeof(cx));
 
-                element = (union acpi_object *) &(cst->package.elements[i]);
+                element = (union acpi_object *)&(cst->package.elements[i]);
                 if (element->type != ACPI_TYPE_PACKAGE)
                         continue;
 
                 if (element->package.count != 4)
                         continue;
 
-                obj = (union acpi_object *) &(element->package.elements[0]);
+                obj = (union acpi_object *)&(element->package.elements[0]);
 
                 if (obj->type != ACPI_TYPE_BUFFER)
                         continue;
 
-                reg = (struct acpi_power_register *) obj->buffer.pointer;
+                reg = (struct acpi_power_register *)obj->buffer.pointer;
 
                 if (reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO &&
-                        (reg->space_id != ACPI_ADR_SPACE_FIXED_HARDWARE))
+                    (reg->space_id != ACPI_ADR_SPACE_FIXED_HARDWARE))
                         continue;
 
                 cx.address = (reg->space_id == ACPI_ADR_SPACE_FIXED_HARDWARE) ?
-                        0 : reg->address;
+                    0 : reg->address;
 
                 /* There should be an easy way to extract an integer... */
-                obj = (union acpi_object *) &(element->package.elements[1]);
+                obj = (union acpi_object *)&(element->package.elements[1]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
@@ -660,17 +663,16 @@ static int acpi_processor_get_power_info_cst (struct acpi_processor *pr)
                     (reg->space_id != ACPI_ADR_SPACE_SYSTEM_IO))
                         continue;
 
-                if ((cx.type < ACPI_STATE_C1) ||
-                    (cx.type > ACPI_STATE_C3))
+                if ((cx.type < ACPI_STATE_C1) || (cx.type > ACPI_STATE_C3))
                         continue;
 
-                obj = (union acpi_object *) &(element->package.elements[2]);
+                obj = (union acpi_object *)&(element->package.elements[2]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
                 cx.latency = obj->integer.value;
 
-                obj = (union acpi_object *) &(element->package.elements[3]);
+                obj = (union acpi_object *)&(element->package.elements[3]);
                 if (obj->type != ACPI_TYPE_INTEGER)
                         continue;
 
@@ -680,19 +682,19 @@ static int acpi_processor_get_power_info_cst (struct acpi_processor *pr)
                 memcpy(&(pr->power.states[pr->power.count]), &cx, sizeof(cx));
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d power states\n", pr->power.count));
+        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found %d power states\n",
+                          pr->power.count));
 
         /* Validate number of power states discovered */
         if (pr->power.count < 2)
                 status = -ENODEV;
 
-end:
+      end:
         acpi_os_free(buffer.pointer);
 
         return_VALUE(status);
 }
 
-
 static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
 {
         ACPI_FUNCTION_TRACE("acpi_processor_get_power_verify_c2");
@@ -706,8 +708,7 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
          */
         else if (cx->latency > ACPI_PROCESSOR_MAX_C2_LATENCY) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "latency too large [%d]\n",
-                                  cx->latency));
+                                  "latency too large [%d]\n", cx->latency));
                 return_VOID;
         }
 
@@ -721,10 +722,8 @@ static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
         return_VOID;
 }
 
-
-static void acpi_processor_power_verify_c3(
-        struct acpi_processor *pr,
-        struct acpi_processor_cx *cx)
+static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
+                                           struct acpi_processor_cx *cx)
 {
         static int bm_check_flag;
 
@@ -739,8 +738,7 @@ static void acpi_processor_power_verify_c3(
          */
         else if (cx->latency > ACPI_PROCESSOR_MAX_C3_LATENCY) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                                  "latency too large [%d]\n",
-                                  cx->latency));
+                                  "latency too large [%d]\n", cx->latency));
                 return_VOID;
         }
 
@@ -753,7 +751,7 @@ static void acpi_processor_power_verify_c3(
          */
         else if (errata.piix4.fdma) {
                 ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                        "C3 not supported on PIIX4 with Type-F DMA\n"));
+                                  "C3 not supported on PIIX4 with Type-F DMA\n"));
                 return_VOID;
         }
 
@@ -770,7 +768,7 @@ static void acpi_processor_power_verify_c3(
                 /* bus mastering control is necessary */
                 if (!pr->flags.bm_control) {
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "C3 support requires bus mastering control\n"));
+                                          "C3 support requires bus mastering control\n"));
                         return_VOID;
                 }
         } else {
@@ -780,12 +778,12 @@ static void acpi_processor_power_verify_c3(
                  */
                 if (acpi_fadt.wb_invd != 1) {
                         ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-                          "Cache invalidation should work properly"
-                          " for C3 to be enabled on SMP systems\n"));
+                                          "Cache invalidation should work properly"
+                                          " for C3 to be enabled on SMP systems\n"));
                         return_VOID;
                 }
                 acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD,
-                                0, ACPI_MTX_DO_NOT_LOCK);
+                                  0, ACPI_MTX_DO_NOT_LOCK);
         }
 
         /*
@@ -800,13 +798,12 @@ static void acpi_processor_power_verify_c3(
         return_VOID;
 }
 
-
 static int acpi_processor_power_verify(struct acpi_processor *pr)
 {
         unsigned int i;
         unsigned int working = 0;
 
-        for (i=1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
+        for (i = 1; i < ACPI_PROCESSOR_MAX_POWER; i++) {
                 struct acpi_processor_cx *cx = &pr->power.states[i];
 
                 switch (cx->type) {
@@ -830,8 +827,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
         return (working);
 }
 
-static int acpi_processor_get_power_info (
-        struct acpi_processor   *pr)
+static int acpi_processor_get_power_info(struct acpi_processor *pr)
 {
         unsigned int i;
         int result;
@@ -874,16 +870,16 @@ static int acpi_processor_get_power_info (
         return_VALUE(0);
 }
 
-int acpi_processor_cst_has_changed (struct acpi_processor *pr)
+int acpi_processor_cst_has_changed(struct acpi_processor *pr)
 {
-        int                     result = 0;
+        int result = 0;
 
         ACPI_FUNCTION_TRACE("acpi_processor_cst_has_changed");
 
         if (!pr)
-                return_VALUE(-EINVAL);
+                return_VALUE(-EINVAL);
 
-        if ( nocst) {
+        if (nocst) {
                 return_VALUE(-ENODEV);
         }
 
@@ -892,7 +888,7 @@ int acpi_processor_cst_has_changed (struct acpi_processor *pr)
 
         /* Fall back to the default idle loop */
         pm_idle = pm_idle_save;
-        synchronize_sched();  /* Relies on interrupts forcing exit from idle. */
+        synchronize_sched();    /* Relies on interrupts forcing exit from idle. */
 
         pr->flags.power = 0;
         result = acpi_processor_get_power_info(pr);
@@ -906,8 +902,8 @@ int acpi_processor_cst_has_changed (struct acpi_processor *pr)
 
 static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 {
-        struct acpi_processor   *pr = (struct acpi_processor *)seq->private;
-        unsigned int            i;
+        struct acpi_processor *pr = (struct acpi_processor *)seq->private;
+        unsigned int i;
 
         ACPI_FUNCTION_TRACE("acpi_processor_power_seq_show");
 
@@ -915,17 +911,17 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
                 goto end;
 
         seq_printf(seq, "active state:            C%zd\n"
-                        "max_cstate:              C%d\n"
-                        "bus master activity:     %08x\n",
-                        pr->power.state ? pr->power.state - pr->power.states : 0,
-                        max_cstate,
-                        (unsigned)pr->power.bm_activity);
+                   "max_cstate:              C%d\n"
+                   "bus master activity:     %08x\n",
+                   pr->power.state ? pr->power.state - pr->power.states : 0,
+                   max_cstate, (unsigned)pr->power.bm_activity);
 
         seq_puts(seq, "states:\n");
 
         for (i = 1; i <= pr->power.count; i++) {
                 seq_printf(seq, "   %cC%d:                  ",
-                        (&pr->power.states[i] == pr->power.state?'*':' '), i);
+                           (&pr->power.states[i] ==
+                            pr->power.state ? '*' : ' '), i);
 
                 if (!pr->power.states[i].valid) {
                         seq_puts(seq, "<not supported>\n");
@@ -949,45 +945,46 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
 
                 if (pr->power.states[i].promotion.state)
                         seq_printf(seq, "promotion[C%zd] ",
-                                (pr->power.states[i].promotion.state -
-                                 pr->power.states));
+                                   (pr->power.states[i].promotion.state -
+                                    pr->power.states));
                 else
                         seq_puts(seq, "promotion[--] ");
 
                 if (pr->power.states[i].demotion.state)
                         seq_printf(seq, "demotion[C%zd] ",
-                                (pr->power.states[i].demotion.state -
-                                 pr->power.states));
+                                   (pr->power.states[i].demotion.state -
+                                    pr->power.states));
                 else
                         seq_puts(seq, "demotion[--] ");
 
                 seq_printf(seq, "latency[%03d] usage[%08d]\n",
-                        pr->power.states[i].latency,
-                        pr->power.states[i].usage);
+                           pr->power.states[i].latency,
+                           pr->power.states[i].usage);
         }
 
-end:
+      end:
         return_VALUE(0);
 }
 
 static int acpi_processor_power_open_fs(struct inode *inode, struct file *file)
 {
         return single_open(file, acpi_processor_power_seq_show,
-                                                PDE(inode)->data);
+                           PDE(inode)->data);
 }
 
 static struct file_operations acpi_processor_power_fops = {
-        .open           = acpi_processor_power_open_fs,
-        .read           = seq_read,
-        .llseek         = seq_lseek,
-        .release        = single_release,
+        .open = acpi_processor_power_open_fs,
+        .read = seq_read,
+        .llseek = seq_lseek,
+        .release = single_release,
 };
 
-int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *device)
+int acpi_processor_power_init(struct acpi_processor *pr,
+                              struct acpi_device *device)
 {
-        acpi_status             status = 0;
-        static int              first_run = 0;
-        struct proc_dir_entry   *entry = NULL;
+        acpi_status status = 0;
+        static int first_run = 0;
+        struct proc_dir_entry *entry = NULL;
         unsigned int i;
 
         ACPI_FUNCTION_TRACE("acpi_processor_power_init");
@@ -995,7 +992,9 @@ int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *dev
         if (!first_run) {
                 dmi_check_system(processor_power_dmi_table);
                 if (max_cstate < ACPI_C_STATES_MAX)
-                        printk(KERN_NOTICE "ACPI: processor limited to max C-state %d\n", max_cstate);
+                        printk(KERN_NOTICE
+                               "ACPI: processor limited to max C-state %d\n",
+                               max_cstate);
                 first_run++;
         }
 
@@ -1003,7 +1002,8 @@ int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *dev
                 return_VALUE(-EINVAL);
 
         if (acpi_fadt.cst_cnt && !nocst) {
-                status = acpi_os_write_port(acpi_fadt.smi_cmd, acpi_fadt.cst_cnt, 8);
+                status =
+                    acpi_os_write_port(acpi_fadt.smi_cmd, acpi_fadt.cst_cnt, 8);
                 if (ACPI_FAILURE(status)) {
                         ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
                                           "Notifying BIOS of _CST ability failed\n"));
@@ -1023,7 +1023,8 @@ int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *dev
                 printk(KERN_INFO PREFIX "CPU%d (power states:", pr->id);
                 for (i = 1; i <= pr->power.count; i++)
                         if (pr->power.states[i].valid)
-                                printk(" C%d[C%d]", i, pr->power.states[i].type);
+                                printk(" C%d[C%d]", i,
+                                       pr->power.states[i].type);
                 printk(")\n");
 
                 if (pr->id == 0) {
@@ -1034,11 +1035,11 @@ int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *dev
 
         /* 'power' [R] */
         entry = create_proc_entry(ACPI_PROCESSOR_FILE_POWER,
-                S_IRUGO, acpi_device_dir(device));
+                                  S_IRUGO, acpi_device_dir(device));
         if (!entry)
                 ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                        "Unable to create '%s' fs entry\n",
-                        ACPI_PROCESSOR_FILE_POWER));
+                                  "Unable to create '%s' fs entry\n",
+                                  ACPI_PROCESSOR_FILE_POWER));
         else {
                 entry->proc_fops = &acpi_processor_power_fops;
                 entry->data = acpi_driver_data(device);
@@ -1050,14 +1051,16 @@ int acpi_processor_power_init(struct acpi_processor *pr, struct acpi_device *dev
         return_VALUE(0);
 }
 
-int acpi_processor_power_exit(struct acpi_processor *pr, struct acpi_device *device)
+int acpi_processor_power_exit(struct acpi_processor *pr,
+                              struct acpi_device *device)
 {
         ACPI_FUNCTION_TRACE("acpi_processor_power_exit");
 
         pr->flags.power_setup_done = 0;
 
         if (acpi_device_dir(device))
-                remove_proc_entry(ACPI_PROCESSOR_FILE_POWER,acpi_device_dir(device));
+                remove_proc_entry(ACPI_PROCESSOR_FILE_POWER,
+                                  acpi_device_dir(device));
 
         /* Unregister the idle handler when processor #0 is removed. */
         if (pr->id == 0) {