From b50e3d97b5e3695bbe6337ea4e914d874481f028 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Wed, 27 Jun 2012 23:26:18 +0200 Subject: [PATCH] --- yaml --- r: 312735 b: refs/heads/master c: 167cffb646aa4a7f3267b07eae1af16b54bc0e9b h: refs/heads/master i: 312733: 82ec47498292cb22af0894d7f566a2932645903b 312731: 30e68f8df2febf70a230774359fd5a0bc6927e34 312727: eab5610956bb356153f733b7e2335c4e83a91dda 312719: 645d8f29ccc8948cbbcdc18f8c68d5b8e81db5b8 312703: 95e4bc156bff12aad5448c8ec63abdda18ad36ab v: v3 --- [refs] | 2 +- trunk/drivers/acpi/thermal.c | 17 ++++++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 4be10c7dcd14..ea4798055a41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62fcbdd95ccabcff7b41a859032496f6ca492045 +refs/heads/master: 167cffb646aa4a7f3267b07eae1af16b54bc0e9b diff --git a/trunk/drivers/acpi/thermal.c b/trunk/drivers/acpi/thermal.c index 7dbebea1ec31..21dd4c268aef 100644 --- a/trunk/drivers/acpi/thermal.c +++ b/trunk/drivers/acpi/thermal.c @@ -98,7 +98,6 @@ MODULE_PARM_DESC(psv, "Disable or override all passive trip points."); static int acpi_thermal_add(struct acpi_device *device); static int acpi_thermal_remove(struct acpi_device *device, int type); -static int acpi_thermal_resume(struct acpi_device *device); static void acpi_thermal_notify(struct acpi_device *device, u32 event); static const struct acpi_device_id thermal_device_ids[] = { @@ -107,6 +106,9 @@ static const struct acpi_device_id thermal_device_ids[] = { }; MODULE_DEVICE_TABLE(acpi, thermal_device_ids); +static int acpi_thermal_resume(struct device *dev); +static SIMPLE_DEV_PM_OPS(acpi_thermal_pm, NULL, acpi_thermal_resume); + static struct acpi_driver acpi_thermal_driver = { .name = "thermal", .class = ACPI_THERMAL_CLASS, @@ -114,9 +116,9 @@ static struct acpi_driver acpi_thermal_driver = { .ops = { .add = acpi_thermal_add, .remove = acpi_thermal_remove, - .resume = acpi_thermal_resume, .notify = acpi_thermal_notify, }, + .drv.pm = &acpi_thermal_pm, }; struct acpi_thermal_state { @@ -1041,16 +1043,17 @@ static int acpi_thermal_remove(struct acpi_device *device, int type) return 0; } -static int acpi_thermal_resume(struct acpi_device *device) +static int acpi_thermal_resume(struct device *dev) { - struct acpi_thermal *tz = NULL; + struct acpi_thermal *tz; int i, j, power_state, result; - - if (!device || !acpi_driver_data(device)) + if (!dev) return -EINVAL; - tz = acpi_driver_data(device); + tz = acpi_driver_data(to_acpi_device(dev)); + if (!tz) + return -EINVAL; for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) { if (!(&tz->trips.active[i]))