Skip to contentSkip to conversation

ACPI / scan: fix fixed event handler return value

PATCH Applied Aaron Lu 2 participants 2 messages Mar 13, 2015 – Mar 18, 2015 ACPI

lore
Share & tools
lore

Aaron Lu

author
#0 lore raw

PATCH 1/1 ACPI / scan: fix fixed event handler return value

The fixed event handler should return a value that is either 0 or 1 meanning if the event is handled or not, instead of an acpi_status to mean if the handler runs well or not.

Suggested-by Lv Zheng <[email protected]>
Signed-off-by Aaron Lu <[email protected]>
---
 drivers/acpi/scan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/scan.c +2 -2
index bbca7830e18a..3e5a2768c3b4 100644
@@ -1062,10 +1062,10 @@ static void acpi_device_notify_fixed(void *data)
 	acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
 }
 
-static acpi_status acpi_device_fixed_event(void *data)
+static u32 acpi_device_fixed_event(void *data)
 {
 	acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
-	return AE_OK;
+	return ACPI_INTERRUPT_HANDLED;
 }
 
 static int acpi_device_install_notify_handler(struct acpi_device *device)
Signature · 1 line
2.1.0
Applied
#1 lore raw
Quoted 6 lines · Aaron Lu

The fixed event handler should return a value that is either 0 or 1 meanning if the event is handled or not, instead of an acpi_status to mean if the handler runs well or not.

Suggested-by Lv Zheng <[email protected]>
Signed-off-by Aaron Lu <[email protected]>

Queued up for 4.1, thanks!

Quoted 22 lines
---
 drivers/acpi/scan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/acpi/scan.c +2 -2
index bbca7830e18a..3e5a2768c3b4 100644
@@ -1062,10 +1062,10 @@ static void acpi_device_notify_fixed(void *data)
 	acpi_device_notify(NULL, ACPI_FIXED_HARDWARE_EVENT, device);
 }
 
-static acpi_status acpi_device_fixed_event(void *data)
+static u32 acpi_device_fixed_event(void *data)
 {
 	acpi_os_execute(OSL_NOTIFY_HANDLER, acpi_device_notify_fixed, data);
-	return AE_OK;
+	return ACPI_INTERRUPT_HANDLED;
 }
 
 static int acpi_device_install_notify_handler(struct acpi_device *device)
Signature · 2 lines
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.