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: 4868791 Return-Path: X-Original-To: patchwork-linux-mmc@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 95C91C0338 for ; Tue, 9 Sep 2014 11:37:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 631A1200F4 for ; Tue, 9 Sep 2014 11:37:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CAFA420158 for ; Tue, 9 Sep 2014 11:37:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932447AbaIILhA (ORCPT ); Tue, 9 Sep 2014 07:37:00 -0400 Received: from mail-la0-f50.google.com ([209.85.215.50]:42794 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932426AbaIILg6 (ORCPT ); Tue, 9 Sep 2014 07:36:58 -0400 Received: by mail-la0-f50.google.com with SMTP id ty20so4302385lab.9 for ; Tue, 09 Sep 2014 04:36:56 -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=l4zK//sG5dzA4CTtb8FFNQbNY7f8Qgir/QmDKU70Hb4=; b=R2o2mUSxFEi/nlctBuEAEW5vzkL4MATvne613kRDwEhEh2mp5G94RS/FPzJ1OoU+Is E/n0dNO+cSfcuQi+48RFEq7mvNDS0qUWvzH5m4qhDNbX0HJDE7xwvtw/1A5tW8qdJQeZ QBJgIBxN+7cxBtsrG5/iVtm8CcMZxmLlF15FTIKrjcVdv86WgwiKpmcP7lGJkDtIXS5W XrMUHdDSVsB9kPHqxwBOBgD+ata1LOUsQuv+tgfNvaDR/dmaCvItASeLrG+FTtsnr7KX FmEZhuqIWOyEJsE7DelbO6nptnEi3kRIpWbvZHnEL1MhCbY3vpUkKfBpj4/qXYDqz4+q 4GsQ== X-Gm-Message-State: ALoCoQmTjpsPl3rvID8RZSAmrFVSAzkITbgLW5aEbmorGNWh5rxZe5FsDz1KMuMEm2aYI/JMBEis 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> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-9.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 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); }