diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2006-07-15 09:30:46 -0300 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2006-07-15 09:30:46 -0300 |
| commit | 38178c059c3bea8bf2c95115fb753b55319a37f6 (patch) | |
| tree | b4d64bf33035d56b64587273257de38e2f3f1695 /linux/drivers | |
| parent | c7298cadd95c10598507b23eadad2c96bd466cfd (diff) | |
| download | mediapointer-dvb-s2-38178c059c3bea8bf2c95115fb753b55319a37f6.tar.gz mediapointer-dvb-s2-38178c059c3bea8bf2c95115fb753b55319a37f6.tar.bz2 | |
Add compat.h code for schedule_timeout_interruptible()
From: Trent Piepho <xyzzy@speakeasy.org>
Add a static inline version of schedule_timeout_interruptible(), it's
only two lines, to compat.h. This will make bt866 and ks0127 compile
with pre 2.6.14 kernels.
Remove #if/#else code from msp3400, saa7134-tvaudio, and vivi that used
to handle this.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/msp3400-driver.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-tvaudio.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/vivi.c | 5 |
3 files changed, 0 insertions, 15 deletions
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 5e209a36b..f3ddd462c 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -391,13 +391,8 @@ int msp_sleep(struct msp_state *state, int timeout) set_current_state(TASK_INTERRUPTIBLE); schedule(); } else { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) schedule_timeout_interruptible (msecs_to_jiffies(timeout)); -#else - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(msecs_to_jiffies(timeout)); -#endif } } #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) diff --git a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c index 981fcbd77..f0d037475 100644 --- a/linux/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/linux/drivers/media/video/saa7134/saa7134-tvaudio.c @@ -363,13 +363,8 @@ static int tvaudio_sleep(struct saa7134_dev *dev, int timeout) set_current_state(TASK_INTERRUPTIBLE); schedule(); } else { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) schedule_timeout_interruptible (msecs_to_jiffies(timeout)); -#else - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(msecs_to_jiffies(timeout)); -#endif } } remove_wait_queue(&dev->thread.wq, &wait); diff --git a/linux/drivers/media/video/vivi.c b/linux/drivers/media/video/vivi.c index 614cdc60e..092045d5b 100644 --- a/linux/drivers/media/video/vivi.c +++ b/linux/drivers/media/video/vivi.c @@ -524,12 +524,7 @@ static void vivi_sleep(struct vivi_dmaqueue *dma_q) vivi_thread_tick(dma_q); -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,13) schedule_timeout_interruptible (timeout); -#else - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(timeout); -#endif } #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)) && (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)) if (current->flags & PF_FREEZE) { |