From patchwork Wed Jun 21 19:21:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 106117 Delivered-To: patches@linaro.org Received: by 10.140.91.2 with SMTP id y2csp2092617qgd; Wed, 21 Jun 2017 12:21:51 -0700 (PDT) X-Received: by 10.25.199.7 with SMTP id x7mr12710647lff.170.1498072911302; Wed, 21 Jun 2017 12:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498072911; cv=none; d=google.com; s=arc-20160816; b=kF+9cTsOGRYNsEH+WxYywzk0crAGEdGwOETsCw78sT1BFf7dgDaOL8ABbgRAwKMAFq RrQmhFyzctgyuVsql+ninuLIMq5YXG7qIa3uQGF67AKSZNrOF1KnqO1T3gzLyY3z+lvk x8IfHi22oHFme/uXZB1Z/un8NcB4kLwlzN25kb0Dx9sqmjKW3wYZUsmPYKBdDsoV8O73 AhJsRvBzQCUWPEYXtyfwekbPPtWHkZy5zSDb9IWANxg7Mf6wFMtVmRLxB/rIXh0fyMIJ NgE8J9rSYY2XWLmPjT8Axk539FqICJsh7Wj7/s8+SOuh8xlqf4vvHgjaNyBQDbdcZak+ exUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=KzkiJrP+RXUqgQpKd2YKZSCcFMl32WEDW7yWmfTxSJw=; b=ti3hbqjgLpyCjTd5EmLgth0FyZtSanzPQar3sntFVXpdRbsAhQylZHx7ZBFbJAOF90 CQJHoymftp3mcL9XBFvb51BjUUtlEF4NXLIZUtP80xDpeJqoWAhNhx2No9NxCU3s/xHA zb01GZTDpC+3dEKtU0+4BTv5tfR6D45vBJYvHCMHc0NilqsolpY8OIJeApgETwJ0xoYK AVY+yfUhLQ82nOmraILi1u4y0Cvm/STIpTsBNzPlh7Iw3VePHvnSHQHkYxJVbCTQJQ8C E3nsSjcCPiLfy/9J85L5D62ESSYr+ZhyAjpp9+9R/eIfNPO+CASOwNiL0qav5Mjwvmly aNnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=Go2CE6r8; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::234 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-lf0-x234.google.com (mail-lf0-x234.google.com. [2a00:1450:4010:c07::234]) by mx.google.com with ESMTPS id x21si9024712lfa.410.2017.06.21.12.21.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 12:21:51 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::234 as permitted sender) client-ip=2a00:1450:4010:c07::234; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.b=Go2CE6r8; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::234 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x234.google.com with SMTP id l13so43021989lfl.1 for ; Wed, 21 Jun 2017 12:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KzkiJrP+RXUqgQpKd2YKZSCcFMl32WEDW7yWmfTxSJw=; b=Go2CE6r8lwsHY/l2KaPw4zjAfMsatCOsaAn5jbJJrsZwjJdJe/l+jGLWrYkgLlXEqq GQH3zy6JEcACboOTUN/GEtzk6kFX2fBOewn6TPUHOmfvfXeZ7g2lEUKCNR8R6aFtPmAb TDAIvZE9syfg4qt2r7hr5Fe1jbg5+dGxAhDuU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KzkiJrP+RXUqgQpKd2YKZSCcFMl32WEDW7yWmfTxSJw=; b=a8Rk1nb5869IuJ0TvSTuANXvJTOdBxQ/junj6AA2NRFtwbcaZr/5UMGNoM1DTiLvRn rLOUlVODx7EoIl2oxEaYIg2fBnjsO84WMndVMh23PQ2JfBAb6a9/+F6CObyQiGB1kNKo iCMOgS3rt1wUyvLil/Wc3pfgOqjJiJsghj9Y/dnV372f8W3ZVkNzxpeH3b61zDlFS0rD f+YXOpQ2wOxxTUXHL1SV+gdqscILojmL0F1d9l8jUfYj+WK8RbNZ1r4EoTSq7HoQGDlL Y7ehi+zxLcu3ggKeHmwU/Pfu8K1DlQsUjb2s79YXLSGeVsoV5Ch692RAf3izmhBFMDvs b2sA== X-Gm-Message-State: AKS2vOwToMD70VEKrBBqqMUXrdDr/mCuRM3WAnXNq3AI5E0jRLJCEu4D kwMuwfWA8WUUI5dLu/k= X-Received: by 10.46.80.24 with SMTP id e24mr11516026ljb.19.1498072910962; Wed, 21 Jun 2017 12:21:50 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id t24sm3920047ljd.1.2017.06.21.12.21.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Jun 2017 12:21:50 -0700 (PDT) From: Ulf Hansson To: Wolfram Sang , "Rafael J . Wysocki" , Len Brown , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: Kevin Hilman , Jarkko Nikula , Andy Shevchenko , Mika Westerberg , Jisheng Zhang , John Stultz , Guodong Xu , Sumit Semwal , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, Ulf Hansson Subject: [PATCH 3/9] PM / Sleep: Remove pm_complete_with_resume_check() Date: Wed, 21 Jun 2017 21:21:22 +0200 Message-Id: <1498072888-14782-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498072888-14782-1-git-send-email-ulf.hansson@linaro.org> References: <1498072888-14782-1-git-send-email-ulf.hansson@linaro.org> According to recent changes for ACPI, the are longer any users of pm_complete_with_resume_check(), thus let's drop it. Signed-off-by: Ulf Hansson --- drivers/base/power/generic_ops.c | 23 ----------------------- include/linux/pm.h | 1 - 2 files changed, 24 deletions(-) -- 2.7.4 diff --git a/drivers/base/power/generic_ops.c b/drivers/base/power/generic_ops.c index 07c3c4a..b2ed606 100644 --- a/drivers/base/power/generic_ops.c +++ b/drivers/base/power/generic_ops.c @@ -9,7 +9,6 @@ #include #include #include -#include #ifdef CONFIG_PM /** @@ -298,26 +297,4 @@ void pm_generic_complete(struct device *dev) if (drv && drv->pm && drv->pm->complete) drv->pm->complete(dev); } - -/** - * pm_complete_with_resume_check - Complete a device power transition. - * @dev: Device to handle. - * - * Complete a device power transition during a system-wide power transition and - * optionally schedule a runtime resume of the device if the system resume in - * progress has been initated by the platform firmware and the device had its - * power.direct_complete flag set. - */ -void pm_complete_with_resume_check(struct device *dev) -{ - pm_generic_complete(dev); - /* - * If the device had been runtime-suspended before the system went into - * the sleep state it is going out of and it has never been resumed till - * now, resume it in case the firmware powered it up. - */ - if (dev->power.direct_complete && pm_resume_via_firmware()) - pm_request_resume(dev); -} -EXPORT_SYMBOL_GPL(pm_complete_with_resume_check); #endif /* CONFIG_PM_SLEEP */ diff --git a/include/linux/pm.h b/include/linux/pm.h index a0894bc..de28313 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -733,7 +733,6 @@ extern int pm_generic_poweroff_noirq(struct device *dev); extern int pm_generic_poweroff_late(struct device *dev); extern int pm_generic_poweroff(struct device *dev); extern void pm_generic_complete(struct device *dev); -extern void pm_complete_with_resume_check(struct device *dev); #else /* !CONFIG_PM_SLEEP */