diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2012-07-17 16:16:00 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-17 16:16:00 -0400 |
commit | 53b70951d9ef68420775b69e59ba720cc15c2643 (patch) | |
tree | dd3b917af62e08b5a2017b7cb31832237c2e6b1f | |
parent | 64d45f07b433090ee1329cf74989d973875028cb (diff) |
cpuidle / ACPI: remove usage from acpi_processor_cx structure
Remove the usage field as it is not used.
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
-rw-r--r-- | drivers/acpi/processor_idle.c | 5 | ||||
-rw-r--r-- | include/acpi/processor.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index b0d2bbe59096..f355f1a1c211 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -760,7 +760,6 @@ static int acpi_idle_enter_c1(struct cpuidle_device *dev, | |||
760 | dev->last_residency = (int)idle_time; | 760 | dev->last_residency = (int)idle_time; |
761 | 761 | ||
762 | local_irq_enable(); | 762 | local_irq_enable(); |
763 | cx->usage++; | ||
764 | lapic_timer_state_broadcast(pr, cx, 0); | 763 | lapic_timer_state_broadcast(pr, cx, 0); |
765 | 764 | ||
766 | return index; | 765 | return index; |
@@ -863,8 +862,6 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, | |||
863 | if (cx->entry_method != ACPI_CSTATE_FFH) | 862 | if (cx->entry_method != ACPI_CSTATE_FFH) |
864 | current_thread_info()->status |= TS_POLLING; | 863 | current_thread_info()->status |= TS_POLLING; |
865 | 864 | ||
866 | cx->usage++; | ||
867 | |||
868 | lapic_timer_state_broadcast(pr, cx, 0); | 865 | lapic_timer_state_broadcast(pr, cx, 0); |
869 | cx->time += idle_time; | 866 | cx->time += idle_time; |
870 | return index; | 867 | return index; |
@@ -984,8 +981,6 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
984 | if (cx->entry_method != ACPI_CSTATE_FFH) | 981 | if (cx->entry_method != ACPI_CSTATE_FFH) |
985 | current_thread_info()->status |= TS_POLLING; | 982 | current_thread_info()->status |= TS_POLLING; |
986 | 983 | ||
987 | cx->usage++; | ||
988 | |||
989 | lapic_timer_state_broadcast(pr, cx, 0); | 984 | lapic_timer_state_broadcast(pr, cx, 0); |
990 | cx->time += idle_time; | 985 | cx->time += idle_time; |
991 | return index; | 986 | return index; |
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index a70cbcc8a054..022b2e8b82d0 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -60,7 +60,6 @@ struct acpi_processor_cx { | |||
60 | u8 index; | 60 | u8 index; |
61 | u32 latency; | 61 | u32 latency; |
62 | u32 power; | 62 | u32 power; |
63 | u32 usage; | ||
64 | u64 time; | 63 | u64 time; |
65 | u8 bm_sts_skip; | 64 | u8 bm_sts_skip; |
66 | char desc[ACPI_CX_DESC_LEN]; | 65 | char desc[ACPI_CX_DESC_LEN]; |