]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ACPI: delete acpi_processor_power_verify_c2()
authorLen Brown <len.brown@intel.com>
Wed, 20 Jan 2010 04:29:09 +0000 (23:29 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 20 Jan 2010 05:54:15 +0000 (00:54 -0500)
no functional change -- cleanup only.

acpi_processor_power_verify_c2() was nearly empty due to a previous patch,
so expand its remains into its one caller and delete it.

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/processor_idle.c

index 2c543b42eb1c69de2f54ebf1c5c9406b9b7d955d..7c0441f63b3963a0bcbe72ed3c8d2670442cd1f6 100644 (file)
@@ -516,23 +516,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
        return status;
 }
 
-static void acpi_processor_power_verify_c2(struct acpi_processor_cx *cx)
-{
-
-       if (!cx->address)
-               return;
-
-       /*
-        * Otherwise we've met all of our C2 requirements.
-        * Normalize the C2 latency to expidite policy
-        */
-       cx->valid = 1;
-
-       cx->latency_ticks = cx->latency;
-
-       return;
-}
-
 static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
                                           struct acpi_processor_cx *cx)
 {
@@ -631,7 +614,10 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
                        break;
 
                case ACPI_STATE_C2:
-                       acpi_processor_power_verify_c2(cx);
+                       if (!cx->address)
+                               break;
+                       cx->valid = 1; 
+                       cx->latency_ticks = cx->latency; /* Normalize latency */
                        break;
 
                case ACPI_STATE_C3: