Merge remote-tracking branch 'gfiber-internal/master' into work2
diff --git a/3.3/bmoca.c b/3.3/bmoca.c
index a35c479..5f0a5c6 100644
--- a/3.3/bmoca.c
+++ b/3.3/bmoca.c
@@ -1630,7 +1630,6 @@
{
struct bsc_regs *bsc = priv->i2c_base;
long timeout = HZ / 1000; /* 1 ms */
- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait);
int i = 0;
do {
@@ -1644,7 +1643,7 @@
__func__);
return -1;
}
- sleep_on_timeout(&wait, timeout ? timeout : 1);
+ schedule_timeout_interruptible(timeout ? timeout : 1);
} while (1);
}
diff --git a/3.8/bmoca.c b/3.8/bmoca.c
index b55a926..6702fde 100644
--- a/3.8/bmoca.c
+++ b/3.8/bmoca.c
@@ -1481,7 +1481,6 @@
{
struct bsc_regs *bsc = priv->i2c_base;
long timeout = HZ / 1000; /* 1ms */
- DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait);
int i = 0;
do {
@@ -1494,7 +1493,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);
}