Re: [PATCH 4/6] libata: resume in the background

[Sergei Shtylyov]

On 10-11-2013 1:03, Phillip Susi wrote:

Don't block the resume path waiting for the disk to
spin up.
---
  drivers/ata/libata-core.c | 10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 686c441..128ce0d 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5421,20 +5421,18 @@ static int __ata_port_resume_common(struct ata_port 
*ap, pm_message_t mesg,
  static int ata_port_resume_common(struct device *dev, pm_message_t mesg)
  {
        struct ata_port *ap = to_ata_port(dev);
+       static int dontcare;

-       return __ata_port_resume_common(ap, mesg, NULL);
+       return __ata_port_resume_common(ap, mesg, &dontcare);
  }

  static int ata_port_resume(struct device *dev)
  {
        int rc;

+       if (pm_runtime_suspended(dev))
+               return 0;
        rc = ata_port_resume_common(dev, PMSG_RESUME);
-       if (!rc) {
-               pm_runtime_disable(dev);
-               pm_runtime_set_active(dev);
-               pm_runtime_enable(dev);
-       }

    With this modification, you don't need 'rc' anymore.

        return rc;
  }

MBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html