commit 1ff1162005f801dcdfa034802f6352aa2eb2ec4a
author John Newlin <jnewlin@google.com> Mon Aug 25 10:14:17 2014 -0700
committer John Newlin <jnewlin@google.com> Mon Aug 25 15:25:30 2014 -0700
tree 359de0f685eb1a9b34db7dc687c1249f45669749
parent f04bcb228db735725b6743068490a2001fd90d37
parent f45c934be48342dec8aa12190845f415133272a4

Merge remote-tracking branch 'gfiber-internal/master' into newkernel_dev

Change-Id: I99d608fe04627af10d4cc5cbe5b3dfa117d07ca2

3.3/bmoca.c

diff --git a/3.3/bmoca.c b/3.3/bmoca.c
index e8f1829..075520c 100644
--- a/3.3/bmoca.c
+++ b/3.3/bmoca.c
@@ -1628,7 +1628,6 @@
 {
 	struct bsc_regs *bsc = priv->i2c_base;
 	long timeout = HZ / 1000; /* 1 ms */
-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait);
 	int i = 0;
 
 	do {
@@ -1642,7 +1641,7 @@
 				__func__);
 			return -1;
 		}
-		sleep_on_timeout(&wait, timeout ? timeout : 1);
+		schedule_timeout_interruptible(timeout ? timeout : 1);
 	} while (1);
 }
 

3.8/bmoca.c

diff --git a/3.8/bmoca.c b/3.8/bmoca.c
index 08812d9..79e0dc0 100644
--- a/3.8/bmoca.c
+++ b/3.8/bmoca.c
@@ -1479,7 +1479,6 @@
 {
 	struct bsc_regs *bsc = priv->i2c_base;
 	long timeout = HZ / 1000;	/* 1ms */
-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait);
 	int i = 0;
 
 	do {
@@ -1492,7 +1491,7 @@
 			dev_warn(priv->dev, "3450 I2C timed out\n");
 			return -1;
 		}
-		sleep_on_timeout(&wait, timeout ? timeout : 1);
+		schedule_timeout_interruptible(timeout ? timeout : 1);
 	} while (1);
 }