From patchwork Tue Sep 9 11:36:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 37100 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BCE8A20491 for ; Tue, 9 Sep 2014 11:37:02 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf82861949oac.9 for ; Tue, 09 Sep 2014 04:37:02 -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=aG2d8SokOkoLvL8U/efERw+SWpT6NomkB25SFoGFY1mNA6b7Nd1SJMl9TR2XTr9B1y OaJ8VynovzPkcuKRRoT63JByvNwVSX8TyDGW3JUrx5RHt0wJBJ/lJlJMczObzGky7J74 hubNN2814NUTg2Q9guR+qgsBgtNXKA4OYtTQrACCzQOxlrBTuiIp7co6q91NHLggczJ6 u2JfLU52ZssfL2bsjbXxI1RsBjmrYXygHJnK8TwJ+5RzRHDEc8NUF4pv8z/cbjtws2dO z924K+RlUVPsmXJ+03zIrZMQhuoR86QPcvgIJSmWo6cgDj0DCg9YewOyk7UoyoCtzRxc oSvQ== X-Gm-Message-State: ALoCoQmVz7Ba5pBHRCRzq5R/GwkbJCov6sSym2ap1g3sEz/hPBPP+2/nVFfjCX7TEUUzBhBb2ftU X-Received: by 10.182.123.163 with SMTP id mb3mr20823877obb.32.1410262620590; Tue, 09 Sep 2014 04:37:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.11 with SMTP id y11ls2148851qgy.23.gmail; Tue, 09 Sep 2014 04:37:00 -0700 (PDT) X-Received: by 10.52.185.168 with SMTP id fd8mr1359439vdc.58.1410262620473; Tue, 09 Sep 2014 04:37:00 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id yx12si5631336vdb.70.2014.09.09.04.37.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 04:37:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id le20so2785917vcb.32 for ; Tue, 09 Sep 2014 04:37:00 -0700 (PDT) X-Received: by 10.220.169.72 with SMTP id x8mr5379192vcy.45.1410262620412; Tue, 09 Sep 2014 04:37:00 -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 uj3csp270216vcb; Tue, 9 Sep 2014 04:36:59 -0700 (PDT) X-Received: by 10.112.135.230 with SMTP id pv6mr1853571lbb.105.1410262617030; Tue, 09 Sep 2014 04:36:57 -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 kf3si17495199lbc.68.2014.09.09.04.36.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 09 Sep 2014 04:36:57 -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 ty20so6857796lab.7 for ; Tue, 09 Sep 2014 04:36:56 -0700 (PDT) X-Received: by 10.152.121.8 with SMTP id lg8mr1829948lab.98.1410262616546; Tue, 09 Sep 2014 04:36:56 -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 gn7sm4476961lbc.10.2014.09.09.04.36.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 09 Sep 2014 04:36:55 -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 v4 6/9] mmc: sdio: Convert to dev_pm_domain_attach|detach() Date: Tue, 9 Sep 2014 13:36:07 +0200 Message-Id: <1410262570-22785-7-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1410262570-22785-1-git-send-email-ulf.hansson@linaro.org> References: <1409838756-31963-1-git-send-email-ulf.hansson@linaro.org> <1410262570-22785-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.173 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); }