From patchwork Wed Aug 11 13:19:27 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: 176812 Return-path: X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on void.printf.net X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.9 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.2.5 Envelope-to: chris@printf.net Delivery-date: Wed, 11 Aug 2010 14:19:44 +0100 Received: from lists.laptop.org ([18.85.2.145] helo=mail.laptop.org) by void.printf.net with esmtp (Exim 4.69) (envelope-from ) id 1OjBDc-0007PA-8s for chris@printf.net; Wed, 11 Aug 2010 14:19:44 +0100 Received: by mail.laptop.org (Postfix) id 43AA0248DA; Wed, 11 Aug 2010 09:19:26 -0400 (EDT) Delivered-To: cjb@laptop.org Received: from spam.laptop.org (spam.laptop.org [18.85.46.23]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.laptop.org (Postfix) with ESMTPS id 36097248D9 for ; Wed, 11 Aug 2010 09:19:26 -0400 (EDT) X-ASG-Debug-ID: 1281532782-0b74136d0001-zHW3sV Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by spam.laptop.org with ESMTP id NF0AtiohVcUmM6Xi for ; Wed, 11 Aug 2010 09:19:42 -0400 (EDT) X-Barracuda-Envelope-From: linux-mmc-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752662Ab0HKNTh (ORCPT ); Wed, 11 Aug 2010 09:19:37 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:44704 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752660Ab0HKNTg (ORCPT ); Wed, 11 Aug 2010 09:19:36 -0400 Received: by mail-bw0-f46.google.com with SMTP id 3so95750bwz.19 for ; Wed, 11 Aug 2010 06:19:35 -0700 (PDT) Received: by 10.204.230.209 with SMTP id jn17mr1385149bkb.214.1281532775868; Wed, 11 Aug 2010 06:19:35 -0700 (PDT) Received: from localhost.localdomain (93-172-40-159.bb.netvision.net.il [93.172.40.159]) by mx.google.com with ESMTPS id x13sm73652bki.12.2010.08.11.06.19.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 11 Aug 2010 06:19:35 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: , Luciano Coelho , , Ido Yariv , San Mehat , Roger Quadros , Nicolas Pitre , Gao Yunpeng , Ohad Ben-Cohen X-ASG-Orig-Subj: [RFC/PATCH 3/6] mmc: add general runtime PM support Subject: [RFC/PATCH 3/6] mmc: add general runtime PM support Date: Wed, 11 Aug 2010 16:19:27 +0300 Message-Id: <1281532770-27545-4-git-send-email-ohad@wizery.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1281532770-27545-1-git-send-email-ohad@wizery.com> References: <1281532770-27545-1-git-send-email-ohad@wizery.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Barracuda-Connect: vger.kernel.org[209.132.180.67] X-Barracuda-Start-Time: 1281532782 X-Barracuda-URL: http://18.85.46.23:8000/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at laptop.org X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=5.5 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.2.37680 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index 49d9dca..27902b4 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -137,6 +138,39 @@ static int mmc_bus_resume(struct device *dev) return ret; } +static int mmc_runtime_suspend(struct device *dev) +{ + int status = 0; + struct mmc_card *card = dev_to_mmc_card(dev); + + mmc_power_save_host(card->host); + + return status; +} + +static int mmc_runtime_resume(struct device *dev) +{ + int status = 0; + struct mmc_card *card = dev_to_mmc_card(dev); + + mmc_power_restore_host(card->host); + + return status; +} + +static int mmc_runtime_idle(struct device *dev) +{ + struct mmc_card *card = dev_to_mmc_card(dev); + + return pm_runtime_suspend(dev); +} + +static const struct dev_pm_ops mmc_bus_pm_ops = { + .runtime_suspend = mmc_runtime_suspend, + .runtime_resume = mmc_runtime_resume, + .runtime_idle = mmc_runtime_idle, +}; + static struct bus_type mmc_bus_type = { .name = "mmc", .dev_attrs = mmc_dev_attrs, @@ -146,6 +180,7 @@ static struct bus_type mmc_bus_type = { .remove = mmc_bus_remove, .suspend = mmc_bus_suspend, .resume = mmc_bus_resume, + .pm = &mmc_bus_pm_ops, }; int mmc_register_bus(void)