Commit 94b8577e authored by Maximilian Attems's avatar Maximilian Attems Committed by Linus Torvalds

[PATCH] dsp56k: replace schedule_timeout() with msleep()

Use msleep() instead of schedule_timeout() to guarantee the task delays at
least the desired time amount.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 00009b96
...@@ -58,12 +58,6 @@ ...@@ -58,12 +58,6 @@
#define DSP56K_TRANSMIT (dsp56k_host_interface.isr & DSP56K_ISR_TXDE) #define DSP56K_TRANSMIT (dsp56k_host_interface.isr & DSP56K_ISR_TXDE)
#define DSP56K_RECEIVE (dsp56k_host_interface.isr & DSP56K_ISR_RXDF) #define DSP56K_RECEIVE (dsp56k_host_interface.isr & DSP56K_ISR_RXDF)
#define wait_some(n) \
{ \
set_current_state(TASK_INTERRUPTIBLE); \
schedule_timeout(n); \
}
#define handshake(count, maxio, timeout, ENABLE, f) \ #define handshake(count, maxio, timeout, ENABLE, f) \
{ \ { \
long i, t, m; \ long i, t, m; \
...@@ -71,13 +65,13 @@ ...@@ -71,13 +65,13 @@
m = min_t(unsigned long, count, maxio); \ m = min_t(unsigned long, count, maxio); \
for (i = 0; i < m; i++) { \ for (i = 0; i < m; i++) { \
for (t = 0; t < timeout && !ENABLE; t++) \ for (t = 0; t < timeout && !ENABLE; t++) \
wait_some(HZ/50); \ msleep(20); \
if(!ENABLE) \ if(!ENABLE) \
return -EIO; \ return -EIO; \
f; \ f; \
} \ } \
count -= m; \ count -= m; \
if (m == maxio) wait_some(HZ/50); \ if (m == maxio) msleep(20); \
} \ } \
} }
...@@ -85,7 +79,7 @@ ...@@ -85,7 +79,7 @@
{ \ { \
int t; \ int t; \
for(t = 0; t < n && !DSP56K_TRANSMIT; t++) \ for(t = 0; t < n && !DSP56K_TRANSMIT; t++) \
wait_some(HZ/100); \ msleep(10); \
if(!DSP56K_TRANSMIT) { \ if(!DSP56K_TRANSMIT) { \
return -EIO; \ return -EIO; \
} \ } \
...@@ -95,7 +89,7 @@ ...@@ -95,7 +89,7 @@
{ \ { \
int t; \ int t; \
for(t = 0; t < n && !DSP56K_RECEIVE; t++) \ for(t = 0; t < n && !DSP56K_RECEIVE; t++) \
wait_some(HZ/100); \ msleep(10); \
if(!DSP56K_RECEIVE) { \ if(!DSP56K_RECEIVE) { \
return -EIO; \ return -EIO; \
} \ } \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment