From patchwork Tue Jun 10 10:51:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 31630 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7D44820675 for ; Tue, 10 Jun 2014 10:52:27 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id i17sf6042688qcy.10 for ; Tue, 10 Jun 2014 03:52:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=8o1KR2xIzYYVTs5gsSjt7Fu2BUwVOTo4aIvuCYug1Ec=; b=CSIkx1szyT1/OOiBSMMrZBlJcMqpY1ORmUgc3atDkZNJWD3Y3WlDA0Dm8L0PrIQrWI HLxQSZnJ55BqnYXEiKeuyQ3RJrZBagKnFINxcb8ykT9dK1YnUeNU2T0TPMgi7q/Zz4JZ wbNHeXp5QVWS74ivxUgk63dcWKAK+kA7u86yv0wkUrOg4KB9BSHbe1gMqfONXnVlKKsn fQwUAqunwgxcz04Ov1EZheSJtYqoZQJNJH2KNZGVdY5FKoz81+O/j3S/S9rpiX8/zdPp 4eoHMgK5QTGn7IKKRx0UTwFbzK/uY8og3SXRup0R8VmpRe6ewc1szzi9cRYnYbZliIh0 7ZuA== X-Gm-Message-State: ALoCoQmhKTnYsvPfcfiDdwZzyzQPasFzdt1KIWzLZzmrko0AyWoYEnhsSxxyYlmhRrHgO6Q1QY9z X-Received: by 10.58.198.130 with SMTP id jc2mr7470256vec.9.1402397547341; Tue, 10 Jun 2014 03:52:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.118 with SMTP id f109ls1886822qge.8.gmail; Tue, 10 Jun 2014 03:52:27 -0700 (PDT) X-Received: by 10.58.220.230 with SMTP id pz6mr11620787vec.9.1402397547191; Tue, 10 Jun 2014 03:52:27 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id cj7si12918519vdb.40.2014.06.10.03.52.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 03:52:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hy4so1637356vcb.19 for ; Tue, 10 Jun 2014 03:52:27 -0700 (PDT) X-Received: by 10.58.133.6 with SMTP id oy6mr17740764veb.25.1402397547109; Tue, 10 Jun 2014 03:52:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.54.6 with SMTP id vs6csp215528vcb; Tue, 10 Jun 2014 03:52:26 -0700 (PDT) X-Received: by 10.152.87.176 with SMTP id az16mr6763570lab.43.1402397545884; Tue, 10 Jun 2014 03:52:25 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) by mx.google.com with ESMTPS id it5si21044090lac.107.2014.06.10.03.52.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 03:52:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by mail-lb0-f175.google.com with SMTP id l4so3811603lbv.34 for ; Tue, 10 Jun 2014 03:52:25 -0700 (PDT) X-Received: by 10.152.87.20 with SMTP id t20mr744134laz.79.1402397545139; Tue, 10 Jun 2014 03:52:25 -0700 (PDT) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id y6sm18329925laj.17.2014.06.10.03.52.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Jun 2014 03:52:24 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Kevin Hilman , Alan Stern , Greg Kroah-Hartman , Daniel Lezcano , Tomasz Figa , devicetree@vger.kernel.org, Linus Walleij , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Ulf Hansson Subject: [PATCH 09/24] PM / Domains: Remove dev_irq_safe from genpd config Date: Tue, 10 Jun 2014 12:51:22 +0200 Message-Id: <1402397497-26737-10-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1402397497-26737-1-git-send-email-ulf.hansson@linaro.org> References: <1402397497-26737-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The genpd dev_irq_safe configuration overlaps with the runtime PM pm_runtime_irq_safe() option. Let's remove it. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 4 ---- include/linux/pm_domain.h | 1 - 2 files changed, 5 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index da058e9..a2ebc77 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -616,8 +616,6 @@ static int pm_genpd_runtime_suspend(struct device *dev) if (IS_ERR(genpd)) return -EINVAL; - might_sleep_if(!genpd->dev_irq_safe); - stop_ok = genpd->gov ? genpd->gov->stop_ok : NULL; if (stop_ok && !stop_ok(dev)) return -EBUSY; @@ -662,8 +660,6 @@ static int pm_genpd_runtime_resume(struct device *dev) if (IS_ERR(genpd)) return -EINVAL; - might_sleep_if(!genpd->dev_irq_safe); - /* If power.irq_safe, the PM domain is never powered off. */ if (dev->power.irq_safe) return genpd_start_dev_no_timing(genpd, dev); diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 87810a7..7aadf40 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -63,7 +63,6 @@ struct generic_pm_domain { unsigned int suspended_count; /* System suspend device counter */ unsigned int prepared_count; /* Suspend counter of prepared devices */ bool suspend_power_off; /* Power status before system suspend */ - bool dev_irq_safe; /* Device callbacks are IRQ-safe */ int (*power_off)(struct generic_pm_domain *domain); s64 power_off_latency_ns; int (*power_on)(struct generic_pm_domain *domain);