From patchwork Wed Aug 11 13:19:26 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ohad Ben Cohen <ohad@wizery.com>
X-Patchwork-Id: 118811
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7BDJf8W006545
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Wed, 11 Aug 2010 13:19:41 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752656Ab0HKNTe (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Wed, 11 Aug 2010 09:19:34 -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 S1752412Ab0HKNTd (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Wed, 11 Aug 2010 09:19:33 -0400
Received: by mail-bw0-f46.google.com with SMTP id 3so95750bwz.19
	for <multiple recipients>; Wed, 11 Aug 2010 06:19:32 -0700 (PDT)
Received: by 10.204.18.147 with SMTP id w19mr1810428bka.200.1281532772882;
	Wed, 11 Aug 2010 06:19:32 -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.30
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Wed, 11 Aug 2010 06:19:32 -0700 (PDT)
From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-wireless@vger.kernel.org>, <linux-mmc@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
	Luciano Coelho <luciano.coelho@nokia.com>, <akpm@linux-foundation.org>,
	Ido Yariv <ido@wizery.com>, San Mehat <san@google.com>,
	Roger Quadros <roger.quadros@nokia.com>,
	Nicolas Pitre <nico@fluxnic.net>, Gao Yunpeng <yunpeng.gao@intel.com>,
	Ohad Ben-Cohen <ohad@wizery.com>
Subject: [RFC/PATCH 2/6] sdio: add power_restore support
Date: Wed, 11 Aug 2010 16:19:26 +0300
Message-Id: <1281532770-27545-3-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-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 11 Aug 2010 13:19:41 +0000 (UTC)


diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index 645f173..ddbb9d3 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -511,11 +511,27 @@ static int mmc_sdio_resume(struct mmc_host *host)
 	return err;
 }
 
+static void mmc_sdio_power_restore(struct mmc_host *host)
+{
+	int err;
+
+	BUG_ON(!host);
+	BUG_ON(!host->card);
+
+	mmc_claim_host(host);
+	err = mmc_sdio_init_card(host, host->ocr, host->card,
+			(host->pm_flags & MMC_PM_KEEP_POWER));
+	if (!err && host->sdio_irqs)
+		mmc_signal_sdio_irq(host);
+	mmc_release_host(host);
+}
+
 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,
 };