---

yaml --- r: 312741 b: refs/heads/master c: d202f77 h: refs/heads/master i: 312739: a32f101 v: v3
git-mirror · Jul 1, 2012 · d5dca9c · d5dca9c
1 parent 2bcda08
commit d5dca9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e579e2dd8f056cfeaf4d2b313a35ddafb3c4e531
+refs/heads/master: d202f77d2eb707d03a16adf952a397675cb2fc81
diff --git a/trunk/drivers/acpi/sbs.c b/trunk/drivers/acpi/sbs.c
@@ -988,25 +988,27 @@ static void acpi_sbs_rmdirs(void)
 #endif
 }
 
-static int acpi_sbs_resume(struct acpi_device *device)
+static int acpi_sbs_resume(struct device *dev)
 {
 	struct acpi_sbs *sbs;
-	if (!device)
+	if (!dev)
 		return -EINVAL;
-	sbs = device->driver_data;
+	sbs = to_acpi_device(dev)->driver_data;
 	acpi_sbs_callback(sbs);
 	return 0;
 }
 
+static SIMPLE_DEV_PM_OPS(acpi_sbs_pm, NULL, acpi_sbs_resume);
+
 static struct acpi_driver acpi_sbs_driver = {
 	.name = "sbs",
 	.class = ACPI_SBS_CLASS,
 	.ids = sbs_device_ids,
 	.ops = {
 		.add = acpi_sbs_add,
 		.remove = acpi_sbs_remove,
-		.resume = acpi_sbs_resume,
 		},
+	.drv.pm = &acpi_sbs_pm,
 };
 
 static int __init acpi_sbs_init(void)