Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c561162f authored by Stelian Pop's avatar Stelian Pop Committed by Len Brown
Browse files

sony_acpi: Add acpi_bus_generate event 



Added acpi_bus_generate event for forwarding Fn-keys pressed to acpi subsystem,
and made correspondent necessary changes for this to work.

Signed-off-by: default avatarNilton Volpato <nilton.volpato@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarMattia Dongili <malattia@linux.it>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 82c47731

drivers/acpi/sony_acpi.c

+28 −25
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ MODULE_PARM_DESC(debug, "set this to 1 (and RTFM) if you want to help " 


static acpi_handle sony_acpi_handle;

static struct proc_dir_entry *sony_acpi_dir;

static struct acpi_device *sony_acpi_acpi_device = NULL;



static int sony_backlight_update_status(struct backlight_device *bd);

static int sony_backlight_get_brightness(struct backlight_device *bd);
@@ -270,7 +271,9 @@ static int sony_acpi_resume(struct acpi_device *device) 


static void sony_acpi_notify(acpi_handle handle, u32 event, void *data)

{

	printk(LOG_PFX "sony_acpi_notify\n");

	if (debug)

		printk(LOG_PFX "sony_acpi_notify, event: %d\n", event);

	acpi_bus_generate_event(sony_acpi_acpi_device, 1, event);

}



static acpi_status sony_walk_callback(acpi_handle handle, u32 level,
@@ -295,6 +298,8 @@ static int sony_acpi_add(struct acpi_device *device) 
	acpi_handle handle;

	struct sony_acpi_value *item;



	sony_acpi_acpi_device = device;



	sony_acpi_handle = device->handle;



	acpi_driver_data(device) = NULL;
@@ -308,6 +313,7 @@ static int sony_acpi_add(struct acpi_device *device) 
			result = -ENODEV;

			goto outwalk;

		}

	}



	status = acpi_install_notify_handler(sony_acpi_handle,

					     ACPI_DEVICE_NOTIFY,
@@ -318,7 +324,6 @@ static int sony_acpi_add(struct acpi_device *device) 
		result = -ENODEV;

		goto outnotify;

	}

	}



	if (ACPI_SUCCESS(acpi_get_handle(sony_acpi_handle, "GBRT", &handle))) {

		sony_backlight_device = backlight_device_register("sony", NULL,
@@ -342,7 +347,7 @@ static int sony_acpi_add(struct acpi_device *device) 
		    		 item->acpiset, &handle)))

		    	continue;



		item->proc = create_proc_entry(item->name, 0600,

		item->proc = create_proc_entry(item->name, 0666,

					       acpi_device_dir(device));

		if (!item->proc) {

			printk(LOG_PFX "unable to create proc entry\n");
@@ -361,13 +366,11 @@ static int sony_acpi_add(struct acpi_device *device) 
	return 0;



outproc:

	if (debug) {

	status = acpi_remove_notify_handler(sony_acpi_handle,

					    ACPI_DEVICE_NOTIFY,

					    sony_acpi_notify);

	if (ACPI_FAILURE(status))

		printk(LOG_PFX "unable to remove notify handler\n");

	}

outnotify:

	for (item = sony_acpi_values; item->name; ++item)

		if (item->proc)
@@ -384,13 +387,13 @@ static int sony_acpi_remove(struct acpi_device *device, int type) 
	if (sony_backlight_device)

		backlight_device_unregister(sony_backlight_device);



	if (debug) {

	sony_acpi_acpi_device = NULL;



	status = acpi_remove_notify_handler(sony_acpi_handle,

					    ACPI_DEVICE_NOTIFY,

					    sony_acpi_notify);

	if (ACPI_FAILURE(status))

		printk(LOG_PFX "unable to remove notify handler\n");

	}



	for (item = sony_acpi_values; item->name; ++item)

		if (item->proc)