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: 36165 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3EE54202DD for ; Thu, 28 Aug 2014 08:39:27 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id j5sf3713307qga.7 for ; Thu, 28 Aug 2014 01:39:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=Wfa+uxZUZdxq4KcniPcfhHfRr3prB0jyH5pA4Bay8Sg=; b=HuiXS24Qp/DNjpnMi8mIvVBY3Jq+egjq33LBetfW8NhbmjKvf7hmUaX+r5SMPodaM6 lbfljeO/saV7jeX1yD7TJ4Eb9P0qaCcfXnCtlWSjQLs/fw9Nt7aqe3Xa3guUtViNpcNp TtHk/EnvSs5wlr/NLQ1jLb+0acpoV78+UgJy1dNa7RMeKUh2+TjSIkdsP1DKrqHgBCKS qgkhJsDv8W+3bqtQeh1mWYxUA4mE1/xJJPLfAVae43rliy4eO0kIrC2LhBzfwrcXb85C m6nM9pNNiY9YgH8I/qmeWDTEKoSzt3EILL7BDNddtSB59MKnmePmWgIQL4C00sCneTMp vMbA== X-Gm-Message-State: ALoCoQlIxfAPwVvft5YST64rBR6vu+u4RDOvB8YdYEXkwM92ro2cyWVaHH82O5gQysuBYTWZuNgA X-Received: by 10.236.142.139 with SMTP id i11mr3591620yhj.56.1409215167089; Thu, 28 Aug 2014 01:39:27 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.106.34 with SMTP id d31ls478145qgf.93.gmail; Thu, 28 Aug 2014 01:39:26 -0700 (PDT) X-Received: by 10.52.1.39 with SMTP id 7mr1627302vdj.17.1409215166796; Thu, 28 Aug 2014 01:39:26 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id wa16si2927925vdc.51.2014.08.28.01.39.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 01:39:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hq11so439488vcb.8 for ; Thu, 28 Aug 2014 01:39:26 -0700 (PDT) X-Received: by 10.52.190.71 with SMTP id go7mr1688455vdc.28.1409215166659; Thu, 28 Aug 2014 01:39:26 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp201169vcb; Thu, 28 Aug 2014 01:39:25 -0700 (PDT) X-Received: by 10.112.167.103 with SMTP id zn7mr2403476lbb.63.1409215165263; Thu, 28 Aug 2014 01:39:25 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id gl6si4298465lbc.41.2014.08.28.01.39.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Aug 2014 01:39:25 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id z11so489918lbi.8 for ; Thu, 28 Aug 2014 01:39:24 -0700 (PDT) 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> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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); }