Commit 543a2d11 authored by Michal Wilczynski's avatar Michal Wilczynski Committed by Rafael J. Wysocki
Browse files

ACPI: AC: Install Notify() handler directly 



Modify the ACPI AC driver to install its own Notify() handler directly
instead of providing an ACPI driver .notify() callback.

This will allow the ACPI driver .notify() callback to be eliminated and
it will allow the AC driver to be switched over to a platform one in the
future.

Suggested-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarMichal Wilczynski <michal.wilczynski@intel.com>
[ rjw: Subject and changelog edits, whitespace adjustments ]
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 0d167101

drivers/acpi/ac.c

+19 −8
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ MODULE_LICENSE("GPL"); 


static int acpi_ac_add(struct acpi_device *device);

static void acpi_ac_remove(struct acpi_device *device);

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

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



static const struct acpi_device_id ac_device_ids[] = {

	{"ACPI0003", 0},
@@ -54,11 +54,9 @@ 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,

		.notify = acpi_ac_notify,

		},

	.drv.pm = &acpi_ac_pm,

};
@@ -128,8 +126,9 @@ static enum power_supply_property ac_props[] = { 
};



/* Driver Model */

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

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

{

	struct acpi_device *device = data;

	struct acpi_ac *ac = acpi_driver_data(device);



	if (!ac)
@@ -235,7 +234,7 @@ static int acpi_ac_add(struct acpi_device *device) 


	result = acpi_ac_get_state(ac);

	if (result)

		goto end;

		goto err_release_ac;



	psy_cfg.drv_data = ac;
@@ -248,7 +247,7 @@ static int acpi_ac_add(struct acpi_device *device) 
					    &ac->charger_desc, &psy_cfg);

	if (IS_ERR(ac->charger)) {

		result = PTR_ERR(ac->charger);

		goto end;

		goto err_release_ac;

	}



	pr_info("%s [%s] (%s)\n", acpi_device_name(device),
@@ -256,8 +255,18 @@ static int acpi_ac_add(struct acpi_device *device) 


	ac->battery_nb.notifier_call = acpi_ac_battery_notify;

	register_acpi_notifier(&ac->battery_nb);

end:



	result = acpi_dev_install_notify_handler(device, ACPI_ALL_NOTIFY,

						 acpi_ac_notify);

	if (result)

		goto err_unregister;



	return 0;



err_unregister:

	power_supply_unregister(ac->charger);

	unregister_acpi_notifier(&ac->battery_nb);

err_release_ac:

	kfree(ac);



	return result;
@@ -297,6 +306,8 @@ static void acpi_ac_remove(struct acpi_device *device) 


	ac = acpi_driver_data(device);



	acpi_dev_remove_notify_handler(device, ACPI_ALL_NOTIFY,

				       acpi_ac_notify);

	power_supply_unregister(ac->charger);

	unregister_acpi_notifier(&ac->battery_nb);