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: 4780771 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id CE1ACC0338 for ; Tue, 26 Aug 2014 12:08:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24D59201DD for ; Tue, 26 Aug 2014 12:08:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA02A201EF for ; Tue, 26 Aug 2014 12:08:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757886AbaHZMHw (ORCPT ); Tue, 26 Aug 2014 08:07:52 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:37880 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757884AbaHZMHs (ORCPT ); Tue, 26 Aug 2014 08:07:48 -0400 Received: by mail-la0-f41.google.com with SMTP id s18so15026211lam.28 for ; Tue, 26 Aug 2014 05:07:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NuU1CxcIBrnfutBPMhcLj88GP6eXERBpTyghMb1lQIw=; b=JDj2Ri2hMpw49mvQKVnGXmEIqN0OOjypiYrHm/QxuyoQlnTGiF8XzAsLauwGPkjTJh QIXKBTOVfiopNKb1GKW5INprE2jVaRDWTxmIGkEA8tvRU5J6Q9M9A/hxe7TZUp09RTHY UIIOUOCsN3GAHo3jkXDhLyK1X81MTHu9QKFo76PtYqGEYneIam/l0HUpGiDSl/kz67P7 ZStOOEndPBF52vTHuUH0TRzl+yNbeBgRZ2VrLswf7XVSHNJZIJYsfgOUErqYf7gyLiNl OGeln+WEXAAM/15JDrcpGPX54Msb8pXD9IoPpKeiSgHO8MLmOFOWoAm7JdITcLFGlRrg p63A== X-Gm-Message-State: ALoCoQmXSgox5Ti5Ryb58jZ6m/dOPXNEkrmwR8eKdy66zefFFRs8JPngN26YRd2UsRo2Tcd7mnEX 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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