Re: [PATCH 09/10] sony-laptop: use .notify method instead of installing handler directly

[Mattia Dongili <malattia@linux.it>]

On Mon, Mar 30, 2009 at 11:48:54AM -0600, Bjorn Helgaas wrote:
> 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@hp.com>
> CC: Mattia Dongili <malattia@linux.it>

looks fine to me, the only thing is that the first 3 hunks may not apply
(cleanly?) due to a few recent changes not yet in Linus tree (but in
Len's).

Feel free to add my
Signed-off-by: Mattia Dongili <malattia@linux.it>

> ---
>  drivers/platform/x86/sony-laptop.c |   32 +++++---------------------------
>  1 files changed, 5 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
> index bc8996c..be98b1f 100644
> --- a/drivers/platform/x86/sony-laptop.c
> +++ b/drivers/platform/x86/sony-laptop.c
> @@ -895,7 +895,7 @@ static const struct dmi_system_id sony_nc_ids[] = {
>  /*
>   * ACPI callbacks
>   */
> -static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
> +static void sony_nc_notify(struct acpi_device *device, u32 event)
>  {
>  	struct sony_nc_event *evmap;
>  	u32 ev = event;
> @@ -913,8 +913,8 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
>  		 * TODO: we may want to do the same for the older GHKE -need
>  		 *       dmi list- so this snippet may become one more callback.
>  		 */
> -		if (acpi_callsetfunc(handle, "SN07", 0x0202, &result) < 0)
> -			dprintk("sony_acpi_notify, unable to decode event 0x%.2x\n", ev);
> +		if (acpi_callsetfunc(sony_nc_acpi_handle, "SN07", 0x0202, &result) < 0)
> +			dprintk("sony_nc_notify, unable to decode event 0x%.2x\n", ev);
>  		else
>  			ev = result & 0xFF;
>  	}
> @@ -927,7 +927,7 @@ static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)
>  			}
>  		}
>  
> -	dprintk("sony_acpi_notify, event: 0x%.2x\n", ev);
> +	dprintk("sony_nc_notify, event: 0x%.2x\n", ev);
>  	sony_laptop_report_input_event(ev);
>  	acpi_bus_generate_proc_event(sony_nc_acpi_device, 1, ev);
>  }
> @@ -1032,15 +1032,6 @@ static int sony_nc_add(struct acpi_device *device)
>  		goto outwalk;
>  	}
>  
> -	status = acpi_install_notify_handler(sony_nc_acpi_handle,
> -					     ACPI_DEVICE_NOTIFY,
> -					     sony_acpi_notify, NULL);
> -	if (ACPI_FAILURE(status)) {
> -		printk(KERN_WARNING DRV_PFX "unable to install notify handler (%u)\n", status);
> -		result = -ENODEV;
> -		goto outinput;
> -	}
> -
>  	if (acpi_video_backlight_support()) {
>  		printk(KERN_INFO DRV_PFX "brightness ignored, must be "
>  		       "controlled by ACPI video driver\n");
> @@ -1121,13 +1112,6 @@ static int sony_nc_add(struct acpi_device *device)
>  	if (sony_backlight_device)
>  		backlight_device_unregister(sony_backlight_device);
>  
> -	status = acpi_remove_notify_handler(sony_nc_acpi_handle,
> -					    ACPI_DEVICE_NOTIFY,
> -					    sony_acpi_notify);
> -	if (ACPI_FAILURE(status))
> -		printk(KERN_WARNING DRV_PFX "unable to remove notify handler\n");
> -
> -      outinput:
>  	sony_laptop_remove_input();
>  
>        outwalk:
> @@ -1136,7 +1120,6 @@ static int sony_nc_add(struct acpi_device *device)
>  
>  static int sony_nc_remove(struct acpi_device *device, int type)
>  {
> -	acpi_status status;
>  	struct sony_nc_value *item;
>  
>  	if (sony_backlight_device)
> @@ -1144,12 +1127,6 @@ static int sony_nc_remove(struct acpi_device *device, int type)
>  
>  	sony_nc_acpi_device = NULL;
>  
> -	status = acpi_remove_notify_handler(sony_nc_acpi_handle,
> -					    ACPI_DEVICE_NOTIFY,
> -					    sony_acpi_notify);
> -	if (ACPI_FAILURE(status))
> -		printk(KERN_WARNING DRV_PFX "unable to remove notify handler\n");
> -
>  	for (item = sony_nc_values; item->name; ++item) {
>  		device_remove_file(&sony_pf_device->dev, &item->devattr);
>  	}
> @@ -1182,6 +1159,7 @@ static struct acpi_driver sony_nc_driver = {
>  		.add = sony_nc_add,
>  		.remove = sony_nc_remove,
>  		.resume = sony_nc_resume,
> +		.notify = sony_nc_notify,
>  		},
>  };
>  
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 
-- 
mattia
:wq!