Skip to content

Commit

Permalink
ACPICA: Rename ACPI bit register access functions
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Bob Moore authored and Len Brown committed Mar 26, 2009
1 parent 9892dd2 commit 50ffba1
Show file tree
Hide file tree
Showing 9 changed files with 45 additions and 44 deletions.
12 changes: 6 additions & 6 deletions drivers/acpi/acpica/evevent.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ static acpi_status acpi_ev_fixed_event_initialize(void)

if (acpi_gbl_fixed_event_info[i].enable_register_id != 0xFF) {
status =
acpi_set_register(acpi_gbl_fixed_event_info[i].
enable_register_id, 0);
acpi_write_bit_register(acpi_gbl_fixed_event_info
[i].enable_register_id, 0);
if (ACPI_FAILURE(status)) {
return (status);
}
Expand Down Expand Up @@ -288,16 +288,16 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)

/* Clear the status bit */

(void)acpi_set_register(acpi_gbl_fixed_event_info[event].
status_register_id, 1);
(void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
status_register_id, 1);

/*
* Make sure we've got a handler. If not, report an error. The event is
* disabled to prevent further interrupts.
*/
if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {
(void)acpi_set_register(acpi_gbl_fixed_event_info[event].
enable_register_id, 0);
(void)acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
enable_register_id, 0);

ACPI_ERROR((AE_INFO,
"No installed handler for fixed event [%08X]",
Expand Down
4 changes: 2 additions & 2 deletions drivers/acpi/acpica/evmisc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,8 @@ acpi_status acpi_ev_release_global_lock(void)
*/
if (pending) {
status =
acpi_set_register(ACPI_BITREG_GLOBAL_LOCK_RELEASE,
1);
acpi_write_bit_register
(ACPI_BITREG_GLOBAL_LOCK_RELEASE, 1);
}

ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
Expand Down
24 changes: 12 additions & 12 deletions drivers/acpi/acpica/evxfevnt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,17 +172,17 @@ acpi_status acpi_enable_event(u32 event, u32 flags)
* register bit)
*/
status =
acpi_set_register(acpi_gbl_fixed_event_info[event].
enable_register_id, 1);
acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
enable_register_id, 1);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}

/* Make sure that the hardware responded */

status =
acpi_get_register(acpi_gbl_fixed_event_info[event].
enable_register_id, &value);
acpi_read_bit_register(acpi_gbl_fixed_event_info[event].
enable_register_id, &value);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
Expand Down Expand Up @@ -354,15 +354,15 @@ acpi_status acpi_disable_event(u32 event, u32 flags)
* register bit)
*/
status =
acpi_set_register(acpi_gbl_fixed_event_info[event].
enable_register_id, 0);
acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
enable_register_id, 0);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}

status =
acpi_get_register(acpi_gbl_fixed_event_info[event].
enable_register_id, &value);
acpi_read_bit_register(acpi_gbl_fixed_event_info[event].
enable_register_id, &value);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
Expand Down Expand Up @@ -407,8 +407,8 @@ acpi_status acpi_clear_event(u32 event)
* register bit)
*/
status =
acpi_set_register(acpi_gbl_fixed_event_info[event].
status_register_id, 1);
acpi_write_bit_register(acpi_gbl_fixed_event_info[event].
status_register_id, 1);

return_ACPI_STATUS(status);
}
Expand Down Expand Up @@ -495,15 +495,15 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status)
/* Get the status of the requested fixed event */

status =
acpi_get_register(acpi_gbl_fixed_event_info[event].
acpi_read_bit_register(acpi_gbl_fixed_event_info[event].
enable_register_id, &value);
if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);

*event_status = value;

status =
acpi_get_register(acpi_gbl_fixed_event_info[event].
acpi_read_bit_register(acpi_gbl_fixed_event_info[event].
status_register_id, &value);
if (ACPI_FAILURE(status))
return_ACPI_STATUS(status);
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/acpica/hwacpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ u32 acpi_hw_get_mode(void)
return_UINT32(ACPI_SYS_MODE_ACPI);
}

