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

Commit 48fe1127 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

ACPI: ac: use .notify method instead of installing handler directly 



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.

This driver apparently relies on seeing ALL notify events, not just
device-specific ones (because it used ACPI_ALL_NOTIFY).  We use the
ACPI_DRIVER_ALL_NOTIFY_EVENTS driver flag to request all events.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
CC: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 6d278131

drivers/acpi/ac.c

+5 −15
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static int acpi_ac_open_fs(struct inode *inode, struct file *file); 
static int acpi_ac_add(struct acpi_device *device);

static int acpi_ac_remove(struct acpi_device *device, int type);

static int acpi_ac_resume(struct acpi_device *device);

static void acpi_ac_notify(struct acpi_device *device, u32 event);



static const struct acpi_device_id ac_device_ids[] = {

	{"ACPI0003", 0},
@@ -72,10 +73,12 @@ static struct acpi_driver acpi_ac_driver = { 
	.name = "ac",

	.class = ACPI_AC_CLASS,

	.ids = ac_device_ids,

	.flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,

	.ops = {

		.add = acpi_ac_add,

		.remove = acpi_ac_remove,

		.resume = acpi_ac_resume,

		.notify = acpi_ac_notify,

		},

};
@@ -220,16 +223,14 @@ static int acpi_ac_remove_fs(struct acpi_device *device) 
                                   Driver Model

   -------------------------------------------------------------------------- */



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

static void acpi_ac_notify(struct acpi_device *device, u32 event)

{

	struct acpi_ac *ac = data;

	struct acpi_device *device = NULL;

	struct acpi_ac *ac = acpi_driver_data(device);





	if (!ac)

		return;



	device = ac->device;

	switch (event) {

	default:

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
@@ -253,7 +254,6 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) 
static int acpi_ac_add(struct acpi_device *device)

{

	int result = 0;

	acpi_status status = AE_OK;

	struct acpi_ac *ac = NULL;
@@ -286,13 +286,6 @@ static int acpi_ac_add(struct acpi_device *device) 
	ac->charger.get_property = get_ac_property;

	power_supply_register(&ac->device->dev, &ac->charger);

#endif

	status = acpi_install_notify_handler(device->handle,

					     ACPI_ALL_NOTIFY, acpi_ac_notify,

					     ac);

	if (ACPI_FAILURE(status)) {

		result = -ENODEV;

		goto end;

	}



	printk(KERN_INFO PREFIX "%s [%s] (%s)\n",

	       acpi_device_name(device), acpi_device_bid(device),
@@ -328,7 +321,6 @@ static int acpi_ac_resume(struct acpi_device *device) 


static int acpi_ac_remove(struct acpi_device *device, int type)

{

	acpi_status status = AE_OK;

	struct acpi_ac *ac = NULL;
@@ -337,8 +329,6 @@ static int acpi_ac_remove(struct acpi_device *device, int type) 


	ac = acpi_driver_data(device);



	status = acpi_remove_notify_handler(device->handle,

					    ACPI_ALL_NOTIFY, acpi_ac_notify);

#ifdef CONFIG_ACPI_SYSFS_POWER

	if (ac->charger.dev)

		power_supply_unregister(&ac->charger);