From patchwork Thu Sep 4 13:52:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4845881 Return-Path: X-Original-To: patchwork-linux-acpi@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 340B8C0338 for ; Thu, 4 Sep 2014 13:53:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 17716202BE for ; Thu, 4 Sep 2014 13:53:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2069B20340 for ; Thu, 4 Sep 2014 13:53:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753204AbaIDNxL (ORCPT ); Thu, 4 Sep 2014 09:53:11 -0400 Received: from mail-la0-f54.google.com ([209.85.215.54]:35274 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753132AbaIDNxH (ORCPT ); Thu, 4 Sep 2014 09:53:07 -0400 Received: by mail-la0-f54.google.com with SMTP id b17so11618494lan.41 for ; Thu, 04 Sep 2014 06:53:05 -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=AvLGS5cdgtxghjsquXmqa+Aw4Z/u5hSQpi1jW/Y0YgI=; b=QPOtrm1iw5SLb6DLW8AR2YL9eHYFDjiwplYb9ngq5YNZ1Nzls5yYxp15NvX2WRsV69 1YqU6EceXXDrrME/kiEuFd9P5/D7sWNj3KiY0NZcmoXN8jpBSEIabfEO5jy5k7Q+mDgr 4XcahmpnwNr82RMlWfix5VyDDx6eR29zMdC6CWjyfxdJg945A5jcrp50GoE7Ge61Aw6H AYk2oHochT5wF2eeDO+P2bkydz8d3VxZnsCvax96gP9sgIBP8fniRiq+NkU9qAi2KsA8 rY/pUPwMjUDs7MyXDrI35s9yvc9/5Gl6mmo3pLfxt9FlAcmxJzwKoodGMsVmX26UFCtK Vv8g== X-Gm-Message-State: ALoCoQkmPbUrFrK59vfVYz8pmkZJRX23TlUefVeCBKNR9T9wsAoIkfezliyN4KpWuFP12atg/EdU X-Received: by 10.112.163.103 with SMTP id yh7mr4474644lbb.73.1409838785940; Thu, 04 Sep 2014 06:53:05 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id p3sm2085260lap.14.2014.09.04.06.53.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Sep 2014 06:53:05 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , Greg Kroah-Hartman , linux-pm@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, Geert Uytterhoeven , Kevin Hilman , Alan Stern , Daniel Lezcano , Tomasz Figa , devicetree@vger.kernel.org, Linus Walleij , Simon Horman , Magnus Damm , Ben Dooks , Kukjin Kim , Stephen Boyd , Philipp Zabel , Mark Brown , Wolfram Sang , Chris Ball , Russell King , Ulf Hansson , linux-spi@vger.kernel.org Subject: [PATCH v3 7/9] spi: core: Convert to dev_pm_domain_attach|detach() Date: Thu, 4 Sep 2014 15:52:34 +0200 Message-Id: <1409838756-31963-8-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409838756-31963-1-git-send-email-ulf.hansson@linaro.org> References: <1409838756-31963-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-8.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 --- 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; }