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 10/21] ACPI: Use struct dev_pm_ops for power management in the power driver
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Make the ACPI power resource 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/power.c | 12 ++++++++----
    1 file changed, 8 insertions(+), 4 deletions(-)

    Index: linux/drivers/acpi/power.c
    ===================================================================
    --- linux.orig/drivers/acpi/power.c
    +++ linux/drivers/acpi/power.c
    @@ -60,7 +60,6 @@ ACPI_MODULE_NAME("power");

    static int acpi_power_add(struct acpi_device *device);
    static int acpi_power_remove(struct acpi_device *device, int type);
    -static int acpi_power_resume(struct acpi_device *device);

    static const struct acpi_device_id power_device_ids[] = {
    {ACPI_POWER_HID, 0},
    @@ -68,6 +67,9 @@ static const struct acpi_device_id power
    };
    MODULE_DEVICE_TABLE(acpi, power_device_ids);

    +static int acpi_power_resume(struct device *dev);
    +static SIMPLE_DEV_PM_OPS(acpi_power_pm, NULL, acpi_power_resume);
    +
    static struct acpi_driver acpi_power_driver = {
    .name = "power",
    .class = ACPI_POWER_CLASS,
    @@ -75,8 +77,8 @@ static struct acpi_driver acpi_power_dri
    .ops = {
    .add = acpi_power_add,
    .remove = acpi_power_remove,
    - .resume = acpi_power_resume,
    },
    + .drv.pm = &acpi_power_pm,
    };

    /*
    @@ -771,14 +773,16 @@ static int acpi_power_remove(struct acpi
    return 0;
    }

    -static int acpi_power_resume(struct acpi_device *device)
    +static int acpi_power_resume(struct device *dev)
    {
    int result = 0, state;
    + struct acpi_device *device;
    struct acpi_power_resource *resource;

    - if (!device)
    + if (!dev)
    return -EINVAL;

    + device = to_acpi_device(dev);
    resource = acpi_driver_data(device);
    if (!resource)
    return -EINVAL;


    \
     
     \ /
      Last update: 2012-06-24 00:01    [W:0.066 / U:30.512 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site