From patchwork Wed Aug 23 14:42:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 805031 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="QK3/ASKD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xcqsC60Wjz9s78 for ; Thu, 24 Aug 2017 00:42:39 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754144AbdHWOm2 (ORCPT ); Wed, 23 Aug 2017 10:42:28 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:36182 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754053AbdHWOmU (ORCPT ); Wed, 23 Aug 2017 10:42:20 -0400 Received: by mail-lf0-f43.google.com with SMTP id l137so1426714lfg.3 for ; Wed, 23 Aug 2017 07:42:20 -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=K+c1reHhAyzBsLbN0U8sxsB1BZjUOEtCkSCHqstB7PI=; b=QK3/ASKDUq29BjRT0h5wCFBbo/xHmwRcz4HT1EIpiZLl3OHkBBN3F66qqhfqjlrBnT 8gwVCZU6iwKJpL5c7NU1jWm4qtwHSpZZ99ljTE4sdyBAcpOPfsrRrXg6Jq6WAUW1Ju3+ b3E6chswth4y4oVL145lto1LBq1H8MX7kfMrI= 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=K+c1reHhAyzBsLbN0U8sxsB1BZjUOEtCkSCHqstB7PI=; b=MyzzlbpfjwyNsPVGufMJGwiMxNZ2/l7OYTTgDS+xRrjK5IMf5wKfZFXKMsEc7Cbxcx a2uk6iAAO5jSMguMjqhcAA7Ds7gPByOG4EmHB6eP+tTuhBkPoxsVtKGPVVD+xjgX3Cvl jsLwrzeXJIuqKkXeqNgq2KMt8JcEnZfFerKMcznxeUoHgx4+69tw+Wu2XVeUz7R38xhC 6g7nvPHnePeS7RKsGfAf6AdlMsny9ffiTn74O9gY055nq25V19qa1UlzzYm76Tpu82Xe H+vWiX1eyJZPppkUxwZyFsf5z831HPpi0Hro9rTEXJbQGPFlZx8qA0UndnRtavl75Aao hOtA== X-Gm-Message-State: AHYfb5j4Yj8xq2wk9LJAbXqdNW8yze0z7Hdih2SzvdmB6oZfXOXN+GvL xMAhU5FZquVwwfCg X-Received: by 10.46.25.194 with SMTP id 63mr1396534ljz.21.1503499339264; Wed, 23 Aug 2017 07:42:19 -0700 (PDT) Received: from localhost.localdomain (h-158-174-22-67.NA.cust.bahnhof.se. [158.174.22.67]) by smtp.gmail.com with ESMTPSA id c89sm287593lfb.78.2017.08.23.07.42.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Aug 2017 07:42:18 -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 v2 2/9] PM / Sleep: Remove pm_complete_with_resume_check() Date: Wed, 23 Aug 2017 16:42:02 +0200 Message-Id: <1503499329-28834-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503499329-28834-1-git-send-email-ulf.hansson@linaro.org> References: <1503499329-28834-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.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 --- Changes in v2: - None. --- drivers/base/power/generic_ops.c | 23 ----------------------- include/linux/pm.h | 1 - 2 files changed, 24 deletions(-) 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 47ded8a..a0ceecc 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -736,7 +736,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 */