Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[libata] PM code cleanup for ata port

Browse source 
For system freeze, if the port is already runtime suspended, leave it
alone and just return. The port will be resumed on thaw before it will
be used.

And since we will call get_noresume for every device during prepare
phase, and the port is resumed during thaw phase, it can't be in runtime
suspended state during the poweroff phase. So remove the
runtime_suspended check in poweroff callback.

And for all suspend(freeze/suspend/poweroff/etc.), there is no need to
touch the device, so set no_autopsy and no_recovery for them all.

Signed-off-by: Aaron Lu <aaron.lu@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Aaron Lu 2013-01-25 14:32:25 +08:00 committed by Jeff Garzik
parent a7ff60dbe0
commit f5e6d0d0eb
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/ata/libata-core.c
View file

@ -5333,9 +5333,6 @@ static int ata_port_request_pm(struct ata_port *ap, pm_message_t mesg,
static int __ata_port_suspend_common(struct ata_port *ap, pm_message_t mesg, int *async) static int __ata_port_suspend_common(struct ata_port *ap, pm_message_t mesg, int *async)
{ {
unsigned int ehi_flags = ATA_EHI_QUIET;
int rc;
/* /*
* On some hardware, device fails to respond after spun down * On some hardware, device fails to respond after spun down
* for suspend. As the device won't be used before being * for suspend. As the device won't be used before being
@ -5344,11 +5341,9 @@ static int __ata_port_suspend_common(struct ata_port *ap, pm_message_t mesg, int
* *
* http://thread.gmane.org/gmane.linux.ide/46764 * http://thread.gmane.org/gmane.linux.ide/46764
*/ */
if (mesg.event & PM_EVENT_SUSPEND) unsigned int ehi_flags = ATA_EHI_QUIET | ATA_EHI_NO_AUTOPSY |
ehi_flags |= ATA_EHI_NO_AUTOPSY | ATA_EHI_NO_RECOVERY; ATA_EHI_NO_RECOVERY;
return ata_port_request_pm(ap, mesg, 0, ehi_flags, async);
rc = ata_port_request_pm(ap, mesg, 0, ehi_flags, async);
return rc;
} }
static int ata_port_suspend_common(struct device *dev, pm_message_t mesg) static int ata_port_suspend_common(struct device *dev, pm_message_t mesg)
@ -5369,16 +5364,13 @@ static int ata_port_suspend(struct device *dev)
static int ata_port_do_freeze(struct device *dev) static int ata_port_do_freeze(struct device *dev)
{ {
if (pm_runtime_suspended(dev)) if (pm_runtime_suspended(dev))
pm_runtime_resume(dev); return 0;
return ata_port_suspend_common(dev, PMSG_FREEZE); return ata_port_suspend_common(dev, PMSG_FREEZE);
} }
static int ata_port_poweroff(struct device *dev) static int ata_port_poweroff(struct device *dev)
{ {
if (pm_runtime_suspended(dev))
return 0;
return ata_port_suspend_common(dev, PMSG_HIBERNATE); return ata_port_suspend_common(dev, PMSG_HIBERNATE);
} }