lkml.org 
[lkml]   [2012]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/21] ACPI: Use struct dev_pm_ops for power management in the thermal driver
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Make the ACPI thermal 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: Rafael J. Wysocki <rjw@sisk.pl>
    ---
    drivers/acpi/thermal.c | 17 ++++++++++-------
    1 file changed, 10 insertions(+), 7 deletions(-)

    Index: linux/drivers/acpi/thermal.c
    ===================================================================
    --- linux.orig/drivers/acpi/thermal.c
    +++ linux/drivers/acpi/thermal.c
    @@ -98,7 +98,6 @@ MODULE_PARM_DESC(psv, "Disable or overri

    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 ther
    };
    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_d
    .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 ac
    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]))


    \
     
     \ /
      Last update: 2012-06-24 00:41    [W:4.073 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site