ACPI: delete unused c-state promotion/demotion data strucutures

These were used before cpuidle by the native ACPI idle driver,
which tracked promotion and demotion between states.

The code was referenced by CONFIG_ACPI_PROCFS
for /proc/acpi/processor/*/power,
but as we no longer do promotion/demotion, that
reference has been a NOP since the transition.

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

2 files changed, 3 insertions, 26 deletions

diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 5939e7f7d8e9..63a3d4b8c238 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -727,19 +727,9 @@ static int acpi_processor_power_seq_show(struct seq_file *seq, void *offset)
                         break;
                 }
 
-                if (pr->power.states[i].promotion.state)
-                        seq_printf(seq, "promotion[C%zd] ",
-                                   (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));
-                else
-                        seq_puts(seq, "demotion[--] ");
+                seq_puts(seq, "promotion[--] ");
+
+                seq_puts(seq, "demotion[--] ");
 
                 seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n",
                            pr->power.states[i].latency,
diff --git a/include/acpi/processor.h b/include/acpi/processor.h
index 86825ddbe14e..da565a48240e 100644
--- a/include/acpi/processor.h
+++ b/include/acpi/processor.h
@@ -52,17 +52,6 @@ struct acpi_power_register {
         u64 address;
 } __attribute__ ((packed));
 
-struct acpi_processor_cx_policy {
-        u32 count;
-        struct acpi_processor_cx *state;
-        struct {
-                u32 time;
-                u32 ticks;
-                u32 count;
-                u32 bm;
-        } threshold;
-};
-
 struct acpi_processor_cx {
         u8 valid;
         u8 type;
@@ -74,8 +63,6 @@ struct acpi_processor_cx {
         u32 power;
         u32 usage;
         u64 time;
-        struct acpi_processor_cx_policy promotion;
-        struct acpi_processor_cx_policy demotion;
         char desc[ACPI_CX_DESC_LEN];
 };