From patchwork Wed Aug 23 14:42:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9917535 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 C1A4560327 for ; Wed, 23 Aug 2017 14:44:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33D6F20121 for ; Wed, 23 Aug 2017 14:44:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27F1C21E5A; Wed, 23 Aug 2017 14:44:34 +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=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW 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 BC55D20121 for ; Wed, 23 Aug 2017 14:44:33 +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=ogHfZVB2+CVMw0IGMgENiR7zHj3rNhc9gnxAEFpsUjs=; b=Xwu0aujrWPDaISCtJTRbFeVR5p YiBmbRUvjKjRM9bgdDjR7MhGdy4nW8cIS7iOJAOJakm6E3xgV4VrngCndIXPgoxo45miWFEqHe9U+ G43JVdv1Ezd0wWTerGXi/RvLabpxUmYgaFB+wggWaFxHFTIa0Kwj//qfNnhA0isSssDxvvfd9djnm 1qvhvbEgop7GCZ+Ogj25aIE2QP8VSfrbbWLgjtZOiNaEgs7raRfzVmufmO3uovLc2fLueR5nuu6Jb 2dJwS5x+WGOLRmcODBCxqAGfAxBD4HvwkBosdj/bP9jn+0Bl2hWE9D0Q9K3dK9n01xcLV/ijzxeTF W6YkpOGw==; 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 1dkWtS-0003O5-3j; Wed, 23 Aug 2017 14:44:30 +0000 Received: from mail-lf0-x235.google.com ([2a00:1450:4010:c07::235]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dkWrh-0001L7-Az for linux-arm-kernel@lists.infradead.org; Wed, 23 Aug 2017 14:42:43 +0000 Received: by mail-lf0-x235.google.com with SMTP id l137so1426699lfg.3 for ; Wed, 23 Aug 2017 07:42:20 -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=K+c1reHhAyzBsLbN0U8sxsB1BZjUOEtCkSCHqstB7PI=; b=QK3/ASKDUq29BjRT0h5wCFBbo/xHmwRcz4HT1EIpiZLl3OHkBBN3F66qqhfqjlrBnT 8gwVCZU6iwKJpL5c7NU1jWm4qtwHSpZZ99ljTE4sdyBAcpOPfsrRrXg6Jq6WAUW1Ju3+ b3E6chswth4y4oVL145lto1LBq1H8MX7kfMrI= 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=K+c1reHhAyzBsLbN0U8sxsB1BZjUOEtCkSCHqstB7PI=; b=l/DKzu1O/konwRCTSluLKXevmNbTutlZ3AeW7rpiNhXvsBxSplY4lAimyMWrKQ+2aU zgaTYmQ+iWvGDy54ZtqNAnX5FDmdWBPrbS3gRrDX+eaWFKO4RwqB9XEvgHoLt9F3bBGZ PTSD9siX/CncgpGyn6ndeK4jR7B74RMmEJTkRUCr1DPW1d5SdHqKjIZzuVJ6+oD4RyHD +SI8+nYHUA+KY5uS8bUcPDLh1HIVYLST9gipY7sJy0TKSbCxX1rD83zz/9tKfWAe0YRD 6zvdrIq9dWjFqWJKZ4Z2KoX556k+xX9+pYaFcfMIWNhJ+oH0uFdkLSWVZHhfxwlmFinS oDrA== X-Gm-Message-State: AHYfb5jIqYH6Gi5Z3V3ARG+5lVgsUcfKWL/NrivCCbnWuAYha3ISgfaO Zev8fEr3xGnv6Y9Y X-Received: by 10.46.25.194 with SMTP id 63mr1396534ljz.21.1503499339264; Wed, 23 Aug 2017 07:42:19 -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 c89sm287593lfb.78.2017.08.23.07.42.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Aug 2017 07:42:18 -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 v2 2/9] PM / Sleep: Remove pm_complete_with_resume_check() Date: Wed, 23 Aug 2017 16:42:02 +0200 Message-Id: <1503499329-28834-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503499329-28834-1-git-send-email-ulf.hansson@linaro.org> References: <1503499329-28834-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170823_074241_672369_27F1ECE4 X-CRM114-Status: GOOD ( 11.08 ) 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 --- Changes in v2: - 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 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 */