diff options
author | Bob Moore <robert.moore@intel.com> | 2009-02-23 02:02:07 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-03-26 16:38:31 -0400 |
commit | 50ffba1bd3120b069617455545bc27bcf3cf7579 (patch) | |
tree | a4e1e1e22e526ff5067d9fb0fb90e18fccc948a3 /drivers/acpi/processor_idle.c | |
parent | 9892dd23cbbfab1f7d4818622296e415979a9c77 (diff) |
ACPICA: Rename ACPI bit register access functions
Rename acpi_get_register and acpi_set_register to clarify the
purpose of these functions. New names are acpi_read_bit_register
and acpi_write_bit_register.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@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 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 6946047d0096..5c69e85c1e4d 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
@@ -630,7 +630,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr, | |||
630 | * In either case, the proper way to | 630 | * In either case, the proper way to |
631 | * handle BM_RLD is to set it and leave it set. | 631 | * handle BM_RLD is to set it and leave it set. |
632 | */ | 632 | */ |
633 | acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1); | 633 | acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 1); |
634 | 634 | ||
635 | return; | 635 | return; |
636 | } | 636 | } |
@@ -800,9 +800,9 @@ static int acpi_idle_bm_check(void) | |||
800 | { | 800 | { |
801 | u32 bm_status = 0; | 801 | u32 bm_status = 0; |
802 | 802 | ||
803 | acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status); | 803 | acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status); |
804 | if (bm_status) | 804 | if (bm_status) |
805 | acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1); | 805 | acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, 1); |
806 | /* | 806 | /* |
807 | * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect | 807 | * PIIX4 Erratum #18: Note that BM_STS doesn't always reflect |
808 | * the true state of bus mastering activity; forcing us to | 808 | * the true state of bus mastering activity; forcing us to |
@@ -1028,7 +1028,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
1028 | c3_cpu_count++; | 1028 | c3_cpu_count++; |
1029 | /* Disable bus master arbitration when all CPUs are in C3 */ | 1029 | /* Disable bus master arbitration when all CPUs are in C3 */ |
1030 | if (c3_cpu_count == num_online_cpus()) | 1030 | if (c3_cpu_count == num_online_cpus()) |
1031 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1); | 1031 | acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1); |
1032 | spin_unlock(&c3_lock); | 1032 | spin_unlock(&c3_lock); |
1033 | } else if (!pr->flags.bm_check) { | 1033 | } else if (!pr->flags.bm_check) { |
1034 | ACPI_FLUSH_CPU_CACHE(); | 1034 | ACPI_FLUSH_CPU_CACHE(); |
@@ -1041,7 +1041,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, | |||
1041 | /* Re-enable bus master arbitration */ | 1041 | /* Re-enable bus master arbitration */ |
1042 | if (pr->flags.bm_check && pr->flags.bm_control) { | 1042 | if (pr->flags.bm_check && pr->flags.bm_control) { |
1043 | spin_lock(&c3_lock); | 1043 | spin_lock(&c3_lock); |
1044 | acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0); | 1044 | acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0); |
1045 | c3_cpu_count--; | 1045 | c3_cpu_count--; |
1046 | spin_unlock(&c3_lock); | 1046 | spin_unlock(&c3_lock); |
1047 | } | 1047 | } |