From patchwork Thu Aug 28 08:38:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4799911 Return-Path: X-Original-To: patchwork-linux-mmc@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 96E579FC3A for ; Thu, 28 Aug 2014 08:39:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D1DB9201C7 for ; Thu, 28 Aug 2014 08:39:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8D6A201E4 for ; Thu, 28 Aug 2014 08:39:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936406AbaH1Ijl (ORCPT ); Thu, 28 Aug 2014 04:39:41 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:51631 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936420AbaH1Ij0 (ORCPT ); Thu, 28 Aug 2014 04:39:26 -0400 Received: by mail-lb0-f172.google.com with SMTP id 10so506509lbg.3 for ; Thu, 28 Aug 2014 01:39:24 -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=Wfa+uxZUZdxq4KcniPcfhHfRr3prB0jyH5pA4Bay8Sg=; b=I/XXb3vcHOsf+wtCnG3qxDfwYspcC3yeulMG43SByLHue4LO7AYVEUTsntnWayb72U Fo5wIwkOKocvoSQ5cBFgji3eJWUB4k+cB7VlvHVP5DYiyEMVjxPKVRJoV8C3TgPKvjr7 3XG0bauyP1+Eny30JBBP9MZLMVPoFP7SKBScYxgcNleQUpb0QzvUjDyScgszGR2EBl3j pmsQiL8YST1hMC3q8wq2LCeSBpyVVjmppZd6qOyKEjKtHIr0vv1NQV7GMukYSuj8RXFw cJB/F6uJtSbl98ET/tqpMCfh0GvDb4H4SMjeqzx1gaJLBrOEOaSpH9tRZw9vbZHSyKzW 5Jgg== X-Gm-Message-State: ALoCoQki/jllubQeW92i9ly3DdAU0MYNGH+01+tZWhQ10QLskRVjnZfN7ZhsTtdBXarMiuc9tPce X-Received: by 10.152.6.193 with SMTP id d1mr2554992laa.69.1409215164584; Thu, 28 Aug 2014 01:39:24 -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 t12sm4826676lbp.44.2014.08.28.01.39.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Aug 2014 01:39:24 -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-mmc@vger.kernel.org Subject: [PATCH v2 6/9] mmc: sdio: Convert to dev_pm_domain_attach|detach() Date: Thu, 28 Aug 2014 10:38:59 +0200 Message-Id: <1409215142-8218-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409215142-8218-1-git-send-email-ulf.hansson@linaro.org> References: <1409215142-8218-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 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 power domain was supported by the sdio bus. Let's convert to the common attach/detach functions for power domains, which currently means we are extending the support to include the generic power domain as well. Cc: linux-mmc@vger.kernel.org Signed-off-by: Ulf Hansson --- 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); }