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: 36004 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 69DCF2054F for ; Tue, 26 Aug 2014 12:08:02 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id eu11sf127120239pac.7 for ; Tue, 26 Aug 2014 05:08:01 -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=p/lCAVvq/lMStxchzfltNa1uyCrctuzXrbYIUOt28W4=; b=DR5geZOrsIuoTjE+upE5/VQJ5FWKUnnzl7ngN8aivTIL+AkFitXC/etUUcHEhXYHX5 2NRksEeSQUth3XqYP/tevQQIVj354VGgCgn9tEt5+CMqM8GDXmILzMkz5Vww3NgyjB8x tmQuqJqoYOw+YGOIh9tBDbyNZqnsjDw+HYJWeuj81TAjTH7pbBk2W0LVBzxGqZFBul46 y5To+xFxDXbXjvmlKQWKqWsxRBTe4Hjs81EJnPWnisDpXUmR8XcHJKRyI3Ap9gNpX19s nbTaFtTey9ZLsY4TueF/za0nOWh0RZb+f2LzltSUHJ0coCUe0qMqCb3sc7s5VZoKfVdu czXw== X-Gm-Message-State: ALoCoQlnqllrVica+LelBUEghT5zcfOMVxKHAtVmvi1anoAu7uDpXhY1ao6BW07lXjwzuvPd9jZR X-Received: by 10.66.162.162 with SMTP id yb2mr8302229pab.39.1409054881528; Tue, 26 Aug 2014 05:08:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.203 with SMTP id t69ls2534371qgd.30.gmail; Tue, 26 Aug 2014 05:08:01 -0700 (PDT) X-Received: by 10.220.97.5 with SMTP id j5mr23613079vcn.16.1409054881316; Tue, 26 Aug 2014 05:08:01 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id i4si1286187vcr.34.2014.08.26.05.08.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 05:08:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id le20so16927768vcb.28 for ; Tue, 26 Aug 2014 05:08:01 -0700 (PDT) X-Received: by 10.52.94.108 with SMTP id db12mr19776054vdb.8.1409054881244; Tue, 26 Aug 2014 05:08:01 -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 uj3csp193045vcb; Tue, 26 Aug 2014 05:08:00 -0700 (PDT) X-Received: by 10.112.87.41 with SMTP id u9mr2347514lbz.97.1409054878997; Tue, 26 Aug 2014 05:07:58 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com [209.85.215.48]) by mx.google.com with ESMTPS id gy4si3317977lac.59.2014.08.26.05.07.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Aug 2014 05:07:58 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by mail-la0-f48.google.com with SMTP id gl10so14648164lab.21 for ; Tue, 26 Aug 2014 05:07:58 -0700 (PDT) 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> 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.169 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 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); }