From patchwork Tue Aug 26 12:07:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 4780801 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E71F7C033A for ; Tue, 26 Aug 2014 12:08:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D0C2201E4 for ; Tue, 26 Aug 2014 12:08:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 485C22015A for ; Tue, 26 Aug 2014 12:08:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757916AbaHZMIB (ORCPT ); Tue, 26 Aug 2014 08:08:01 -0400 Received: from mail-la0-f54.google.com ([209.85.215.54]:57032 "EHLO mail-la0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757895AbaHZMH7 (ORCPT ); Tue, 26 Aug 2014 08:07:59 -0400 Received: by mail-la0-f54.google.com with SMTP id hz20so15117931lab.27 for ; Tue, 26 Aug 2014 05:07:58 -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=p/lCAVvq/lMStxchzfltNa1uyCrctuzXrbYIUOt28W4=; b=XKiNjRTa2k2XpK2ix0KvT3keiCMmX//6BCM1TdP7le2pMl2irsT33l03t0hSqr3PYw ytwCjETTKBFr6niBKfI1mroVVmE1IL5E7WxSprZpXuD/i4sGkJpoZ3uIQTqkgrJ6HdSV 7qpN4JnVWetGLlGcEaWHMo9PDmo/i6/nlYbgVsXKp3jqQAZzVFQjSt0+mRpQkXUGoXeR AjZB1eGV6asMiJSQKeTNhTKD3NYObgf8SQoYW5Mpig+FSXtBj2BIz7PpT9OK6frtN8x0 mKcDqMupEfZ72DredEV9APnV52jhB/bLcjYU+uP7vMRiVH1fWe/ofwaghz+WDDYsfiG3 K8UQ== X-Gm-Message-State: ALoCoQmz3FXeD05Xp4zesjAjuU0qX+cRPnvG3XCdpgXsXi5kTDjRBLypPNBHJofn+sX6c/YG5fxg X-Received: by 10.152.36.229 with SMTP id t5mr27948816laj.42.1409054878433; Tue, 26 Aug 2014 05:07:58 -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 ai1sm4908979lbd.12.2014.08.26.05.07.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Aug 2014 05:07:57 -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 6/9] mmc: sdio: Convert to dev_pm_domain_attach|detach() Date: Tue, 26 Aug 2014 14:07:14 +0200 Message-Id: <1409054837-5667-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1409054837-5667-1-git-send-email-ulf.hansson@linaro.org> References: <1409054837-5667-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=-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 i2c 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); }