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: 9927615 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 B85A46022E for ; Tue, 29 Aug 2017 14:57:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A6DD028979 for ; Tue, 29 Aug 2017 14:57:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A15728986; Tue, 29 Aug 2017 14:57:31 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham 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 4125D28979 for ; Tue, 29 Aug 2017 14:57:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754663AbdH2O53 (ORCPT ); Tue, 29 Aug 2017 10:57:29 -0400 Received: from mail-lf0-f42.google.com ([209.85.215.42]:32781 "EHLO mail-lf0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754662AbdH2O5G (ORCPT ); Tue, 29 Aug 2017 10:57:06 -0400 Received: by mail-lf0-f42.google.com with SMTP id a126so14480941lfa.0 for ; Tue, 29 Aug 2017 07:57:06 -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=QM2nYiMNJuLMBhGO5XnYuBlajs4EvTBopIKbNM3QDKbQLyIWrpD/Qn54aLyu7Jaedu 5LUv61v+QlTnjozfzWTDgjATskTh7ff/AeQPua8kG8tIjX7yeVYysMbUriKttd25dAx4 eJU8EsiGcdxTIoAhx8YxCjfY99tkLYFRU2rFPyP/k0vF+OxO1b58yFHGwblmdsiAh0J8 VQ39ff9bBZ7TJBbDC4NChO9Fu6XMmCA++MsdLjjJy+vResvIgVWqddgGlPBQED2+Wf77 LOUH2ejZZrh6Iwfjz/1P53FNJw1QHHfggHgkf1RlMUI8kYy/EUaI2SIrGTHpEUZCis8/ OOuQ== X-Gm-Message-State: AHYfb5iKAGz5AuQxq/OPjBHOrUJ8M3DJPicjVCHg/gpe0RQvffnCpBys aKISrjmiFV/wwnKnn1/H4Q== X-Received: by 10.46.5.19 with SMTP id 19mr272268ljf.155.1504018625301; Tue, 29 Aug 2017 07:57:05 -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 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> 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 --- Changes in v3: - 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 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 */