From patchwork Tue Aug 29 14:56:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 111221 Delivered-To: patches@linaro.org Received: by 10.140.95.112 with SMTP id h103csp1457500qge; Tue, 29 Aug 2017 07:57:05 -0700 (PDT) X-Received: by 10.46.9.215 with SMTP id 206mr251909ljj.1.1504018625737; Tue, 29 Aug 2017 07:57:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504018625; cv=none; d=google.com; s=arc-20160816; b=HDGEkha8jPbrw/sZVp55Fc3wG2Sqx4mvT5WiGW2TC5eJLRj/iwxqH6a9cfiN2Rpf24 jeKw1N7GlhlmKhP0rC46IL/bzRzIaTG/axuD4ZSGQP5jeXEgs1ofsOBmJTg7YhRpc1vx N8GxY5YHYCIL6wETqgIj1NbHKdN6Rt9WreHEEToz02nbatEMmSA69I1Jug7w5JU5ySMT q7UsVI/1sVsu/kXtbhqivjWxaLyqwJ534oGXof5RRXESCctt/mlNr3Cg9JyNZ9ACKQd9 6b59qGjqB+SwB+NKhK3x5ianEc7hflGW62qq/ZSa9PGurr5+TeKbmFoKKzDJpjzOeFQr LJ6A== 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=GKSuDwhuhr3gj47CQ8afU3lKajk4Zvq/lQbvP7ebE8g=; b=j8nE7SIYMvMJO6mzGiNWJVmSXgtHjvrGEZwpkS0Acvb+tMldknmRkkE/hx3Hia+4jA RcVBcTSlM+ZhPG3QWK/wE5eG0foVHfZmdycqXTBSjpgD8xEC/VDmnQVL/WkeHtRutlAt lnqmYwTaB55i9xc3PPNhMVbtpU2iJtVQh6+N8JbJPfATuXEQs1T9lbZcwAyZvjM0SY4/ QXGFwHRFd9opeuLFEN0366nl4LDyqDoRWFJw/AP+nQ7s0x6KRW7C2xmffowOpdnLUdZW p2cPs4uG6ol8W5GSrmEMNGnphk3LKBWbbymwy53Ymp8EhEoi+fwdFvb+tesVLH488dkW eDvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mf1VaJ10; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::229 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-x229.google.com (mail-lf0-x229.google.com. [2a00:1450:4010:c07::229]) by mx.google.com with ESMTPS id u20si1482115lja.128.2017.08.29.07.57.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Aug 2017 07:57:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::229 as permitted sender) client-ip=2a00:1450:4010:c07::229; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Mf1VaJ10; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::229 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-x229.google.com with SMTP id z12so14369751lfd.3 for ; Tue, 29 Aug 2017 07:57:05 -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=GKSuDwhuhr3gj47CQ8afU3lKajk4Zvq/lQbvP7ebE8g=; b=Mf1VaJ10LpRyqiP/LfbzBD0DYbUJj9DtY5feHcQn9oZb5OSCt9Im2xui29VISIDLvj 42v7YWiXtzV8AAlyQ/CgI8+29xSZVxiX4sFhsQqDa28W/BDN6VTaKEO2r5K7Xv1HCGsL C7l4ckbqTO1xqKXDN9YZS56trBL4k3qx289Z0= 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=GKSuDwhuhr3gj47CQ8afU3lKajk4Zvq/lQbvP7ebE8g=; b=V+4turnJ+ScE/ghg5cxnztp7A6RaOZ8aPpc2RFsm6dI5A3CXtG/rdk41nvnFcBcAqT KRvN/HxM8xzY6fox6JfAw/7qCfpa+Uztp1mmkCPiKkf3flcL7lOlgum0So9ZXZB1rgJs d05YmsS0Y/bACY/O5xwn2QkElrK2fNd4CxtBu3d/Q+Sh1MFyrJeN6osG6KSFiZft91ov FMWecYYhEq0TSbfkVz3U117R5K31d99XdUhD4RFxE7H5nT2aSqt0FSyX8HV4BEQYbAA2 dCfb8gbhR8x6dG05LLcTXJ+GFrQS2XFcuf/eComlXy+9Whm7RC+XeZbF7xnu/tlpABMe 06Og== X-Gm-Message-State: AHYfb5h3J7pK4XRMqHNJ+51blXfe8xVpH7CoMjLQ6IRmHxIVuDoqFWL1 YjVETm/ErYxgi8uuM0Q= X-Received: by 10.46.5.19 with SMTP id 19mr272268ljf.155.1504018625301; Tue, 29 Aug 2017 07:57:05 -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 y23sm652454ljd.19.2017.08.29.07.57.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Aug 2017 07:57:04 -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 , Johannes Stezenbach , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, Ulf Hansson Subject: [PATCH v3 3/8] PM / Sleep: Remove pm_complete_with_resume_check() Date: Tue, 29 Aug 2017 16:56:45 +0200 Message-Id: <1504018610-10822-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504018610-10822-1-git-send-email-ulf.hansson@linaro.org> References: <1504018610-10822-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 --- Changes in v3: - None. --- 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 5bf96d2..c88a4ef 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -740,7 +740,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 */