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: 9981841 X-Patchwork-Delegate: rjw@sisk.pl 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 398C66038E for ; Tue, 3 Oct 2017 07:11:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C3362870C for ; Tue, 3 Oct 2017 07:11:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20F322887E; Tue, 3 Oct 2017 07:11:26 +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=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 CC9BE2872A for ; Tue, 3 Oct 2017 07:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751133AbdJCHLY (ORCPT ); Tue, 3 Oct 2017 03:11:24 -0400 Received: from mail-lf0-f43.google.com ([209.85.215.43]:56124 "EHLO mail-lf0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751146AbdJCHLX (ORCPT ); Tue, 3 Oct 2017 03:11:23 -0400 Received: by mail-lf0-f43.google.com with SMTP id p184so8307029lfe.12 for ; Tue, 03 Oct 2017 00:11:22 -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=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=g1rxJwQCbDgAsgnGIvRT9iMAfOo7O86+qhf2MKSLOYZBiTnVGkVMdT23jOdKcn+XCN OjZkkOYX3MXmMTwfAns+ya1z8AE20mdmI8TT7Dj/Liwjf3+GgSBEEmSFm28/RnbZuAJp hXUP+CRX/85SH1BDeSVuAmqz3L6+1OrhmH02OHKgmbO+oS57msHVBsdPIFjfkztyq8WB w76r41voExDXOtChJuqr5sJorKr130lTJPLJulP3F3vNRqVVD88Lsyp8OoSHB10xxt6k 9XWvmpMMzTKAxosXvaTEbZa7HIwlzOeJheJdkuByMBENld3f+957AW1o4Ol1Cw92WQ8Z DMlg== X-Gm-Message-State: AMCzsaUdtWv68pS2LH9Hi/qsmwtxE2bdOyDkbiaWsJHklVXMsG2daP+C xY47475fFJZ9pV9DIMRNdT2XqA== 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) 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> 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 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 */