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: 110848 Delivered-To: patches@linaro.org Received: by 10.37.128.210 with SMTP id c18csp7031380ybm; Wed, 23 Aug 2017 07:42:19 -0700 (PDT) X-Received: by 10.46.7.67 with SMTP id i3mr1039760ljd.90.1503499339657; Wed, 23 Aug 2017 07:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503499339; cv=none; d=google.com; s=arc-20160816; b=nPNgDwKBbq3cLMbXW4ncSUV97vGcYA8BbvS0RHPRcYcbwUhkgoqobTLsS91emZZtQ7 itly0+X5/QWQZWJpHs2nGon1xJehClb+oWt25c8wHFXO4MTVK2nPJ2BtOjeb1ONt8q9F sfrkwmzKrNiYhtLeeyUIqMndICBxR3RrVoUzeNSbWwWi+IMY82ARIvQHGaYyQ54dg6Te tuXnKk0g9BuRxPgNaUaPLWSmQqY2rkqAiOJyqxz5K58Gn77A3NhHKEfcVxYb68M4MW22 6DvVmkLs8mQPAgjqLma+WLjbo824cqZuoByvG/LG4wXRhIjQRvZaolkwP863HELX8b4Q eDdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=K+c1reHhAyzBsLbN0U8sxsB1BZjUOEtCkSCHqstB7PI=; b=y4tA2L9YsE4b+rnwce6sr6+zrO8P22hp7/ruzq7JXe9EUmNcPlY5wF9alzp08sUm4E 3M9CRIvc/Wg5LS/fjNA7fioDTcIBQHc+e8Mihl6nU21KNSogiu+tZnINy632lFJsmFmt 2q4ToszCs/FOuYZjdgTsdXnWYUSUHN9ZuoxGnuseeNtYvUk/2GKLgPI3sDmwdkKnImoz 6a1R6PC//di1yEBE8YFw4XtPGAYeGfPjZEmv1ccwmODWG+zaoiBB0sop8KY8X28yMweE +Nhjh9thZdeWC7MEbLKsAonXwUEUaKEfFVu8I7RwBNzxl1RsT2UdxfQPOo+MInMUQud5 uocQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QK3/ASKD; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-lf0-x236.google.com (mail-lf0-x236.google.com. [2a00:1450:4010:c07::236]) by mx.google.com with ESMTPS id x26si766215ljd.237.2017.08.23.07.42.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 07:42:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) client-ip=2a00:1450:4010:c07::236; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QK3/ASKD; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x236.google.com with SMTP id y15so1334606lfd.5 for ; Wed, 23 Aug 2017 07:42:19 -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=aZzzpoM5+cNs0VI5VTzYu67JHpt+oJtGTLlV2z9pFqvPLTMWT1cjrpvbYlE3uLUhFJ ofLizM3vdgoGGDhEnRIdOKD7DQOJ00fQigU3lPqaCIxpNwmM/f8lJuNysh4w7JPCxJQP CEIMahS7zGsq7j1k+N30Kzh2dzghnnpAH8iasWiPsVlk7lgtCchpIaquYrbIoF97KRe7 6BOS5/MIA6A4/vaVGUSiwb2W6z7NrS9mZehb+PSDp3vpcr3xeP7HpaaR3pnJxvpGFjSV jMVkedYaq5fyMuU9J5tS3lbA5wt3RSZrOzahDHgnhufyNOwhOAsgW+FNqnDTwdc6xJpT IT/g== X-Gm-Message-State: AHYfb5gtvggbLn3eii90yNGG9ioMeRIJUOVaZwpTmolg9t0Jx6PbY92N n/qN8z93YD23aUQ0yTE= X-Received: by 10.46.25.194 with SMTP id 63mr1396534ljz.21.1503499339264; Wed, 23 Aug 2017 07:42:19 -0700 (PDT) Return-Path: 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 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 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> 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(-) -- 2.7.4 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 */