From: Lin Ming <ming.m.lin@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>, Aaron Lu <aaron.lu@amd.com>,
Holger Macht <holger@homac.de>, Matthew Garrett <mjg@redhat.com>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
David Woodhouse <David.Woodhouse@intel.com>,
Dan Williams <dan.j.williams@intel.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org,
linux-acpi@vger.kernel.org
Subject: [PATCH v6 04/11] libata-acpi: set acpi state for SATA port
Date: Mon, 25 Jun 2012 16:13:05 +0800 [thread overview]
Message-ID: <1340611992-41457-5-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1340611992-41457-1-git-send-email-ming.m.lin@intel.com>
Currently, ata_acpi_set_state() only sets acpi sate for IDE port.
Remove this limitation.
Acked-by: Aaron Lu <aaron.lu@amd.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
drivers/ata/libata-acpi.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index c6f0101..bb20fd5 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -852,23 +852,25 @@ void ata_acpi_on_resume(struct ata_port *ap)
void ata_acpi_set_state(struct ata_port *ap, pm_message_t state)
{
struct ata_device *dev;
-
- if (!ata_ap_acpi_handle(ap) || (ap->flags & ATA_FLAG_ACPI_SATA))
- return;
+ acpi_handle handle;
/* channel first and then drives for power on and vica versa
for power off */
- if (state.event == PM_EVENT_ON)
- acpi_bus_set_power(ata_ap_acpi_handle(ap), ACPI_STATE_D0);
+ handle = ata_ap_acpi_handle(ap);
+ if (handle && state.event == PM_EVENT_ON)
+ acpi_bus_set_power(handle, ACPI_STATE_D0);
ata_for_each_dev(dev, &ap->link, ENABLED) {
- if (ata_dev_acpi_handle(dev))
- acpi_bus_set_power(ata_dev_acpi_handle(dev),
+ handle = ata_dev_acpi_handle(dev);
+ if (handle)
+ acpi_bus_set_power(handle,
state.event == PM_EVENT_ON ?
ACPI_STATE_D0 : ACPI_STATE_D3);
}
- if (state.event != PM_EVENT_ON)
- acpi_bus_set_power(ata_ap_acpi_handle(ap), ACPI_STATE_D3);
+
+ handle = ata_ap_acpi_handle(ap);
+ if (handle && state.event != PM_EVENT_ON)
+ acpi_bus_set_power(handle, ACPI_STATE_D3);
}
/**
--
1.7.10
next prev parent reply other threads:[~2012-06-25 8:13 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-25 8:13 [PATCH v6 00/11] SATA ZPODD support Lin Ming
2012-06-25 8:13 ` [PATCH v6 01/11] [SCSI]: add wrapper to access and set scsi_bus_type in struct acpi_bus_type Lin Ming
2012-06-25 8:13 ` [PATCH v6 02/11] libata: bind the Linux device tree to the ACPI device tree Lin Ming
2012-06-25 19:22 ` Dan Williams
2012-06-25 8:13 ` [PATCH v6 03/11] libata: migrate ACPI code over to new bindings Lin Ming
2012-06-25 8:13 ` Lin Ming [this message]
2012-06-25 8:13 ` [PATCH v6 05/11] libata-acpi: add ata port runtime D3Cold support Lin Ming
2012-06-25 8:13 ` [PATCH v6 06/11] libata-acpi: register/unregister device to/from power resource Lin Ming
2012-06-25 8:13 ` [PATCH v6 07/11] libata: detect Device Attention support Lin Ming
2012-06-25 8:13 ` [PATCH v6 08/11] libata: tell scsi layer device supports runtime power off Lin Ming
2012-06-25 8:13 ` [PATCH v6 09/11] [SCSI] sr: check support for device busy class events Lin Ming
2012-06-25 8:13 ` [PATCH v6 10/11] [SCSI] sr: support zero power ODD Lin Ming
2012-06-25 8:13 ` [PATCH v6 11/11] [SCSI] sr: make sure ODD is in resumed state in block ioctl Lin Ming
2012-06-29 3:20 ` [PATCH v6 00/11] SATA ZPODD support Lin Ming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340611992-41457-5-git-send-email-ming.m.lin@intel.com \
--to=ming.m.lin@intel.com \
--cc=David.Woodhouse@intel.com \
--cc=aaron.lu@amd.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=dan.j.williams@intel.com \
--cc=holger@homac.de \
--cc=jgarzik@pobox.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=mjg@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).