diff options
author | Lin Ming <ming.m.lin@intel.com> | 2011-12-04 20:20:28 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2012-01-08 19:14:58 -0500 |
commit | 9ee4f3933930abf5cc34f8e9d69fe0e08c18f602 (patch) | |
tree | 7d3751d52712f71a19d488f9970b6184b4c140c6 /drivers/ata/libata-core.c | |
parent | 5ef41082912bdfcb33fa53b8dba2ad17dea2ef90 (diff) |
ata: add ata port runtime PM callbacks
Add ata port runtime suspend/resume/idle callbacks.
Set ->eh_noresume to skip the runtime PM calls on scsi host
in the error handler to avoid dead lock.
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 04c208e3cec6..15a3d4deb272 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -66,6 +66,7 @@ | |||
66 | #include <asm/byteorder.h> | 66 | #include <asm/byteorder.h> |
67 | #include <linux/cdrom.h> | 67 | #include <linux/cdrom.h> |
68 | #include <linux/ratelimit.h> | 68 | #include <linux/ratelimit.h> |
69 | #include <linux/pm_runtime.h> | ||
69 | 70 | ||
70 | #include "libata.h" | 71 | #include "libata.h" |
71 | #include "libata-transport.h" | 72 | #include "libata-transport.h" |
@@ -5307,9 +5308,18 @@ static int ata_port_resume(struct device *dev) | |||
5307 | return rc; | 5308 | return rc; |
5308 | } | 5309 | } |
5309 | 5310 | ||
5311 | static int ata_port_runtime_idle(struct device *dev) | ||
5312 | { | ||
5313 | return pm_runtime_suspend(dev); | ||
5314 | } | ||
5315 | |||
5310 | static const struct dev_pm_ops ata_port_pm_ops = { | 5316 | static const struct dev_pm_ops ata_port_pm_ops = { |
5311 | .suspend = ata_port_suspend, | 5317 | .suspend = ata_port_suspend, |
5312 | .resume = ata_port_resume, | 5318 | .resume = ata_port_resume, |
5319 | |||
5320 | .runtime_suspend = ata_port_suspend_common, | ||
5321 | .runtime_resume = ata_port_resume, | ||
5322 | .runtime_idle = ata_port_runtime_idle, | ||
5313 | }; | 5323 | }; |
5314 | 5324 | ||
5315 | /** | 5325 | /** |