From patchwork Fri Sep 19 18:27:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4939481 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BCB559F40F for ; Fri, 19 Sep 2014 18:28:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E1C0520204 for ; Fri, 19 Sep 2014 18:28:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1FC672020E for ; Fri, 19 Sep 2014 18:28:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757804AbaISS2Q (ORCPT ); Fri, 19 Sep 2014 14:28:16 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:47841 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757785AbaISS2O (ORCPT ); Fri, 19 Sep 2014 14:28:14 -0400 Received: by mail-pd0-f181.google.com with SMTP id r10so433281pdi.40 for ; Fri, 19 Sep 2014 11:28:13 -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=l4zK//sG5dzA4CTtb8FFNQbNY7f8Qgir/QmDKU70Hb4=; b=V12qDEWNAfAIFgZ3aasFvpTh0zoEqpbE3zJrh85QtvYTrDKszncHTTwJ4WgI+l4HPq yHIIma5GAbBv/cizao1D4B3Umvse1+opagUrMfICewx/PVex5d7tnkx4JPjc+WkuWO8T qQuDWGqs5jPZg/9ng7/00Oi8g60s8oNQ2t6QqLSbl76cSTaomY05x0pMupFrc68YdXKM crxRKPG24R3n9VfOT+hxhv0eYPKlMsqmxX1aXRoeJpNl5cPwQV1epX+lOgykQ7SJz+5P ZRjjNeutfzo6l/UVrMGJlYEd6+9JNnIZfmN2HruWBtT+77y1cg7GlrEdFiA8hgrTMhLZ X7Ng== X-Gm-Message-State: ALoCoQnOJvcJRlGW/8tyf+SO5pRRrUc3WSEwjQAJ9X7ZOWboQaSx5eWwC0D8Se+BQeUa0/w/EybL X-Received: by 10.68.102.132 with SMTP id fo4mr2965248pbb.96.1411151293400; Fri, 19 Sep 2014 11:28:13 -0700 (PDT) Received: from localhost.localdomain ([38.126.120.10]) by mx.google.com with ESMTPSA id ki1sm2495071pdb.59.2014.09.19.11.28.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Sep 2014 11:28:10 -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 , Dmitry Torokhov , Ulf Hansson , linux-mmc@vger.kernel.org Subject: [PATCH v5 07/11] mmc: sdio: Convert to dev_pm_domain_attach|detach() Date: Fri, 19 Sep 2014 20:27:40 +0200 Message-Id: <1411151264-16245-8-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> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 sdio 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-mmc@vger.kernel.org Signed-off-by: Ulf Hansson Reviewed-by: Kevin Hilman --- drivers/mmc/core/sdio_bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 4fa8fef9..1df0fc6 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -315,7 +315,7 @@ int sdio_add_func(struct sdio_func *func) ret = device_add(&func->dev); if (ret == 0) { sdio_func_set_present(func); - acpi_dev_pm_attach(&func->dev, false); + dev_pm_domain_attach(&func->dev, false); } return ret; @@ -332,7 +332,7 @@ void sdio_remove_func(struct sdio_func *func) if (!sdio_func_present(func)) return; - acpi_dev_pm_detach(&func->dev, false); + dev_pm_domain_detach(&func->dev, false); device_del(&func->dev); put_device(&func->dev); }