leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
This commit is contained in:
Rafael J. Wysocki
2012-07-12 22:36:28 +02:00
parent d91ee328c1
commit 18468843fa
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/platform/olpc/olpc-xo15-sci.c
View File

@@ -203,7 +203,7 @@ static int xo15_sci_remove(struct acpi_device *device, int type)
return 0; return 0;
} }
static int xo15_sci_resume(struct acpi_device *device) static int xo15_sci_resume(struct device *dev)
{ {
/* Enable all EC events */ /* Enable all EC events */
olpc_ec_mask_write(EC_SCI_SRC_ALL); olpc_ec_mask_write(EC_SCI_SRC_ALL);
@@ -215,6 +215,8 @@ static int xo15_sci_resume(struct acpi_device *device)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(xo15_sci_pm, NULL, xo15_sci_resume);
static const struct acpi_device_id xo15_sci_device_ids[] = { static const struct acpi_device_id xo15_sci_device_ids[] = {
{"XO15EC", 0}, {"XO15EC", 0},
{"", 0}, {"", 0},
@@ -227,8 +229,8 @@ static struct acpi_driver xo15_sci_drv = {
.ops = { .ops = {
.add = xo15_sci_add, .add = xo15_sci_add,
.remove = xo15_sci_remove, .remove = xo15_sci_remove,
.resume = xo15_sci_resume,
}, },
.drv.pm = &xo15_sci_pm,
}; };
static int __init xo15_sci_init(void) static int __init xo15_sci_init(void)