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

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

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



Make the ACPI thermal 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 62fcbdd9

drivers/acpi/thermal.c

+10 −7
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ MODULE_PARM_DESC(psv, "Disable or override all passive trip points."); 


static int acpi_thermal_add(struct acpi_device *device);

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

static int acpi_thermal_resume(struct acpi_device *device);

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



static const struct acpi_device_id  thermal_device_ids[] = {
@@ -107,6 +106,9 @@ static const struct acpi_device_id thermal_device_ids[] = { 
};

MODULE_DEVICE_TABLE(acpi, thermal_device_ids);



static int acpi_thermal_resume(struct device *dev);

static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume);



static struct acpi_driver acpi_thermal_driver = {

	.name = "thermal",

	.class = ACPI_THERMAL_CLASS,
@@ -114,9 +116,9 @@ static struct acpi_driver acpi_thermal_driver = { 
	.ops = {

		.add = acpi_thermal_add,

		.remove = acpi_thermal_remove,

		.resume = acpi_thermal_resume,

		.notify = acpi_thermal_notify,

		},

	.drv.pm = &acpi_thermal_pm,

};



struct acpi_thermal_state {
@@ -1041,16 +1043,17 @@ static int acpi_thermal_remove(struct acpi_device *device, int type) 
	return 0;

}



static int acpi_thermal_resume(struct acpi_device *device)

static int acpi_thermal_resume(struct device *dev)

{

	struct acpi_thermal *tz = NULL;

	struct acpi_thermal *tz;

	int i, j, power_state, result;





	if (!device || !acpi_driver_data(device))

	if (!dev)

		return -EINVAL;



	tz = acpi_driver_data(device);

	tz = acpi_driver_data(to_acpi_device(dev));

	if (!tz)

		return -EINVAL;



	for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) {

		if (!(&tz->trips.active[i]))