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 2/21] ACPI / PM: Make acpi_bus_type use struct dev_pm_ops for PM handling
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Make the acpi_bus_type bus type define its PM callbacks through
    a struct dev_pm_ops object rather than by using legacy PM hooks
    in struct bus_type.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    ---
    drivers/acpi/scan.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    Index: linux/drivers/acpi/scan.c
    ===================================================================
    --- linux.orig/drivers/acpi/scan.c
    +++ linux/drivers/acpi/scan.c
    @@ -290,7 +290,7 @@ static void acpi_device_release(struct d
    kfree(acpi_dev);
    }

    -static int acpi_device_suspend(struct device *dev, pm_message_t state)
    +static int acpi_device_suspend(struct device *dev)
    {
    struct acpi_device *acpi_dev = to_acpi_device(dev);
    struct acpi_driver *acpi_drv = acpi_dev->driver;
    @@ -310,6 +310,8 @@ static int acpi_device_resume(struct dev
    return 0;
    }

    +static SIMPLE_DEV_PM_OPS(acpi_bus_pm, acpi_device_suspend, acpi_device_resume);
    +
    static int acpi_bus_match(struct device *dev, struct device_driver *drv)
    {
    struct acpi_device *acpi_dev = to_acpi_device(dev);
    @@ -441,12 +443,11 @@ static int acpi_device_remove(struct dev

    struct bus_type acpi_bus_type = {
    .name = "acpi",
    - .suspend = acpi_device_suspend,
    - .resume = acpi_device_resume,
    .match = acpi_bus_match,
    .probe = acpi_device_probe,
    .remove = acpi_device_remove,
    .uevent = acpi_device_uevent,
    + .pm = &acpi_bus_pm,
    };

    static int acpi_device_register(struct acpi_device *device)


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