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: 9802741 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6A81B601C0 for ; Wed, 21 Jun 2017 19:22:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A7B8283FB for ; Wed, 21 Jun 2017 19:22:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55FAD2846B; Wed, 21 Jun 2017 19:22:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 02E9928687 for ; Wed, 21 Jun 2017 19:21:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751940AbdFUTVy (ORCPT ); Wed, 21 Jun 2017 15:21:54 -0400 Received: from mail-lf0-f42.google.com ([209.85.215.42]:33408 "EHLO mail-lf0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751922AbdFUTVw (ORCPT ); Wed, 21 Jun 2017 15:21:52 -0400 Received: by mail-lf0-f42.google.com with SMTP id m77so102860946lfe.0 for ; Wed, 21 Jun 2017 12:21:52 -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=oBq3Fwvq3upOFOV3FDABkP1GvrTeoUyq2WkyWTkTOujB9mE2GUOoH/I+R4bA8ftJv3 CBudyyoRexHLnKq++kUMsuP3UmNAF3sA94j/HHuy4Yng0JQgzUNBI1l3Iqh2ckJpGf2V rB09x8TeItN+Rcvyd1FD7kqcMLxcexHSHCOfWK9s+lDBdtEvvgM7OD5YqhOIMm0SdUYN gGhInmaytXhkSRXcxn6sk0XoBm+RnoIfDADeEOaztMrVMa7vZsvocEkq22tMqYoYqoLW xGkWYT+6JqiMwVpiS1eUpS0eXJkX8CazW71rEmHIdAm6LSvcCabRukHwsIc97crSQq3P iYxg== X-Gm-Message-State: AKS2vOybpjj6/CNKEmtTcdiQK7O/30mPEHNUnyghRsZqUislVTw3bI3U GrhXvdHRPakbZJxO X-Received: by 10.46.80.24 with SMTP id e24mr11516026ljb.19.1498072910962; Wed, 21 Jun 2017 12:21:50 -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 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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 */