diff mbox

ACPI / scan: fix fixed event handler return value

Message ID 20150313055250.GA23305@aaronlu.sh.intel.com (mailing list archive)
State Accepted, archived
Delegated to: Rafael Wysocki
Headers show

Commit Message

Aaron Lu March 13, 2015, 5:52 a.m. UTC
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 <lv.zheng@intel.com>
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
---
 drivers/acpi/scan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Rafael J. Wysocki March 18, 2015, 3:27 p.m. UTC | #1
On Friday, March 13, 2015 01:52:50 PM Aaron Lu wrote:
> 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 <lv.zheng@intel.com>
> Signed-off-by: Aaron Lu <aaron.lu@intel.com>

Queued up for 4.1, thanks!

> ---
>  drivers/acpi/scan.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index bbca7830e18a..3e5a2768c3b4 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -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)
>
diff mbox

Patch

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index bbca7830e18a..3e5a2768c3b4 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -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)