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: 9802779 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 12505601C0 for ; Wed, 21 Jun 2017 19:23:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00B052015F for ; Wed, 21 Jun 2017 19:23:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E932A27528; Wed, 21 Jun 2017 19:23:11 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A6E042015F for ; Wed, 21 Jun 2017 19:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=sBiMCRaDlu6enY5FEDTHnnwl5vZpAuhyUhQhd/6VOuQ=; b=rx0+kDel3nbRqpRr3oIZSpOVK3 ljF1UPIb5nwKBa0yz/zV4pMcwa5KmN4zw+1M2G+1nYKiwzRsjm5OKk38RXzcwa/+fAmjNu6/S8BTo kevu/1k78wZ33vcA78PH3CcZAdx8d4+jnDwkGSUrfI8/Zr3/WjsEJ8m+e6Ovgan6ktaSHAHYfIwjm 2ywe4OiVg1du71wsUQ7qNskG5+H2C0Jv1L1AeeESNEkeN3YNoFg59Sv42QJDxtvAkIbtuUv7sK3BW yztOyywoVsRt7FuerYgcDi/L43V/QzQL9vfWSZucY1UeAVS2c7f8+f13zTJ+vcWyL1KsMCnVigSjp OGUa0yHQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dNlDZ-0003ES-L6; Wed, 21 Jun 2017 19:23:09 +0000 Received: from mail-lf0-x232.google.com ([2a00:1450:4010:c07::232]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dNlCe-0001y7-RO for linux-arm-kernel@lists.infradead.org; Wed, 21 Jun 2017 19:22:15 +0000 Received: by mail-lf0-x232.google.com with SMTP id p189so102984172lfe.2 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=av5TCDXw2Vrd64h0hp8J42hN17B521OZAE5VP60onN2Lj4pu+xDz5cfC3YbSnBmUlR vh7KLCDo32FidV8lal0FZgdoD3vF7QCu32lDXpsXivZOkzfQD0z1n8yTCvuXk15zwkyb wXnGxXmXeJv5rKKoCNCzrYbakVS7Hs3S45P2R50fKPy0F6vF9qjPTDEHNFqVuHMr8Xuw xCkjlWRApDL7nbOmMpWQwz3l3jcRlIoeYgxLIkeYVSZiehzgD+yglB84Rm4CEv/3PL0E drUAPsVG5dgiPqF5ogHNfiwQxqM/o9wvPyQtTKhdHslwrFB2LqJNvDe3BnluY0pMT2LQ C7UQ== X-Gm-Message-State: AKS2vOw/PyDx3Y+GAvTC/YYuR7Y6k0prPCC/FrYQ61jbDuLdt9thj5+6 MIFJ3UN1fGr/Q8zL 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170621_122213_072357_C22CD1B7 X-CRM114-Status: GOOD ( 11.16 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jisheng Zhang , Ulf Hansson , Guodong Xu , Kevin Hilman , Jarkko Nikula , Haojian Zhuang , John Stultz , Andy Shevchenko , Mika Westerberg , Sumit Semwal , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.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 */