From patchwork Tue Aug 26 12:07:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 35999 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id DA5E12054F for ; Tue, 26 Aug 2014 12:07:49 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf124339179pad.2 for ; Tue, 26 Aug 2014 05:07:49 -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:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=NuU1CxcIBrnfutBPMhcLj88GP6eXERBpTyghMb1lQIw=; b=InG7uFBbSXe4rj/prq6QAc2MdTCTvNm62cxUNn7z9mTBXX397jcmsomcifc3Jp53mp KW8nxDX5NQS7zSJh0OzdpuAvVk4Cq5EWvq001MMAY5AhsWqjP0N7MPB09FlNpPl7EoRc 7IrN0FupeuP7gfsmVo4wEVB66EBzvCN6HWPjLRjxUtr3AjhgflwQbPZO3FhotdAjH/wF sdkb0ouijNMhiKQHCihzRzDFezM21ZHilh5Ct2JgCVrDWTNPLaNWQ3C3CM4hC0O0djnO 0+yQeTU+jEHxoGKXZlY4CudzoxjwZ7s9wLEiQ3V2aMPifPcCGHOQvtSgBuAoEvvONrFK aM8g== X-Gm-Message-State: ALoCoQk/KHH56zAylW2T+NIBDdlkZ8WMb1h5V2GAMZuQv4S4nvp/qZzvukOd970SyaHIHbNmGn2b X-Received: by 10.66.196.70 with SMTP id ik6mr894464pac.44.1409054869190; Tue, 26 Aug 2014 05:07:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.100 with SMTP id j91ls2515254qga.44.gmail; Tue, 26 Aug 2014 05:07:49 -0700 (PDT) X-Received: by 10.220.112.143 with SMTP id w15mr1097467vcp.41.1409054869096; Tue, 26 Aug 2014 05:07:49 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id eb1si1274718vdc.17.2014.08.26.05.07.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 05:07:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so16346166vcb.6 for ; Tue, 26 Aug 2014 05:07:49 -0700 (PDT) X-Received: by 10.220.163.130 with SMTP id a2mr424135vcy.52.1409054869020; Tue, 26 Aug 2014 05:07:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp193012vcb; Tue, 26 Aug 2014 05:07:48 -0700 (PDT) X-Received: by 10.112.55.238 with SMTP id v14mr2439220lbp.93.1409054867938; Tue, 26 Aug 2014 05:07:47 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by mx.google.com with ESMTPS id w7si3285106lbv.79.2014.08.26.05.07.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 05:07:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by mail-lb0-f170.google.com with SMTP id p9so1232721lbv.1 for ; Tue, 26 Aug 2014 05:07:47 -0700 (PDT) X-Received: by 10.112.84.75 with SMTP id w11mr26130236lby.24.1409054867380; Tue, 26 Aug 2014 05:07:47 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id ai1sm4908979lbd.12.2014.08.26.05.07.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Aug 2014 05:07:46 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Alan Stern , Daniel Lezcano , Tomasz Figa , devicetree@vger.kernel.org, Linus Walleij , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Wolfram Sang , Chris Ball , Russell King , Ulf Hansson Subject: [PATCH 1/9] ACPI / PM: Let acpi_dev_pm_detach() return an error code Date: Tue, 26 Aug 2014 14:07:09 +0200 Message-Id: <1409054837-5667-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409054837-5667-1-git-send-email-ulf.hansson@linaro.org> References: <1409054837-5667-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , To give callers the option of acting on a errors while removing the pm_domain ops for the device in the ACPI power domain, let acpi_dev_pm_detach() return an int to provide the error code. Signed-off-by: Ulf Hansson --- drivers/acpi/device_pm.c | 4 ++++ include/linux/acpi.h | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c index 67075f8..fa78abb 100644 --- a/drivers/acpi/device_pm.c +++ b/drivers/acpi/device_pm.c @@ -1087,6 +1087,8 @@ EXPORT_SYMBOL_GPL(acpi_dev_pm_attach); * * Callers must ensure proper synchronization of this function with power * management callbacks. + * + * Returns 0 on successfully detached power domain or negative error code. */ void acpi_dev_pm_detach(struct device *dev, bool power_off) { @@ -1107,7 +1109,9 @@ void acpi_dev_pm_detach(struct device *dev, bool power_off) acpi_device_wakeup(adev, ACPI_STATE_S0, false); acpi_dev_pm_low_power(dev, adev, ACPI_STATE_S0); } + return 0; } + return -ENODEV; } EXPORT_SYMBOL_GPL(acpi_dev_pm_detach); #endif /* CONFIG_PM */ diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 5320153..a7bfdf6 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -576,7 +576,7 @@ static inline int acpi_subsys_freeze(struct device *dev) { return 0; } #if defined(CONFIG_ACPI) && defined(CONFIG_PM) struct acpi_device *acpi_dev_pm_get_node(struct device *dev); int acpi_dev_pm_attach(struct device *dev, bool power_on); -void acpi_dev_pm_detach(struct device *dev, bool power_off); +int acpi_dev_pm_detach(struct device *dev, bool power_off); #else static inline struct acpi_device *acpi_dev_pm_get_node(struct device *dev) { @@ -586,7 +586,10 @@ static inline int acpi_dev_pm_attach(struct device *dev, bool power_on) { return -ENODEV; } -static inline void acpi_dev_pm_detach(struct device *dev, bool power_off) {} +static inline int acpi_dev_pm_detach(struct device *dev, bool power_off) +{ + return -ENODEV; +} #endif #ifdef CONFIG_ACPI