From patchwork Fri Sep 19 18:27:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4939641 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 509A9BEEA5 for ; Fri, 19 Sep 2014 18:31:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8613720204 for ; Fri, 19 Sep 2014 18:31:46 +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 A163C20200 for ; Fri, 19 Sep 2014 18:31:45 +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 1XV2wD-0000yT-5g; Fri, 19 Sep 2014 18:29:45 +0000 Received: from mail-pd0-f180.google.com ([209.85.192.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XV2v7-00087M-8u for linux-arm-kernel@lists.infradead.org; Fri, 19 Sep 2014 18:28:37 +0000 Received: by mail-pd0-f180.google.com with SMTP id r10so429607pdi.39 for ; Fri, 19 Sep 2014 11:28:16 -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=l1LQv0XfO0ADxSMANGERR2rcZhcuk79Gwxr7z90N384=; b=ifU9f7i9cH3vuA2lmSRo+X9ienPxhi9iLDLP06/kngyTZNYLLjqQNkn2ftHcLtbcGn emzhco9kdZwpEuJ7X6Fr/OkQq407+7/AQWwOxAD2ALMbu0w7Rp6meG/skp2gd4391InL XCfWTVtP0fH1nBTukm0ljD8l37SAEXnN8ihN6/8JjLAaRqGL48XZjTBWifo4bnwAYhOo 92kBejUFkZKX4rfdN3JarKS1whNHhK2bvxccrBz/voiwFNsVRfw8nKOmGFrN/TtJcw+k BPpUtor+nUMpoLUegnqosbgQAhDRyjcEqdFahZQyII2jnB+AS2v2M4rnx8WClTqv4Q9z H1uw== X-Gm-Message-State: ALoCoQl0ZgMKOV6rRIG5g5HuORp+YGCWSbDRFDnJe3xuoLITmd8USjpMl4UEaCsR5R8+MYTMHDHi X-Received: by 10.70.59.35 with SMTP id w3mr3406557pdq.51.1411151296012; Fri, 19 Sep 2014 11:28:16 -0700 (PDT) Received: from localhost.localdomain ([38.126.120.10]) by mx.google.com with ESMTPSA id ki1sm2495071pdb.59.2014.09.19.11.28.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Sep 2014 11:28:15 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-pm@vger.kernel.org Subject: [PATCH v5 08/11] spi: core: Convert to dev_pm_domain_attach|detach() Date: Fri, 19 Sep 2014 20:27:41 +0200 Message-Id: <1411151264-16245-9-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1411151264-16245-1-git-send-email-ulf.hansson@linaro.org> References: <1411151264-16245-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140919_112837_347224_FE07451C X-CRM114-Status: GOOD ( 13.71 ) X-Spam-Score: -1.0 (-) Cc: Ulf Hansson , Geert Uytterhoeven , Wolfram Sang , Linus Walleij , Tomasz Figa , Philipp Zabel , Kukjin Kim , Russell King , Daniel Lezcano , Magnus Damm , linux-acpi@vger.kernel.org, Alan Stern , devicetree@vger.kernel.org, Kevin Hilman , Chris Ball , Simon Horman , Ben Dooks , linux-arm-kernel@lists.infradead.org, Dmitry Torokhov , Stephen Boyd , linux-spi@vger.kernel.org, Mark Brown 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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Previously only the ACPI PM domain was supported by the spi bus. Let's convert to the common attach/detach functions for PM domains, which currently means we are extending the support to include the generic PM domain as well. Cc: linux-spi@vger.kernel.org Signed-off-by: Ulf Hansson Reviewed-by: Kevin Hilman --- drivers/spi/spi.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index ca935df..72a0beb 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -264,10 +264,12 @@ static int spi_drv_probe(struct device *dev) if (ret) return ret; - acpi_dev_pm_attach(dev, true); - ret = sdrv->probe(to_spi_device(dev)); - if (ret) - acpi_dev_pm_detach(dev, true); + ret = dev_pm_domain_attach(dev, true); + if (ret != -EPROBE_DEFER) { + ret = sdrv->probe(to_spi_device(dev)); + if (ret) + dev_pm_domain_detach(dev, true); + } return ret; } @@ -278,7 +280,7 @@ static int spi_drv_remove(struct device *dev) int ret; ret = sdrv->remove(to_spi_device(dev)); - acpi_dev_pm_detach(dev, true); + dev_pm_domain_detach(dev, true); return ret; }