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

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

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



Make the ACPI power resource 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 1be532de

drivers/acpi/power.c

+8 −4
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ ACPI_MODULE_NAME("power"); 




static int acpi_power_add(struct acpi_device *device);

static int acpi_power_add(struct acpi_device *device);

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

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

static int acpi_power_resume(struct acpi_device *device);





static const struct acpi_device_id power_device_ids[] = {

static const struct acpi_device_id power_device_ids[] = {

	{ACPI_POWER_HID, 0},

	{ACPI_POWER_HID, 0},
@@ -68,6 +67,9 @@ static const struct acpi_device_id power_device_ids[] = { 
};

};

MODULE_DEVICE_TABLE(acpi, power_device_ids);

MODULE_DEVICE_TABLE(acpi, power_device_ids);





static int acpi_power_resume(struct device *dev);

static SIMPLE_DEV_PM_OPS(acpi_power_pm, NULL, acpi_power_resume);



static struct acpi_driver acpi_power_driver = {

static struct acpi_driver acpi_power_driver = {

	.name = "power",

	.name = "power",

	.class = ACPI_POWER_CLASS,

	.class = ACPI_POWER_CLASS,
@@ -75,8 +77,8 @@ static struct acpi_driver acpi_power_driver = { 
	.ops = {

	.ops = {

		.add = acpi_power_add,

		.add = acpi_power_add,

		.remove = acpi_power_remove,

		.remove = acpi_power_remove,

		.resume = acpi_power_resume,

		},

		},

	.drv.pm = &acpi_power_pm,

};

};





/*

/*
@@ -771,14 +773,16 @@ static int acpi_power_remove(struct acpi_device *device, int type) 
	return 0;

	return 0;

}

}





static int acpi_power_resume(struct acpi_device *device)

static int acpi_power_resume(struct device *dev)

{

{

	int result = 0, state;

	int result = 0, state;

	struct acpi_device *device;

	struct acpi_power_resource *resource;

	struct acpi_power_resource *resource;





	if (!device)

	if (!dev)

		return -EINVAL;

		return -EINVAL;





	device = to_acpi_device(dev);

	resource = acpi_driver_data(device);

	resource = acpi_driver_data(device);

	if (!resource)

	if (!resource)

		return -EINVAL;

		return -EINVAL;