From patchwork Sat Oct 2 11:54:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ohad Ben Cohen X-Patchwork-Id: 226691 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o92BvVjR020263 for ; Sat, 2 Oct 2010 11:57:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755316Ab0JBL53 (ORCPT ); Sat, 2 Oct 2010 07:57:29 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:48776 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755341Ab0JBL52 (ORCPT ); Sat, 2 Oct 2010 07:57:28 -0400 Received: by mail-fx0-f46.google.com with SMTP id 14so1071583fxm.19 for ; Sat, 02 Oct 2010 04:57:27 -0700 (PDT) Received: by 10.223.126.83 with SMTP id b19mr6628448fas.47.1286020647514; Sat, 02 Oct 2010 04:57:27 -0700 (PDT) Received: from localhost.localdomain (46-116-86-31.bb.netvision.net.il [46.116.86.31]) by mx.google.com with ESMTPS id j14sm1159450faa.23.2010.10.02.04.57.25 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 02 Oct 2010 04:57:26 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: Chris Ball , Nicolas Pitre , Luciano Coelho , Ohad Ben-Cohen Subject: [PATCH v2 05/11] sdio: use the generic runtime PM handlers Date: Sat, 2 Oct 2010 13:54:09 +0200 Message-Id: <1286020455-28946-6-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1286020455-28946-1-git-send-email-ohad@wizery.com> References: <1286020455-28946-1-git-send-email-ohad@wizery.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Sat, 02 Oct 2010 11:57:31 +0000 (UTC) diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 4a890dc..256a968 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -154,6 +155,24 @@ static int sdio_bus_remove(struct device *dev) return 0; } +#ifdef CONFIG_PM_RUNTIME + +static const struct dev_pm_ops sdio_bus_pm_ops = { + SET_RUNTIME_PM_OPS( + pm_generic_runtime_suspend, + pm_generic_runtime_resume, + pm_generic_runtime_idle + ) +}; + +#define SDIO_PM_OPS_PTR (&sdio_bus_pm_ops) + +#else /* !CONFIG_PM_RUNTIME */ + +#define SDIO_PM_OPS_PTR NULL + +#endif /* !CONFIG_PM_RUNTIME */ + static struct bus_type sdio_bus_type = { .name = "sdio", .dev_attrs = sdio_dev_attrs, @@ -161,6 +180,7 @@ static struct bus_type sdio_bus_type = { .uevent = sdio_bus_uevent, .probe = sdio_bus_probe, .remove = sdio_bus_remove, + .pm = SDIO_PM_OPS_PTR, }; int sdio_register_bus(void)