From patchwork Tue Apr 26 06:47:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 66668 Delivered-To: patches@linaro.org Received: by 10.140.93.198 with SMTP id d64csp1440846qge; Mon, 25 Apr 2016 23:47:35 -0700 (PDT) X-Received: by 10.25.144.204 with SMTP id s195mr534549lfd.120.1461653252330; Mon, 25 Apr 2016 23:47:32 -0700 (PDT) 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 103si14401417lfw.239.2016.04.25.23.47.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Apr 2016 23:47:32 -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; 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 dis=NONE) header.from=linaro.org Received: by mail-lf0-x236.google.com with SMTP id j11so6205124lfb.1 for ; Mon, 25 Apr 2016 23:47:32 -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=1F65Bp7m8qs6i8PpChOgeGRc5NfRTmClW+rtqqrvM0g=; b=RmGldBBpm32TQuOLaxZtYOgrnkHYYn0bgcaFBNDAoFsqk2wskMsEE0GwuKKHvSLO/F v+lR6NVYuHaWkdo2e39ZA1nm3l3+lPixElCmQnSUT/flMGYbHTj67RINbjJHXFllDLBU ysHa/S2N5Lvnpx897DJXwDOp0p8ny0mA7g07o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1F65Bp7m8qs6i8PpChOgeGRc5NfRTmClW+rtqqrvM0g=; b=MEnStxEhEzj7n5vxEry1tpLe9/s5QESV1mqipGk0pbqfoEE/RdIsqkE4iVf9DTP9mD RkrKzMsSNmJF8atlHZ4SYOEZXc+/UOw3TUUas+pSpDxBTq2PLb1ZnRye/e3O3TBHxKGC /kD9r701owKMt55oDmWl53sVSa4v2zecZk47bQzS4Rh93Cg5RsZv+oRSFiZJTASE4U78 s4jf8Xzmm7hqSXtHpFWb4qudfc8LgEn3410Dvj4RpUKqwwpKDEBbwogGTbb2ggvXKjBI y0l55mQqg0Syw4iQqHkQ1kseCtiscX2pcs8a0hF/UzSAzqRs/XIzJcPFH3aAa7gYtFzP ThEw== X-Gm-Message-State: AOPr4FW1OBjxzjPu63goACmq9iLpcpRcMs9YSD0Plexn5NvvlenLO3f8zYalbl/bPkkUqYzuxpk= X-Received: by 10.25.91.133 with SMTP id p127mr565373lfb.14.1461653252053; Mon, 25 Apr 2016 23:47:32 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-155-4-128-67.na.cust.bahnhof.se. [155.4.128.67]) by smtp.gmail.com with ESMTPSA id p199sm2248306lfd.12.2016.04.25.23.47.30 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 25 Apr 2016 23:47:30 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , linux-pm@vger.kernel.org Cc: Len Brown , Pavel Machek , Geert Uytterhoeven , Lina Iyer , Axel Haslam , Marek Szyprowski , Jon Hunter , Andy Gross , Laurent Pinchart Subject: [PATCH v2 2/2] PM / Domains: Drop unnecessary wakeup code from pm_genpd_prepare() Date: Tue, 26 Apr 2016 08:47:18 +0200 Message-Id: <1461653238-3891-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1461653238-3891-1-git-send-email-ulf.hansson@linaro.org> References: <1461653238-3891-1-git-send-email-ulf.hansson@linaro.org> As the PM core already have wakeup management during the system PM phase, it seems reasonable that genpd and its users should be able to rely on that. Therefore let's remove this from pm_genpd_prepare(). Signed-off-by: Ulf Hansson --- Changes in v2: None. --- drivers/base/power/domain.c | 6 ------ 1 file changed, 6 deletions(-) -- 1.9.1 diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 60a3573..de23b64 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -730,12 +730,6 @@ static int pm_genpd_prepare(struct device *dev) * at this point and a system wakeup event should be reported if it's * set up to wake up the system from sleep states. */ - if (pm_runtime_barrier(dev) && device_may_wakeup(dev)) - pm_wakeup_event(dev, 0); - - if (pm_wakeup_pending()) - return -EBUSY; - if (resume_needed(dev, genpd)) pm_runtime_resume(dev);