From: Jonathan Bergh Date: Sat, 30 Sep 2023 09:04:36 +0000 (+0200) Subject: ACPI: OSL: Add empty lines after local variable declarations X-Git-Tag: v6.7-rc1~158^2~5^3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1da3b78c08357f67adecf3b2e2be7d13aaccca7;p=thirdparty%2Fkernel%2Flinux.git ACPI: OSL: Add empty lines after local variable declarations Fix up four places where there is no empty line after declarations of local variables in a function (as per the kernel coding style). Signed-off-by: Jonathan Bergh [ rjw: Subject and changelog edits ] Signed-off-by: Rafael J. Wysocki --- diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 838677010cebd..e154ad0be263c 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -1067,6 +1067,7 @@ acpi_status acpi_os_execute(acpi_execute_type type, struct acpi_os_dpc *dpc; struct workqueue_struct *queue; int ret; + ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "Scheduling function [%p(%p)] for deferred execution.\n", function, context)); @@ -1522,6 +1523,7 @@ acpi_cpu_flags acpi_os_acquire_lock(acpi_spinlock lockp) __acquires(lockp) { acpi_cpu_flags flags; + spin_lock_irqsave(lockp, flags); return flags; } @@ -1708,6 +1710,7 @@ acpi_status acpi_os_prepare_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control) { int rc = 0; + if (__acpi_os_prepare_sleep) rc = __acpi_os_prepare_sleep(sleep_state, pm1a_control, pm1b_control); @@ -1730,6 +1733,7 @@ acpi_status acpi_os_prepare_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b) { int rc = 0; + if (__acpi_os_prepare_extended_sleep) rc = __acpi_os_prepare_extended_sleep(sleep_state, val_a, val_b);