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

Commit a6f50dc8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: Use struct dev_pm_ops for power management in the battery driver 



Make the ACPI battery driver define its PM callbacks through
a struct dev_pm_ops object rather than by using legacy PM hooks
in struct acpi_device_ops.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent ccda7069

drivers/acpi/battery.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -1044,17 +1044,24 @@ static int acpi_battery_remove(struct acpi_device *device, int type) 
}

}





/* this is needed to learn about changes made in suspended state */

/* this is needed to learn about changes made in suspended state */

static int acpi_battery_resume(struct acpi_device *device)

static int acpi_battery_resume(struct device *dev)

{

{

	struct acpi_battery *battery;

	struct acpi_battery *battery;

	if (!device)



	if (!dev)

		return -EINVAL;

		return -EINVAL;

	battery = acpi_driver_data(device);



	battery = acpi_driver_data(to_acpi_device(dev));

	if (!battery)

		return -EINVAL;



	battery->update_time = 0;

	battery->update_time = 0;

	acpi_battery_update(battery);

	acpi_battery_update(battery);

	return 0;

	return 0;

}

}





static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);



static struct acpi_driver acpi_battery_driver = {

static struct acpi_driver acpi_battery_driver = {

	.name = "battery",

	.name = "battery",

	.class = ACPI_BATTERY_CLASS,

	.class = ACPI_BATTERY_CLASS,
@@ -1062,10 +1069,10 @@ static struct acpi_driver acpi_battery_driver = { 
	.flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,

	.flags = ACPI_DRIVER_ALL_NOTIFY_EVENTS,

	.ops = {

	.ops = {

		.add = acpi_battery_add,

		.add = acpi_battery_add,

		.resume = acpi_battery_resume,

		.remove = acpi_battery_remove,

		.remove = acpi_battery_remove,

		.notify = acpi_battery_notify,

		.notify = acpi_battery_notify,

		},

		},

	.drv.pm = &acpi_battery_pm,

};

};





static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)

static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)