From patchwork Sat Oct 2 11:54:07 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: 226661 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 o92BvQ9C020176 for ; Sat, 2 Oct 2010 11:57:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755306Ab0JBL5Y (ORCPT ); Sat, 2 Oct 2010 07:57:24 -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 S1754002Ab0JBL5X (ORCPT ); Sat, 2 Oct 2010 07:57:23 -0400 Received: by mail-fx0-f46.google.com with SMTP id 14so1071583fxm.19 for ; Sat, 02 Oct 2010 04:57:22 -0700 (PDT) Received: by 10.223.105.78 with SMTP id s14mr6610582fao.1.1286020642179; Sat, 02 Oct 2010 04:57:22 -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.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 02 Oct 2010 04:57:21 -0700 (PDT) From: Ohad Ben-Cohen To: , Cc: Chris Ball , Nicolas Pitre , Luciano Coelho , Ohad Ben-Cohen Subject: [PATCH v2 03/11] sdio: add power_restore support Date: Sat, 2 Oct 2010 13:54:07 +0200 Message-Id: <1286020455-28946-4-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:27 +0000 (UTC) diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 3be1571..f17e0e0 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -638,11 +638,29 @@ static int mmc_sdio_resume(struct mmc_host *host) return err; } +static int mmc_sdio_power_restore(struct mmc_host *host) +{ + int ret; + + BUG_ON(!host); + BUG_ON(!host->card); + + mmc_claim_host(host); + ret = mmc_sdio_init_card(host, host->ocr, host->card, + (host->pm_flags & MMC_PM_KEEP_POWER)); + if (!ret && host->sdio_irqs) + mmc_signal_sdio_irq(host); + mmc_release_host(host); + + return ret; +} + static const struct mmc_bus_ops mmc_sdio_ops = { .remove = mmc_sdio_remove, .detect = mmc_sdio_detect, .suspend = mmc_sdio_suspend, .resume = mmc_sdio_resume, + .power_restore = mmc_sdio_power_restore, };