Skip to content

Commit

Permalink
ACPICA: Use acpi_os_create_lock interface
Browse files Browse the repository at this point in the history
Replace spin_lock_init with acpi_os_create_lock.

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Lin Ming authored and Len Brown committed Mar 25, 2011
1 parent 9f63b88 commit 3854c8e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 9 deletions.
9 changes: 3 additions & 6 deletions drivers/acpi/acpica/acglobal.h
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,9 @@ ACPI_EXTERN u8 acpi_gbl_global_lock_present;
* Spinlocks are used for interfaces that can be possibly called at
* interrupt level
*/
ACPI_EXTERN spinlock_t _acpi_gbl_gpe_lock; /* For GPE data structs and registers */
ACPI_EXTERN spinlock_t _acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */
ACPI_EXTERN spinlock_t _acpi_ev_global_lock_pending_lock; /* For global lock */
#define acpi_gbl_gpe_lock &_acpi_gbl_gpe_lock
#define acpi_gbl_hardware_lock &_acpi_gbl_hardware_lock
#define acpi_ev_global_lock_pending_lock &_acpi_ev_global_lock_pending_lock
ACPI_EXTERN acpi_spinlock acpi_gbl_gpe_lock; /* For GPE data structs and registers */
ACPI_EXTERN acpi_spinlock acpi_gbl_hardware_lock; /* For ACPI H/W except GPE registers */
ACPI_EXTERN acpi_spinlock acpi_ev_global_lock_pending_lock; /* For global lock */

/*****************************************************************************
*
Expand Down
17 changes: 14 additions & 3 deletions drivers/acpi/acpica/utmutex.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,20 @@ acpi_status acpi_ut_mutex_initialize(void)

/* Create the spinlocks for use at interrupt level */

spin_lock_init(acpi_gbl_gpe_lock);
spin_lock_init(acpi_gbl_hardware_lock);
spin_lock_init(acpi_ev_global_lock_pending_lock);
status = acpi_os_create_lock (&acpi_gbl_gpe_lock);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}

status = acpi_os_create_lock (&acpi_gbl_hardware_lock);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}

status = acpi_os_create_lock (&acpi_ev_global_lock_pending_lock);
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}

/* Mutex for _OSI support */
status = acpi_os_create_mutex(&acpi_gbl_osi_mutex);
Expand Down

0 comments on commit 3854c8e

Please sign in to comment.