From mboxrd@z Thu Jan 1 00:00:00 1970 From: Aaron Lu Subject: Re: [RFC PATCH v2 4/8] libata-acpi: set acpi state for SATA port Date: Mon, 12 Mar 2012 10:02:50 +0800 Message-ID: <20120312020249.GC2820@ladygaga> References: <1330592577-16546-1-git-send-email-ming.m.lin@intel.com> <1330592577-16546-5-git-send-email-ming.m.lin@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Content-Disposition: inline In-Reply-To: <1330592577-16546-5-git-send-email-ming.m.lin@intel.com> Sender: linux-scsi-owner@vger.kernel.org To: Lin Ming , "@ladygaga"@domain.invalid Cc: Zhang Rui , Jeff Garzik , Alan Stern , "Rafael J. Wysocki" , Tejun Heo , linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org, linux-scsi@vger.kernel.org, linux-pm@vger.kernel.org, linux-acpi List-Id: linux-acpi@vger.kernel.org Hi, On Thu, Mar 01, 2012 at 05:02:53PM +0800, Lin Ming wrote: > Currently, ata_acpi_set_state() only sets acpi sate for IDE port. > Remove this limitation. > > Signed-off-by: Lin Ming > --- > drivers/ata/libata-acpi.c | 21 ++++++++++++--------- > 1 files changed, 12 insertions(+), 9 deletions(-) > > diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c > index b03e468..104c1d0 100644 > --- a/drivers/ata/libata-acpi.c > +++ b/drivers/ata/libata-acpi.c > @@ -841,23 +841,26 @@ 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; > + int acpi_state; > > /* 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); > } > > /** Acked-by: Aaron Lu > -- > 1.7.2.5 > >