From patchwork Tue Oct 3 07:11:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 114668 Delivered-To: patches@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1552825qgn; Tue, 3 Oct 2017 00:11:22 -0700 (PDT) X-Received: by 10.46.9.80 with SMTP id 77mr8333370ljj.54.1507014682168; Tue, 03 Oct 2017 00:11:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507014682; cv=none; d=google.com; s=arc-20160816; b=qHLaTMdq/CgUgV0UhDf20chh4by+W5zpV9mvZ0LImRgjLLiyJcntEBudjdIiw9QIUP c2zMA4bWFlL1c+XJvU6h41rGAuyqiRxyhhuUi3ATJRQRkQU8Rf6E1rUbhB8ek3CT/4hC DNQdbhN9XA3503Vk0hqt6/0HCWM8huVahVxq3TZo9XG+Xto7Z2THh64Rwpq3OCbJM7bJ yE53W0w99aXpyFQGJLO3Ac+3LZj+J3wPjyHdlPv5wjv+C6wuwJEJJk7hfNTsGRdAphUw ULW8JBUNIdAbv048rAEQDP9cNdK9mpTcsxN3tcl67T4M7jS/a+5ShCFsYEh7443urnHq TgVA== 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=iqv9kBCSzA1A+6P8VBA/P0yTMVdNQ7u2KuKUSyBmKOw=; b=SmJ6GBwxKpsCnXdNI0xy+iDsKo8gVrLna48Ffy6JABki5oAFpx62WSTtoTsgLNGzoA ulki0Hw6QkqrW+0Dd1Oowi/zCCuQ5xClIcTs24SaVuY3jomgMt5bHIaahN18Gi8fDI1P 75p6791YwLJp+bHu59zUkhQ9BkO/si3thrneIiH9LbYgQ7PLeBoNZ3w5FSYa3XexH/+4 iz8NVpI7yxkhJ+Kg+18xZKKlAuc3og7Gktw/iyyPootJENWstqvC5jrEHJe7LisUE8sa C2DhuDP72HzKW2DJBY1M5b7175bmyIFBCwyjO8pED3x328KywDPkg4tcDF+5H4hPkzZ5 woZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=US4pP1QZ; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 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-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id o193sor1800776lfo.96.2017.10.03.00.11.22 for (Google Transport Security); Tue, 03 Oct 2017 00:11:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=US4pP1QZ; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.41 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=iqv9kBCSzA1A+6P8VBA/P0yTMVdNQ7u2KuKUSyBmKOw=; b=US4pP1QZwjybzQEF2U8E7sx71aVAYA2Rl7Z7WNF6Yst9Dt7kWf3JUZr+pkgu5ZV3Jn FndKredbTDLYnXtzsxTDznK4Q3K5EvdhSMfv6/nNjLHTW9T7VAE660tXNpMy3RFCUw8r kEyJ8a4PDZ2c5f3lhkXprC8ceD13gq982I7zU= 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=iqv9kBCSzA1A+6P8VBA/P0yTMVdNQ7u2KuKUSyBmKOw=; b=b01QVNa/pxl+8bxLpivHZBkMnH2N4mn8omFJtfBq4IETasFfbt15fFieJtXv0TBHee wyxXR1yk6z0K5hhuKZinwMczuvwZDqBAJskR/P2Sn4qmjD0mmptqHap9gCTo+9C/q9NS BJMBc7HGavGGD3vRv3AZRHMVBzSNuhSDj895gWlzeGxtNS6400e5qTeHWSf8fjSsbyXz aMtoad6twIRyo7YjkcxJFbcEWQOBRfxA1UXnEwBIA/jrZU1kASP1QeIPC9efQU6e1hXy RPel5hM61JKkr+y5UQUd2X7H7//OVnmtmHbHBTh4DaSeFtb9wIQ5MhM5XewfiqMSDGFq GEPw== X-Gm-Message-State: AMCzsaXEbfLn3coFFNK0xq+l9822U0L+ce1zz5AGrjmTDg2jdpZl0pjD AoooDRZJlWye0u5ugud62fMuCHMi X-Google-Smtp-Source: AOwi7QDygXbJLYEvklaidIaVmyQaOqH6SjEXF7TxmVLSWAKWRp6cPcOnwvv400sD9RNicz3QP/ojzQ== X-Received: by 10.25.40.193 with SMTP id o184mr4741561lfo.136.1507014681829; Tue, 03 Oct 2017 00:11:21 -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 x13sm2764497ljb.23.2017.10.03.00.11.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Oct 2017 00:11:21 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Kevin Hilman , Ulf Hansson Subject: [PATCH 2/4] PM / Sleep: Remove pm_complete_with_resume_check() Date: Tue, 3 Oct 2017 09:11:07 +0200 Message-Id: <1507014669-1502-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1507014669-1502-1-git-send-email-ulf.hansson@linaro.org> References: <1507014669-1502-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 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 */