> This patch adds a .notify() method. The presence of .notify() causes
> Linux/ACPI to manage event handlers and notify handlers on our behalf,
> so we don't have to install and remove them ourselves.
>
> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@xxxxxx>
> CC: Jonathan Woithe <jwoithe@xxxxxxxxxxxxxxxxxxxxxxx>
> CC: Tony Vroon <tony@xxxxxxxx>
This patch looks fine to me for a Fujitsu S7020 laptop. Thanks Bjorn.
Acked-by: Jonathan Woithe <jwoithe@xxxxxxxxxxxxxxxxxxxxxxx>
Regards
jonathan
> ---
> drivers/platform/x86/fujitsu-laptop.c | 28 ++++------------------------
> 1 files changed, 4 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
> index 45940f3..10f8796 100644
> --- a/drivers/platform/x86/fujitsu-laptop.c
> +++ b/drivers/platform/x86/fujitsu-laptop.c
> @@ -203,7 +203,7 @@ struct led_classdev kblamps_led = {
> static u32 dbg_level = 0x03;
> #endif
>
> -static void acpi_fujitsu_notify(acpi_handle handle, u32 event, void *data);
> +static void acpi_fujitsu_notify(struct acpi_device *device, u32 event);
>
> /* Fujitsu ACPI interface function */
>
> @@ -658,7 +658,6 @@ static struct dmi_system_id fujitsu_dmi_table[] = {
>
> static int acpi_fujitsu_add(struct acpi_device *device)
> {
> - acpi_status status;
> acpi_handle handle;
> int result = 0;
> int state = 0;
> @@ -673,20 +672,10 @@ static int acpi_fujitsu_add(struct acpi_device *device)
> sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS);
> device->driver_data = fujitsu;
>
> - status = acpi_install_notify_handler(device->handle,
> - ACPI_DEVICE_NOTIFY,
> - acpi_fujitsu_notify, fujitsu);
> -
> - if (ACPI_FAILURE(status)) {
> - printk(KERN_ERR "Error installing notify handler\n");
> - error = -ENODEV;
> - goto err_stop;
> - }
> -
> fujitsu->input = input = input_allocate_device();
> if (!input) {
> error = -ENOMEM;
> - goto err_uninstall_notify;
> + goto err_stop;
> }
>
> snprintf(fujitsu->phys, sizeof(fujitsu->phys),
> @@ -743,9 +732,6 @@ static int acpi_fujitsu_add(struct acpi_device *device)
> end:
> err_free_input_dev:
> input_free_device(input);
> -err_uninstall_notify:
> - acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY,
> - acpi_fujitsu_notify);
> err_stop:
>
> return result;
> @@ -753,7 +739,6 @@ err_stop:
>
> static int acpi_fujitsu_remove(struct acpi_device *device, int type)
> {
> - acpi_status status;
> struct fujitsu_t *fujitsu = NULL;
>
> if (!device || !acpi_driver_data(device))
> @@ -761,10 +746,6 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
>
> fujitsu = acpi_driver_data(device);
>
> - status = acpi_remove_notify_handler(fujitsu->acpi_handle,
> - ACPI_DEVICE_NOTIFY,
> - acpi_fujitsu_notify);
> -
> if (!device || !acpi_driver_data(device))
> return -EINVAL;
>
> @@ -775,7 +756,7 @@ static int acpi_fujitsu_remove(struct acpi_device *device, int type)
>
> /* Brightness notify */
>
> -static void acpi_fujitsu_notify(acpi_handle handle, u32 event, void *data)
> +static void acpi_fujitsu_notify(struct acpi_device *device, u32 event)
> {
> struct input_dev *input;
> int keycode;
> @@ -829,8 +810,6 @@ static void acpi_fujitsu_notify(acpi_handle handle, u32 event, void *data)
> input_report_key(input, keycode, 0);
> input_sync(input);
> }
> -
> - return;
> }
>
> /* ACPI device for hotkey handling */
> @@ -1107,6 +1086,7 @@ static struct acpi_driver acpi_fujitsu_driver = {
> .ops = {
> .add = acpi_fujitsu_add,
> .remove = acpi_fujitsu_remove,
> + .notify = acpi_fujitsu_notify,
> },
> };
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