status = acpi_get_register(ACPI_BITREG_SCI_ENABLE, &value);
status = acpi_read_bit_register(ACPI_BITREG_SCI_ENABLE, &value);
if (ACPI_FAILURE(status)) {
return_UINT32(ACPI_SYS_MODE_LEGACY);
}
Expand Down
15 changes: 8 additions & 7 deletions drivers/acpi/acpica/hwsleep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)

/* Clear wake status */

status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
status = acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
Expand Down Expand Up @@ -365,7 +365,7 @@ acpi_status asmlinkage acpi_enter_sleep_state(u8 sleep_state)
/* Wait until we enter sleep state */

do {
status = acpi_get_register(ACPI_BITREG_WAKE_STATUS,
status = acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS,
&in_value);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
Expand Down Expand Up @@ -399,7 +399,7 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)

ACPI_FUNCTION_TRACE(acpi_enter_sleep_state_s4bios);

status = acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
status = acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
Expand Down Expand Up @@ -431,7 +431,8 @@ acpi_status asmlinkage acpi_enter_sleep_state_s4bios(void)

do {
acpi_os_stall(1000);
status = acpi_get_register(ACPI_BITREG_WAKE_STATUS, &in_value);
status =
acpi_read_bit_register(ACPI_BITREG_WAKE_STATUS, &in_value);
if (ACPI_FAILURE(status)) {
return_ACPI_STATUS(status);
}
Expand Down Expand Up @@ -592,18 +593,18 @@ acpi_status acpi_leave_sleep_state(u8 sleep_state)
* it to determine whether the system is rebooting or resuming. Clear
* it for compatibility.
*/
acpi_set_register(ACPI_BITREG_WAKE_STATUS, 1);
acpi_write_bit_register(ACPI_BITREG_WAKE_STATUS, 1);

acpi_gbl_system_awake_and_running = TRUE;

/* Enable power button */

(void)
acpi_set_register(acpi_gbl_fixed_event_info
acpi_write_bit_register(acpi_gbl_fixed_event_info
[ACPI_EVENT_POWER_BUTTON].enable_register_id, 1);

(void)
acpi_set_register(acpi_gbl_fixed_event_info
acpi_write_bit_register(acpi_gbl_fixed_event_info
[ACPI_EVENT_POWER_BUTTON].status_register_id, 1);

arg.integer.value = ACPI_SST_WORKING;
Expand Down
16 changes: 8 additions & 8 deletions drivers/acpi/acpica/hwxface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ ACPI_EXPORT_SYMBOL(acpi_write)

/*******************************************************************************
*
* FUNCTION: acpi_get_register
* FUNCTION: acpi_read_bit_register
*
* PARAMETERS: register_id - ID of ACPI Bit Register to access
* return_value - Value that was read from the register,
Expand All @@ -264,13 +264,13 @@ ACPI_EXPORT_SYMBOL(acpi_write)
* it make much sense to actually read this field.)
*
******************************************************************************/
acpi_status acpi_get_register(u32 register_id, u32 *return_value)
acpi_status acpi_read_bit_register(u32 register_id, u32 *return_value)
{
u32 register_value = 0;
struct acpi_bit_register_info *bit_reg_info;
acpi_status status;

ACPI_FUNCTION_TRACE(acpi_get_register);
ACPI_FUNCTION_TRACE(acpi_read_bit_register);

/* Get the info structure corresponding to the requested ACPI Register */

Expand Down Expand Up @@ -302,11 +302,11 @@ acpi_status acpi_get_register(u32 register_id, u32 *return_value)
return_ACPI_STATUS(status);
}

ACPI_EXPORT_SYMBOL(acpi_get_register)
ACPI_EXPORT_SYMBOL(acpi_read_bit_register)

/*******************************************************************************
*
* FUNCTION: acpi_set_register
* FUNCTION: acpi_write_bit_register
*
* PARAMETERS: register_id - ID of ACPI Bit Register to access
* Value - Value to write to the register, in bit
Expand All @@ -322,14 +322,14 @@ ACPI_EXPORT_SYMBOL(acpi_get_register)
* PM2 Control.
*
******************************************************************************/
acpi_status acpi_set_register(u32 register_id, u32 value)
acpi_status acpi_write_bit_register(u32 register_id, u32 value)
{
u32 register_value = 0;
struct acpi_bit_register_info *bit_reg_info;
acpi_status status;
acpi_cpu_flags lock_flags;

ACPI_FUNCTION_TRACE_U32(acpi_set_register, register_id);
ACPI_FUNCTION_TRACE_U32(acpi_write_bit_register, register_id);

/* Get the info structure corresponding to the requested ACPI Register */

Expand Down Expand Up @@ -459,7 +459,7 @@ acpi_status acpi_set_register(u32 register_id, u32 value)
return_ACPI_STATUS(status);
}

ACPI_EXPORT_SYMBOL(acpi_set_register)
ACPI_EXPORT_SYMBOL(acpi_write_bit_register)

/*******************************************************************************
*
Expand Down
10 changes: 5 additions & 5 deletions drivers/acpi/processor_idle.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ static void acpi_processor_power_verify_c3(struct acpi_processor *pr,
* In either case, the proper way to
* handle BM_RLD is to set it and leave it set.
*/
acpi_set_register(ACPI_BITREG_BUS_MASTER_RLD, 1);
acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_RLD, 1);

return;
}
Expand Down Expand Up @@ -800,9 +800,9 @@ static int acpi_idle_bm_check(void)
{
u32 bm_status = 0;

acpi_get_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
acpi_read_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, &bm_status);
if (bm_status)
acpi_set_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
acpi_write_bit_register(ACPI_BITREG_BUS_MASTER_STATUS, 1);
/*
* PIIX4 Erratum #18: Note that BM_STS doesn't always reflect
* the true state of bus mastering activity; forcing us to
Expand Down Expand Up @@ -1028,7 +1028,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
c3_cpu_count++;
/* Disable bus master arbitration when all CPUs are in C3 */
if (c3_cpu_count == num_online_cpus())
acpi_set_register(ACPI_BITREG_ARB_DISABLE, 1);
acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 1);
spin_unlock(&c3_lock);
} else if (!pr->flags.bm_check) {
ACPI_FLUSH_CPU_CACHE();
Expand All @@ -1041,7 +1041,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
/* Re-enable bus master arbitration */
if (pr->flags.bm_check && pr->flags.bm_control) {
spin_lock(&c3_lock);
acpi_set_register(ACPI_BITREG_ARB_DISABLE, 0);
acpi_write_bit_register(ACPI_BITREG_ARB_DISABLE, 0);
c3_cpu_count--;
spin_unlock(&c3_lock);
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/acpi/sleep.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ static int acpi_suspend_enter(suspend_state_t pm_state)

/* If ACPI is not enabled by the BIOS, we need to enable it here. */
if (set_sci_en_on_resume)
acpi_set_register(ACPI_BITREG_SCI_ENABLE, 1);
acpi_write_bit_register(ACPI_BITREG_SCI_ENABLE, 1);
else
acpi_enable();

Expand Down
4 changes: 2 additions & 2 deletions include/acpi/acpixf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,9 @@ acpi_resource_to_address64(struct acpi_resource *resource,
*/
acpi_status acpi_reset(void);

acpi_status acpi_get_register(u32 register_id, u32 * return_value);
acpi_status acpi_read_bit_register(u32 register_id, u32 *return_value);

acpi_status acpi_set_register(u32 register_id, u32 value);
acpi_status acpi_write_bit_register(u32 register_id, u32 value);

acpi_status acpi_set_firmware_waking_vector(u32 physical_address);

Expand Down

0 comments on commit 50ffba1

Please sign in to comment.