lkml.org 
[lkml]   [2012]   [Jun]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/5] thinkpad_acpi: Use struct dev_pm_ops instead of legacy PM routines
    Date
    From: Rafael J. Wysocki <rjw@sisk.pl>

    Make the thinkpad_acpi driver define its PM callbacks through
    a struct dev_pm_ops object rather than by using legacy PM hooks
    in struct platform_driver.

    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    ---
    drivers/platform/x86/thinkpad_acpi.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    Index: linux/drivers/platform/x86/thinkpad_acpi.c
    ===================================================================
    --- linux.orig/drivers/platform/x86/thinkpad_acpi.c
    +++ linux/drivers/platform/x86/thinkpad_acpi.c
    @@ -922,8 +922,7 @@ static struct input_dev *tpacpi_inputdev
    static struct mutex tpacpi_inputdev_send_mutex;
    static LIST_HEAD(tpacpi_all_drivers);

    -static int tpacpi_suspend_handler(struct platform_device *pdev,
    - pm_message_t state)
    +static int tpacpi_suspend_handler(struct device *dev)
    {
    struct ibm_struct *ibm, *itmp;

    @@ -937,7 +936,7 @@ static int tpacpi_suspend_handler(struct
    return 0;
    }

    -static int tpacpi_resume_handler(struct platform_device *pdev)
    +static int tpacpi_resume_handler(struct device *dev)
    {
    struct ibm_struct *ibm, *itmp;

    @@ -951,6 +950,9 @@ static int tpacpi_resume_handler(struct
    return 0;
    }

    +static SIMPLE_DEV_PM_OPS(tpacpi_pm,
    + tpacpi_suspend_handler, tpacpi_resume_handler);
    +
    static void tpacpi_shutdown_handler(struct platform_device *pdev)
    {
    struct ibm_struct *ibm, *itmp;
    @@ -967,9 +969,8 @@ static struct platform_driver tpacpi_pdr
    .driver = {
    .name = TPACPI_DRVR_NAME,
    .owner = THIS_MODULE,
    + .pm = &tpacpi_pm,
    },
    - .suspend = tpacpi_suspend_handler,
    - .resume = tpacpi_resume_handler,
    .shutdown = tpacpi_shutdown_handler,
    };



    \
     
     \ /
      Last update: 2012-06-17 23:01    [W:0.024 / U:1.796 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site