1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 17f9ec501972..38472fd5d104 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -334,10 +334,10 @@ static int acpi_processor_get_power_info_default(struct acpi_processor *pr)
 
 static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 {
-        acpi_status status = 0;
+        acpi_status status;
         u64 count;
         int current_count;
-        int i;
+        int i, ret = 0;
         struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *cst;
 
@@ -358,7 +358,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
         /* There must be at least 2 elements */
         if (!cst || (cst->type != ACPI_TYPE_PACKAGE) || cst->package.count < 2) {
                 printk(KERN_ERR PREFIX "not enough elements in _CST\n");
-                status = -EFAULT;
+                ret = -EFAULT;
                 goto end;
         }
 
@@ -367,7 +367,7 @@ 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) {
                 printk(KERN_ERR PREFIX "count given by _CST is not valid\n");
-                status = -EFAULT;
+                ret = -EFAULT;
                 goto end;
         }
 
@@ -489,12 +489,12 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
 
         /* Validate number of power states discovered */
         if (current_count < 2)
-                status = -EFAULT;
+                ret = -EFAULT;
 
       end:
         kfree(buffer.pointer);
 
-        return status;
+        return ret;
 }
 
 static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
@@ -1111,7 +1111,7 @@ static int acpi_processor_registered;
 
 int acpi_processor_power_init(struct acpi_processor *pr)
 {
-        acpi_status status = 0;
+        acpi_status status;
         int retval;
         struct cpuidle_device *dev;
         static int first_run;