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: 37652 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ED6A220293 for ; Fri, 19 Sep 2014 18:28:21 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id s18sf1864552lam.5 for ; Fri, 19 Sep 2014 11:28:20 -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=l4zK//sG5dzA4CTtb8FFNQbNY7f8Qgir/QmDKU70Hb4=; b=CoIPvG+EkpDn/oDY2yu6EEyAC32FadhaJIf6D/DSz8gBp2xq5PRzN5CCfMrDuosgqG tiTOXztJqujzoLetS+hKMl7/FXTNEdP59u4su5r/Fk4nZF4KpdNVjQbNsDKLUpxhaL/Q Pz27Y1yHIK64IqqAjBRCVksgl8wY7izWeUrEoZKH6plh6PBa8oOg4vAH2NGKMuDr6g3m /R7Jxr7df1cRN0JJ3cXdiUvkzNnO67zFvOszfw/Vho8dScXIIeA3FlkWO1uihAfJ4Fei pRIu1oudOCV2exhZRVvjsaC89Fl+H33Xjn9a2IKAfJyZbglrYJrgaIPs7vgSj8JgqPW8 L0Ig== X-Gm-Message-State: ALoCoQm3jNLQVAfoQFwhf03OhodT5FuVrHhOm3tfHOw8qUWaL6dFQhfjMETnyYRjpkOW6/ta1o/T X-Received: by 10.180.105.3 with SMTP id gi3mr25989wib.3.1411151300675; Fri, 19 Sep 2014 11:28:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.201 with SMTP id p9ls341431lae.15.gmail; Fri, 19 Sep 2014 11:28:20 -0700 (PDT) X-Received: by 10.152.198.204 with SMTP id je12mr8801187lac.52.1411151300529; Fri, 19 Sep 2014 11:28:20 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by mx.google.com with ESMTPS id v2si3556529lal.134.2014.09.19.11.28.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Sep 2014 11:28:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id z11so3728596lbi.35 for ; Fri, 19 Sep 2014 11:28:20 -0700 (PDT) X-Received: by 10.152.22.137 with SMTP id d9mr8501116laf.29.1411151300474; Fri, 19 Sep 2014 11:28:20 -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.112.130.169 with SMTP id of9csp989541lbb; Fri, 19 Sep 2014 11:28:19 -0700 (PDT) X-Received: by 10.70.88.66 with SMTP id be2mr4019741pdb.30.1411151294090; Fri, 19 Sep 2014 11:28:14 -0700 (PDT) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by mx.google.com with ESMTPS id ro4si4216412pbc.109.2014.09.19.11.28.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 19 Sep 2014 11:28:14 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.53 as permitted sender) client-ip=209.85.220.53; Received: by mail-pa0-f53.google.com with SMTP id hz1so606047pad.40 for ; Fri, 19 Sep 2014 11:28:13 -0700 (PDT) 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> 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.217.176 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 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); }