diff options
author | Bob Moore <robert.moore@intel.com> | 2007-02-02 11:48:21 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-02-02 21:14:26 -0500 |
commit | d8c71b6d3b21cf21ad775e1cf6da95bf87bd5ad4 (patch) | |
tree | 8525fe67ab2a3fb2bb4f203bdc7c9b6bb090afcc /drivers/acpi/processor_idle.c | |
parent | 73ca0fbcc25a6080db4136f55dbcd5fe7b33398f (diff) |
ACPICA: Remove obsolete Flags parameter.
Remove flags parameter for acpi_{get,set}_register().
It is no longer necessary now that these functions use a
spinlock for mutual exclusion.
Signed-off-by: Alexey Starikovskiy <alexey.y.starikovskiy@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/processor_idle.c')
-rw-r--r-- | drivers/acpi/processor_idle.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 9fa3d3965bb3..db21dda5837d 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -187,8 +187,7 @@ acpi_processor_power_activate(struct acpi_processor *pr, | |||
187 | case ACPI_STATE_C3: | 187 | case ACPI_STATE_C3: |
188 | /* Disable bus master reload */ | 188 | /* Disable bus master reload */ |
189 | if (new->type != ACPI_STATE_C3 && pr->flags.bm_check) | 189 | if (new->type != ACPI_STATE_C3 && pr->flags.bm_check) |
190 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0, | 190 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0); |
191 | ACPI_MTX_DO_NOT_LOCK); | ||
192 | break; | 191 | break; |
193 | } | 192 | } |
194 | } | 193 | } |
@@ -198,8 +197,7 @@ acpi_processor_power_activate(struct acpi_processor *pr, | |||
198 | case ACPI_STATE_C3: | 197 | case ACPI_STATE_C3: |
199 | /* Enable bus master reload */ | 198 | /* Enable bus master reload */ |
200 | if (old->type != ACPI_STATE_C3 && pr->flags.bm_check) | 199 | if (old->type != ACPI_STATE_C3 && pr->flags.bm_check) |
201 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1, | 200 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1); |
202 | ACPI_MTX_DO_NOT_LOCK); | ||
203 | break; | 201 | break; |
204 | } | 202 | } |
205 | 203 | ||
@@ -291,12 +289,10 @@ static void acpi_processor_idle(void) | |||
291 | 289 | ||
292 | pr->power.bm_activity <<= diff; | 290 | pr->power.bm_activity <<= diff; |
293 | 291 | ||
294 | acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, | 292 | acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status); |
295 | &bm_status, ACPI_MTX_DO_NOT_LOCK); | ||
296 | if (bm_status) { | 293 | if (bm_status) { |
297 | pr->power.bm_activity |= 0x1; | 294 | pr->power.bm_activity |= 0x1; |
298 | acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, | 295 | acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1); |
299 | 1, ACPI_MTX_DO_NOT_LOCK); | ||
300 | } | 296 | } |
301 | /* | 297 | /* |
302 | * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect | 298 | * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect |
@@ -411,8 +407,7 @@ static void acpi_processor_idle(void) | |||
411 | * All CPUs are trying to go to C3 | 407 | * All CPUs are trying to go to C3 |
412 | * Disable bus master arbitration | 408 | * Disable bus master arbitration |
413 | */ | 409 | */ |
414 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1, | 410 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1); |
415 | ACPI_MTX_DO_NOT_LOCK); | ||
416 | } | 411 | } |
417 | } else { | 412 | } else { |
418 | /* SMP with no shared cache... Invalidate cache */ | 413 | /* SMP with no shared cache... Invalidate cache */ |
@@ -428,8 +423,7 @@ static void acpi_processor_idle(void) | |||
428 | if (pr->flags.bm_check) { | 423 | if (pr->flags.bm_check) { |
429 | /* Enable bus master arbitration */ | 424 | /* Enable bus master arbitration */ |
430 | atomic_dec(&c3_cpu_count); | 425 | atomic_dec(&c3_cpu_count); |
431 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0, | 426 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); |
432 | ACPI_MTX_DO_NOT_LOCK); | ||
433 | } | 427 | } |
434 | 428 | ||
435 | #ifdef CONFIG_GENERIC_TIME | 429 | #ifdef CONFIG_GENERIC_TIME |
@@ -890,8 +884,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr, | |||
890 | " for C3 to be enabled on SMP systems\n")); | 884 | " for C3 to be enabled on SMP systems\n")); |
891 | return; | 885 | return; |
892 | } | 886 | } |
893 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, | 887 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 0); |
894 | 0, ACPI_MTX_DO_NOT_LOCK); | ||
895 | } | 888 | } |
896 | 889 | ||
897 | /* | 890 | /* |