Message ID | 1394627982-23726-6-git-send-email-lee.jones@linaro.org |
---|---|
State | Accepted |
Commit | 761a8c2765df17ac5296e2631a16ec08d1a0cb1c |
Headers | show
Return-Path: <patchwork-forward+bncBDA7X7F2WUEBBRNMQGMQKGQE76NEHKQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A844C203AB for <linaro@patches.linaro.org>; Wed, 12 Mar 2014 12:42:45 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id hw13sf22573480qab.1 for <linaro@patches.linaro.org>; Wed, 12 Mar 2014 05:42:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=7CnQXSI61SyrKyTMXOIJUCK+dd/tTKNGS2n5QWfwX04=; b=G5hLCT/FSFObc2HieCyfSXwGL2zSSlc3yg/2zMNtc5YXv7n6IWEywbDQOhfi5MEwg3 xzOtx8mArRMUqpYTsSr1Bq0oTuiQLdVtv3hM5Ve6IzhWYNduDtfBYQx7gJmDFNEPMUkg wQlZ51GL6Ijr5zhR/LPvgmPxa0L38P5+IX+mHiONkDOWQIEtQL8XgHz/jcWF+raeTStc l2sc0RGNgQ58dJMTS1hvKPp38bLadLP9SEsKMsN/1lmhTr7AOicPQ6SIOVdU3pJzUqYB q0iS7lFoKwUDwZf7I9MRAmvPlJkRVXm8rFiPLFHPP50H+4xAB8JgHB8qyg3ICHNLtfmJ wCrw== X-Gm-Message-State: ALoCoQmgH3aeUOZcIqll/MCtWy45HZK1O0AE5KdbggcEjNYSxuPf1iMNKGLfV7RAW5EXz7qcaKm/ X-Received: by 10.58.132.210 with SMTP id ow18mr15840486veb.8.1394628165444; Wed, 12 Mar 2014 05:42:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.47.239 with SMTP id m102ls2779961qga.8.gmail; Wed, 12 Mar 2014 05:42:45 -0700 (PDT) X-Received: by 10.58.161.205 with SMTP id xu13mr32048077veb.4.1394628165345; Wed, 12 Mar 2014 05:42:45 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id sn5si2654995vdc.11.2014.03.12.05.42.45 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 05:42:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so5149128vcb.32 for <patchwork-forward@linaro.org>; Wed, 12 Mar 2014 05:42:45 -0700 (PDT) X-Received: by 10.52.15.132 with SMTP id x4mr761777vdc.31.1394628165263; Wed, 12 Mar 2014 05:42:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp285418vck; Wed, 12 Mar 2014 05:42:44 -0700 (PDT) X-Received: by 10.67.13.226 with SMTP id fb2mr4773929pad.146.1394628164379; Wed, 12 Mar 2014 05:42:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iu9si2259703pac.147.2014.03.12.05.42.43; Wed, 12 Mar 2014 05:42:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753510AbaCLMkT (ORCPT <rfc822;linus.walleij@linaro.org> + 26 others); Wed, 12 Mar 2014 08:40:19 -0400 Received: from mail-wi0-f179.google.com ([209.85.212.179]:56531 "EHLO mail-wi0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753106AbaCLMkO (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 12 Mar 2014 08:40:14 -0400 Received: by mail-wi0-f179.google.com with SMTP id f8so2299790wiw.12 for <linux-kernel@vger.kernel.org>; Wed, 12 Mar 2014 05:40:13 -0700 (PDT) X-Received: by 10.180.92.196 with SMTP id co4mr3364345wib.50.1394628013737; Wed, 12 Mar 2014 05:40:13 -0700 (PDT) Received: from lee--X1.home (host109-148-116-196.range109-148.btcentralplus.com. [109.148.116.196]) by mx.google.com with ESMTPSA id di9sm15692752wid.6.2014.03.12.05.40.12 for <multiple recipients> (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 12 Mar 2014 05:40:12 -0700 (PDT) From: Lee Jones <lee.jones@linaro.org> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tj@kernel.org Cc: lee.jones@linaro.org, kernel@stlinux.com, b.zolnierkie@samsung.com, linux-ide@vger.kernel.org Subject: [PATCH 5/5] ahci: st: Invoke AHCI Platform Suspend/Resume Date: Wed, 12 Mar 2014 12:39:42 +0000 Message-Id: <1394627982-23726-6-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394627982-23726-1-git-send-email-lee.jones@linaro.org> References: <1394627982-23726-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c index 3edec5d..17191b9 100644 --- a/drivers/ata/ahci_st.c +++ b/drivers/ata/ahci_st.c @@ -186,6 +186,10 @@ static int st_ahci_suspend(struct device *dev) struct ahci_host_priv *hpriv = drv_data->hpriv; int err; + ret = ahci_platform_suspend_host(dev); + if (ret) + return ret; + if (drv_data->pwr) { err = reset_control_assert(drv_data->pwr); if (err) { @@ -215,7 +219,7 @@ static int st_ahci_resume(struct device *dev) return err; } - return 0; + return ahci_platform_resume_host(dev); } #endif
This is where we disable IRQs on suspend and update the internal power state during suspend/resume. Suggested-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/ata/ahci_st.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)