From patchwork Sat Oct  2 11:54:10 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: 226721
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 o92BvXY9020287
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sat, 2 Oct 2010 11:57:33 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755355Ab0JBL5b (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Sat, 2 Oct 2010 07:57:31 -0400
Received: from mail-fx0-f46.google.com ([209.85.161.46]:33923 "EHLO
	mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1754002Ab0JBL5a (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Sat, 2 Oct 2010 07:57:30 -0400
Received: by mail-fx0-f46.google.com with SMTP id 14so1071577fxm.19
	for <multiple recipients>; Sat, 02 Oct 2010 04:57:29 -0700 (PDT)
Received: by 10.223.116.140 with SMTP id m12mr6733687faq.64.1286020649789;
	Sat, 02 Oct 2010 04:57:29 -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.27
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Sat, 02 Oct 2010 04:57:29 -0700 (PDT)
From: Ohad Ben-Cohen <ohad@wizery.com>
To: <linux-mmc@vger.kernel.org>, <linux-wireless@vger.kernel.org>
Cc: Chris Ball <cjb@laptop.org>, Nicolas Pitre <nico@fluxnic.net>,
	Luciano Coelho <luciano.coelho@nokia.com>,
	Ohad Ben-Cohen <ohad@wizery.com>
Subject: [PATCH v2 06/11] sdio: enable runtime PM for SDIO cards
Date: Sat,  2 Oct 2010 13:54:10 +0200
Message-Id: <1286020455-28946-7-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: <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 (demeter1.kernel.org [140.211.167.41]);
	Sat, 02 Oct 2010 11:57:33 +0000 (UTC)


diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index f17e0e0..0dbd6fe 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/err.h>
+#include <linux/pm_runtime.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
@@ -708,6 +709,18 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
 	card = host->card;
 
 	/*
+	 * Let runtime PM core know our card is active
+	 */
+	err = pm_runtime_set_active(&card->dev);
+	if (err)
+		goto remove;
+
+	/*
+	 * Enable runtime PM for this card
+	 */
+	pm_runtime_enable(&card->dev);
+
+	/*
 	 * The number of functions on the card is encoded inside
 	 * the ocr.
 	 */