From e5e1e23a8a506c9e531f67861276e18704cdc5d2 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 25 Jan 2012 19:55:56 +0000
Subject: [PATCH] --- yaml --- r: 293262 b: refs/heads/master c:
 bc122e34469de6ec4b7ca96d3a41724f9e4b1cf4 h: refs/heads/master v: v3

---
 [refs]                   |  2 +-
 trunk/sound/soc/sh/fsi.c | 14 --------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 31c26e24d16d..53b0c6a09e98 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69edea8a50fb88edd0f23eecfb89ef513b68eaee
+refs/heads/master: bc122e34469de6ec4b7ca96d3a41724f9e4b1cf4
diff --git a/trunk/sound/soc/sh/fsi.c b/trunk/sound/soc/sh/fsi.c
index db6c89a28bda..3241e5bdd54b 100644
--- a/trunk/sound/soc/sh/fsi.c
+++ b/trunk/sound/soc/sh/fsi.c
@@ -1408,23 +1408,9 @@ static int fsi_resume(struct device *dev)
 	return 0;
 }
 
-static int fsi_runtime_nop(struct device *dev)
-{
-	/* Runtime PM callback shared between ->runtime_suspend()
-	 * and ->runtime_resume(). Simply returns success.
-	 *
-	 * This driver re-initializes all registers after
-	 * pm_runtime_get_sync() anyway so there is no need
-	 * to save and restore registers here.
-	 */
-	return 0;
-}
-
 static struct dev_pm_ops fsi_pm_ops = {
 	.suspend		= fsi_suspend,
 	.resume			= fsi_resume,
-	.runtime_suspend	= fsi_runtime_nop,
-	.runtime_resume		= fsi_runtime_nop,
 };
 
 static struct fsi_core fsi1_core = {