Skip to content

Commit

Permalink
ACPI: delete unused c-state promotion/demotion data strucutures
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Len Brown committed May 21, 2010
1 parent d6bd535 commit 34a18d6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 26 deletions.
16 changes: 3 additions & 13 deletions drivers/acpi/processor_idle.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 0 additions & 13 deletions include/acpi/processor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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];
};

Expand Down

0 comments on commit 34a18d6

Please sign in to comment.