Minimally intrusive patch to remove some overdesign in ACPI code. Based
on hch rant.
The only purpose of functions in question is to dynamically allocate
one global spinlock -- acpi_gbl_gpe_lock. Instead, create it in .bss.
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
---
It's tempting to shoot acpi_os_release_lock() et al too.
drivers/acpi/osl.c | 34 ----------------------------------
drivers/acpi/utilities/utmutex.c | 6 ++++--
include/acpi/acpiosxf.h | 4 ----
3 files changed, 4 insertions(+), 40 deletions(-)
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -659,40 +659,6 @@ void acpi_os_wait_events_complete(void *
EXPORT_SYMBOL(acpi_os_wait_events_complete);
-/*
- * Allocate the memory for a spinlock and initialize it.
- */
-acpi_status acpi_os_create_lock(acpi_handle * out_handle)
-{
- spinlock_t *lock_ptr;
-
- ACPI_FUNCTION_TRACE("os_create_lock");
-
- lock_ptr = acpi_os_allocate(sizeof(spinlock_t));
-
- spin_lock_init(lock_ptr);
-
- ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Creating spinlock[%p].\n", lock_ptr));
-
- *out_handle = lock_ptr;
-
- return_ACPI_STATUS(AE_OK);
-}
-
-/*
- * Deallocate the memory for a spinlock.
- */
-void acpi_os_delete_lock(acpi_handle handle)
-{
- ACPI_FUNCTION_TRACE("os_create_lock");
-
- ACPI_DEBUG_PRINT((ACPI_DB_MUTEX, "Deleting spinlock[%p].\n", handle));
-
- acpi_os_free(handle);
-
- return_VOID;
-}
-
acpi_status
acpi_os_create_semaphore(u32 max_units, u32 initial_units, acpi_handle * handle)
{
--- a/drivers/acpi/utilities/utmutex.c
+++ b/drivers/acpi/utilities/utmutex.c
@@ -51,6 +51,8 @@ static acpi_status acpi_ut_create_mutex(
static acpi_status acpi_ut_delete_mutex(acpi_mutex_handle mutex_id);
+static spinlock_t __acpi_gbl_gpe_lock;
+
/*******************************************************************************
*
* FUNCTION: acpi_ut_mutex_initialize
@@ -80,7 +82,8 @@ acpi_status acpi_ut_mutex_initialize(voi
}
}
- status = acpi_os_create_lock(&acpi_gbl_gpe_lock);
+ spin_lock_init(&__acpi_gbl_gpe_lock);
+ acpi_gbl_gpe_lock = &__acpi_gbl_gpe_lock;
return_ACPI_STATUS(status);
}
@@ -109,7 +112,6 @@ void acpi_ut_mutex_terminate(void)
(void)acpi_ut_delete_mutex(i);
}
- acpi_os_delete_lock(acpi_gbl_gpe_lock);
return_VOID;
}
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -104,10 +104,6 @@ acpi_status acpi_os_wait_semaphore(acpi_
acpi_status acpi_os_signal_semaphore(acpi_handle handle, u32 units);
-acpi_status acpi_os_create_lock(acpi_handle * out_handle);
-
-void acpi_os_delete_lock(acpi_handle handle);
-
acpi_cpu_flags acpi_os_acquire_lock(acpi_handle handle);
void acpi_os_release_lock(acpi_handle handle, acpi_cpu_flags flags);
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
