diff options
-rw-r--r-- | drivers/acpi/processor_idle.c | 16 | ||||
-rw-r--r-- | include/acpi/processor.h | 13 |
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) | |||
727 | break; | 727 | break; |
728 | } | 728 | } |
729 | 729 | ||
730 | if (pr->power.states[i].promotion.state) | 730 | seq_puts(seq, "promotion[--] "); |
731 | seq_printf(seq, "promotion[C%zd] ", | 731 | |
732 | (pr->power.states[i].promotion.state - | 732 | seq_puts(seq, "demotion[--] "); |
733 | pr->power.states)); | ||
734 | else | ||
735 | seq_puts(seq, "promotion[--] "); | ||
736 | |||
737 | if (pr->power.states[i].demotion.state) | ||
738 | seq_printf(seq, "demotion[C%zd] ", | ||
739 | (pr->power.states[i].demotion.state - | ||
740 | pr->power.states)); | ||
741 | else | ||
742 | seq_puts(seq, "demotion[--] "); | ||
743 | 733 | ||
744 | seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n", | 734 | seq_printf(seq, "latency[%03d] usage[%08d] duration[%020llu]\n", |
745 | pr->power.states[i].latency, | 735 | 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 { | |||
52 | u64 address; | 52 | u64 address; |
53 | } __attribute__ ((packed)); | 53 | } __attribute__ ((packed)); |
54 | 54 | ||
55 | struct acpi_processor_cx_policy { | ||
56 | u32 count; | ||
57 | struct acpi_processor_cx *state; | ||
58 | struct { | ||
59 | u32 time; | ||
60 | u32 ticks; | ||
61 | u32 count; | ||
62 | u32 bm; | ||
63 | } threshold; | ||
64 | }; | ||
65 | |||
66 | struct acpi_processor_cx { | 55 | struct acpi_processor_cx { |
67 | u8 valid; | 56 | u8 valid; |
68 | u8 type; | 57 | u8 type; |
@@ -74,8 +63,6 @@ struct acpi_processor_cx { | |||
74 | u32 power; | 63 | u32 power; |
75 | u32 usage; | 64 | u32 usage; |
76 | u64 time; | 65 | u64 time; |
77 | struct acpi_processor_cx_policy promotion; | ||
78 | struct acpi_processor_cx_policy demotion; | ||
79 | char desc[ACPI_CX_DESC_LEN]; | 66 | char desc[ACPI_CX_DESC_LEN]; |
80 | }; | 67 | }; |
81 | 68 | ||