From patchwork Thu Sep 4 13:52:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 36710 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7EF8B20CBB for ; Thu, 4 Sep 2014 13:53:05 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id wp18sf52389221obc.5 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: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=uqw5etdQEf5peppxJf7qkalT5Q4eKSeoWgJru5XVOCQ=; b=ZoNSdkmZuv5ZAZMykUViUe4fHNuX8x6CSzS/+k+1P7ZO8ydo6q2myS/WYE2QWEt2TI q16Ksl/ElK6jA6mvwan4iEqqzk+8LvPWxSUvggI5hutyWolzx/PzGD6I3Sp36amxUZMX eSOKsP6lZKoT9dnTHardi/XtVc2c453OrBgxoP/O4Rkafn2KC1zJOD5wM8hgNJDR8H5D MK2QCtw6tsX7dgCxw7Jfc8Vx95hrYQ0DiQBP5tY2e98/nplnYGFtyDYuZhhVvuQ2M8Vx i+QDtL2wk7uK+/KYQC+XydFSXQKOCTroQCuod88Sl6JXm0MAzyfU9NGqKazGGAiWJQbY 8H7g== X-Gm-Message-State: ALoCoQl+blx+ETVj0jP9AmYZQyc4aRpJrk6f7NVi1uLVjmci7PTvm6JJ6ml6gtnzcAcplsHNXsHv X-Received: by 10.50.25.129 with SMTP id c1mr2519878igg.7.1409838785023; Thu, 04 Sep 2014 06:53:05 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.47 with SMTP id k44ls288615qgd.73.gmail; Thu, 04 Sep 2014 06:53:04 -0700 (PDT) X-Received: by 10.52.32.230 with SMTP id m6mr1069969vdi.74.1409838784861; Thu, 04 Sep 2014 06:53:04 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id dm3si5649652vcb.91.2014.09.04.06.53.04 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Sep 2014 06:53:04 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id id10so10574536vcb.2 for ; Thu, 04 Sep 2014 06:53:04 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr2435693vdb.25.1409838784804; Thu, 04 Sep 2014 06:53:04 -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 uj3csp841229vcb; Thu, 4 Sep 2014 06:53:04 -0700 (PDT) X-Received: by 10.112.163.103 with SMTP id yh7mr4474350lbb.73.1409838783367; Thu, 04 Sep 2014 06:53:03 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com [209.85.215.53]) by mx.google.com with ESMTPS id cq5si7447423lad.126.2014.09.04.06.53.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Sep 2014 06:53:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id q1so3234433lam.26 for ; Thu, 04 Sep 2014 06:53:02 -0700 (PDT) X-Received: by 10.112.62.229 with SMTP id b5mr4502045lbs.60.1409838782879; Thu, 04 Sep 2014 06:53:02 -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.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Sep 2014 06:53:02 -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 v3 6/9] mmc: sdio: Convert to dev_pm_domain_attach|detach() Date: Thu, 4 Sep 2014 15:52:33 +0200 Message-Id: <1409838756-31963-7-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> 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.171 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 --- 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); }