cpuidle / ACPI : remove power from acpi_processor_cx structure

Remove the unused power field from struct struct acpi_processor_cx.

[rjw: Modified changelog.]

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index ad3730b4038bdfb7b2dc24fb3b396abfdf0a5703..de896242d144fe8faaa5dc13be00942cea5f2827 100644 (file)
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -483,8 +483,6 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
                if (obj->type != ACPI_TYPE_INTEGER)
                        continue;
 
-               cx.power = obj->integer.value;
-
                current_count++;
                memcpy(&(pr->power.states[current_count]), &cx, sizeof(cx));
 

diff --git a/drivers/xen/xen-acpi-processor.c b/drivers/xen/xen-acpi-processor.c
index b590ee067fcd3d3755efc35499f7bdee4151f41d..316df65163cfa5d6485a256edf2cdab24e8805d6 100644 (file)
--- a/drivers/xen/xen-acpi-processor.c
+++ b/drivers/xen/xen-acpi-processor.c
@@ -98,7 +98,6 @@ static int push_cxx_to_hypervisor(struct acpi_processor *_pr)
 
                dst_cx->type = cx->type;
                dst_cx->latency = cx->latency;
-               dst_cx->power = cx->power;
 
                dst_cx->dpcnt = 0;
                set_xen_guest_handle(dst_cx->dp, NULL);

diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 64ec644808bcb82951f38eaa682cb536e605d7bf..db427fa8cf820e107a4811a2bd23116b9506bc72 100644 (file)
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -59,7 +59,6 @@ struct acpi_processor_cx {
        u8 entry_method;
        u8 index;
        u32 latency;
-       u32 power;
        u8 bm_sts_skip;
        char desc[ACPI_CX_DESC_LEN];
 };