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

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

olpc-xo15-sci: Use struct dev_pm_ops for power management 



Make the OLPC XO15 SCI driver define its resume callback through
a struct dev_pm_ops object rather than by using a legacy PM hook
in struct acpi_device_ops.

Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
parent d91ee328

arch/x86/platform/olpc/olpc-xo15-sci.c

+4 −2
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static int xo15_sci_remove(struct acpi_device *device, int type) 
	return 0;

}



static int xo15_sci_resume(struct acpi_device *device)

static int xo15_sci_resume(struct device *dev)

{

	/* Enable all EC events */

	olpc_ec_mask_write(EC_SCI_SRC_ALL);
@@ -215,6 +215,8 @@ static int xo15_sci_resume(struct acpi_device *device) 
	return 0;

}



static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume);



static const struct acpi_device_id xo15_sci_device_ids[] = {

	{"XO15EC", 0},

	{"", 0},
@@ -227,8 +229,8 @@ static struct acpi_driver xo15_sci_drv = { 
	.ops = {

		.add = xo15_sci_add,

		.remove = xo15_sci_remove,

		.resume = xo15_sci_resume,

	},

	.drv.pm = &xo15_sci_pm,

};



static int __init xo15_sci_init(void)