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

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

sony-laptop: Use struct dev_pm_ops for power management 



Make the sony-laptop 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 4ce05b42

drivers/platform/x86/sony-laptop.c

+12 −8
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ static void sony_nc_function_resume(void) 
				&result);

}



static int sony_nc_resume(struct acpi_device *device)

static int sony_nc_resume(struct device *dev)

{

	struct sony_nc_value *item;

	acpi_handle handle;
@@ -1484,6 +1484,8 @@ static int sony_nc_resume(struct acpi_device *device) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(sony_nc_pm, NULL, sony_nc_resume);



static void sony_nc_rfkill_cleanup(void)

{

	int i;
@@ -2728,9 +2730,9 @@ static struct acpi_driver sony_nc_driver = { 
	.ops = {

		.add = sony_nc_add,

		.remove = sony_nc_remove,

		.resume = sony_nc_resume,

		.notify = sony_nc_notify,

		},

	.drv.pm = &sony_nc_pm,

};



/*********** SPIC (SNY6001) Device ***********/
@@ -4243,19 +4245,22 @@ static int sony_pic_add(struct acpi_device *device) 
	return result;

}



static int sony_pic_suspend(struct acpi_device *device)

static int sony_pic_suspend(struct device *dev)

{

	if (sony_pic_disable(device))

	if (sony_pic_disable(to_acpi_device(dev)))

		return -ENXIO;

	return 0;

}



static int sony_pic_resume(struct acpi_device *device)

static int sony_pic_resume(struct device *dev)

{

	sony_pic_enable(device, spic_dev.cur_ioport, spic_dev.cur_irq);

	sony_pic_enable(to_acpi_device(dev),

			spic_dev.cur_ioport, spic_dev.cur_irq);

	return 0;

}



static SIMPLE_DEV_PM_OPS(sony_pic_pm, sony_pic_suspend, sony_pic_resume);



static const struct acpi_device_id sony_pic_device_ids[] = {

	{SONY_PIC_HID, 0},

	{"", 0},
@@ -4269,9 +4274,8 @@ static struct acpi_driver sony_pic_driver = { 
	.ops = {

		.add = sony_pic_add,

		.remove = sony_pic_remove,

		.suspend = sony_pic_suspend,

		.resume = sony_pic_resume,

		},

	.drv.pm = &sony_pic_pm,

};



static struct dmi_system_id __initdata sonypi_dmi_table[] = {