lkml.org 
[lkml]   [2012]   [Jul]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 5/7] scsi: pm: use runtime resume callback if available
    Date
    When runtime resume a scsi device, if the device's driver has
    implemented runtime resume callback, use that.

    sr driver needs this to do different things for system resume and
    runtime resume.

    Signed-off-by: Aaron Lu <aaron.lu@amd.com>
    ---
    drivers/scsi/scsi_pm.c | 15 ++++++++++-----
    1 file changed, 10 insertions(+), 5 deletions(-)

    diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
    index 83edb93..690136c 100644
    --- a/drivers/scsi/scsi_pm.c
    +++ b/drivers/scsi/scsi_pm.c
    @@ -34,14 +34,19 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg)
    return err;
    }

    -static int scsi_dev_type_resume(struct device *dev)
    +static int scsi_dev_type_resume(struct device *dev, bool runtime)
    {
    struct device_driver *drv;
    int err = 0;
    + int (*resume)(struct device *);

    drv = dev->driver;
    - if (drv && drv->resume)
    - err = drv->resume(dev);
    + if (runtime && drv && drv->pm && drv->pm->runtime_resume)
    + resume = drv->pm->runtime_resume;
    + else
    + resume = drv ? drv->resume : NULL;
    + if (resume)
    + err = resume(dev);
    scsi_device_resume(to_scsi_device(dev));
    dev_dbg(dev, "scsi resume: %d\n", err);
    return err;
    @@ -85,7 +90,7 @@ static int scsi_bus_resume_common(struct device *dev)
    pm_runtime_get_sync(dev->parent);

    if (scsi_is_sdev_device(dev))
    - err = scsi_dev_type_resume(dev);
    + err = scsi_dev_type_resume(dev, false);
    if (err == 0) {
    pm_runtime_disable(dev);
    pm_runtime_set_active(dev);
    @@ -160,7 +165,7 @@ static int scsi_runtime_resume(struct device *dev)

    dev_dbg(dev, "scsi_runtime_resume\n");
    if (scsi_is_sdev_device(dev))
    - err = scsi_dev_type_resume(dev);
    + err = scsi_dev_type_resume(dev, true);

    /* Insert hooks here for targets, hosts, and transport classes */

    --
    1.7.11.3



    \
     
     \ /
      Last update: 2012-07-27 12:01    [W:0.039 / U:0.708 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site