Messages in this thread Patch in this message | | | Date | Sat, 14 Jan 2006 17:14:00 +0100 | From | Ingo Molnar <> | Subject | [patch 2.6.15-mm4] sem2mutex: acpi, acpi_link_lock |
| |
From: Ingo Molnar <mingo@elte.hu>
semaphore to mutex conversion.
the conversion was generated via scripts, and the result was validated automatically via a script as well.
build tested.
Signed-off-by: Ingo Molnar <mingo@elte.hu> ----
drivers/acpi/pci_link.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-)
Index: linux/drivers/acpi/pci_link.c =================================================================== --- linux.orig/drivers/acpi/pci_link.c +++ linux/drivers/acpi/pci_link.c @@ -38,6 +38,7 @@ #include <linux/spinlock.h> #include <linux/pm.h> #include <linux/pci.h> +#include <linux/mutex.h> #include <acpi/acpi_bus.h> #include <acpi/acpi_drivers.h> @@ -91,7 +92,7 @@ static struct { int count; struct list_head entries; } acpi_link; -DECLARE_MUTEX(acpi_link_lock); +DEFINE_MUTEX(acpi_link_lock); /* -------------------------------------------------------------------------- PCI Link Device Management @@ -639,19 +640,19 @@ acpi_pci_link_allocate_irq(acpi_handle h return_VALUE(-1); } - down(&acpi_link_lock); + mutex_lock(&acpi_link_lock); if (acpi_pci_link_allocate(link)) { - up(&acpi_link_lock); + mutex_unlock(&acpi_link_lock); return_VALUE(-1); } if (!link->irq.active) { - up(&acpi_link_lock); + mutex_unlock(&acpi_link_lock); ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Link active IRQ is 0!\n")); return_VALUE(-1); } link->refcnt++; - up(&acpi_link_lock); + mutex_unlock(&acpi_link_lock); if (triggering) *triggering = link->irq.triggering; @@ -689,9 +690,9 @@ int acpi_pci_link_free_irq(acpi_handle h return_VALUE(-1); } - down(&acpi_link_lock); + mutex_lock(&acpi_link_lock); if (!link->irq.initialized) { - up(&acpi_link_lock); + mutex_unlock(&acpi_link_lock); ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Link isn't initialized\n")); return_VALUE(-1); } @@ -714,7 +715,7 @@ int acpi_pci_link_free_irq(acpi_handle h if (link->refcnt == 0) { acpi_ut_evaluate_object(link->handle, "_DIS", 0, NULL); } - up(&acpi_link_lock); + mutex_unlock(&acpi_link_lock); return_VALUE(link->irq.active); } @@ -745,7 +746,7 @@ static int acpi_pci_link_add(struct acpi strcpy(acpi_device_class(device), ACPI_PCI_LINK_CLASS); acpi_driver_data(device) = link; - down(&acpi_link_lock); + mutex_lock(&acpi_link_lock); result = acpi_pci_link_get_possible(link); if (result) goto end; @@ -780,7 +781,7 @@ static int acpi_pci_link_add(struct acpi end: /* disable all links -- to be activated on use */ acpi_ut_evaluate_object(link->handle, "_DIS", 0, NULL); - up(&acpi_link_lock); + mutex_unlock(&acpi_link_lock); if (result) kfree(link); @@ -835,9 +836,9 @@ static int acpi_pci_link_remove(struct a link = (struct acpi_pci_link *)acpi_driver_data(device); - down(&acpi_link_lock); + mutex_lock(&acpi_link_lock); list_del(&link->node); - up(&acpi_link_lock); + mutex_unlock(&acpi_link_lock); kfree(link); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |