Subject: [PATCH] [acpi battery] Convert event handling - Convert handler to new type - Add declaration of battery events Signed-off-by: Patrick Mochel --- drivers/acpi/drivers/battery/event.c | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 deletions(-) applies-to: 341706fd8d86df607cad8411603df12ca15ad6c8 450c637d7e7f97a4fe859ddae44616a97f1d7ebd diff --git a/drivers/acpi/drivers/battery/event.c b/drivers/acpi/drivers/battery/event.c index bdd91a2..4853023 100644 --- a/drivers/acpi/drivers/battery/event.c +++ b/drivers/acpi/drivers/battery/event.c @@ -9,25 +9,16 @@ #include #include "battery.h" -static void battery_notify(acpi_handle handle, u32 event, void * data) +static int battery_notify(struct acpi_dev * ad, u32 event, int * data) { - struct acpi_battery * ab = data; + struct acpi_battery * ab = dev_get_drvdata(&ad->dev); - ACPI_FUNCTION_TRACE(__FUNCTION__); - - switch (event) { - case ACPI_BATTERY_NOTIFY_STATUS: - case ACPI_BATTERY_NOTIFY_INFO: - battery_check(ab); - acpi_bus_generate_event(ab->b_ad->acpi_device, - event, ab->b_present); - break; - default: - dbg("Unsupported event [%#x]", event); - break; - } - return_VOID; + battery_check(ab); + *data = ab->b_present; + return 0; } - +declare_acpi_events(battery, + acpi_event_raise(ACPI_BATTERY_NOTIFY_STATUS), + acpi_event_raise(ACPI_BATTERY_NOTIFY_INFO)); acpi_device_event(battery); --- 0.99.9.GIT