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: 4328171 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C253CBEEAA for ; Tue, 10 Jun 2014 10:56:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0999D201F5 for ; Tue, 10 Jun 2014 10:56:04 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 22E9F2015D for ; Tue, 10 Jun 2014 10:56:03 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WuJgW-0005iA-F8; Tue, 10 Jun 2014 10:53:44 +0000 Received: from mail-lb0-f180.google.com ([209.85.217.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WuJfW-0004yl-Bx for linux-arm-kernel@lists.infradead.org; Tue, 10 Jun 2014 10:52:43 +0000 Received: by mail-lb0-f180.google.com with SMTP id p9so3705763lbv.25 for ; Tue, 10 Jun 2014 03:52:25 -0700 (PDT) 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=8o1KR2xIzYYVTs5gsSjt7Fu2BUwVOTo4aIvuCYug1Ec=; b=QcHgplsZVITlfnOUqg+iVU+t8SRkJxTOhieub9ipvdtHkDwTamnDuqttJpZFoVJ2fh iEL0uhLTvj0lQ+Paq3bvaY7sED8L/tCaJZAjovs9J48OgcK7zNHr14puYVoaRXzrzPRy xj/ZTDppa2DcTPrsrAh6SsN2j8u5nEDzTN7FEzqm02iwWCdnCIJmlcC51KnnGYZzySzX jpD8FMcy378vwDb0TCi3S+9ObaBt6iz8mmiCEvSBpyzkoQirTU6Ryr0tiLgBdWl6oRlY 2EUZkUg3tAhCZPfaI3RQatDT3i+3dCDfiamqh4K3UHFqsFkK/veIPqaOc18gicyERwPK kB8g== X-Gm-Message-State: ALoCoQmewilzif+nSufaRZAnQ9i1FsuDGgjwSaQ2CrGCxD3icyqiwCyw8GHIdk8pyp7LXL9gQVyU 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140610_035242_611026_76DEA8AD X-CRM114-Status: GOOD ( 11.45 ) X-Spam-Score: -0.7 (/) Cc: devicetree@vger.kernel.org, Ulf Hansson , Kevin Hilman , Philipp Zabel , Greg Kroah-Hartman , Linus Walleij , Daniel Lezcano , Magnus Damm , Tomasz Figa , Simon Horman , Alan Stern , Mark Brown , Ben Dooks , Kukjin Kim , Stephen Boyd , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);