summaryrefslogtreecommitdiff
path: root/linux/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers')
-rw-r--r--linux/drivers/media/video/bttv-driver.c3
-rw-r--r--linux/drivers/media/video/cx88/cx88-blackbird.c3
-rw-r--r--linux/drivers/media/video/msp3400-driver.c6
-rw-r--r--linux/drivers/media/video/msp3400.c6
-rw-r--r--linux/drivers/media/video/saa6752hs.c6
-rw-r--r--linux/drivers/media/video/saa7134/saa6752hs.c6
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-core.c5
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-ts.c5
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h2
9 files changed, 16 insertions, 26 deletions
diff --git a/linux/drivers/media/video/bttv-driver.c b/linux/drivers/media/video/bttv-driver.c
index c0cda0be5..da0529689 100644
--- a/linux/drivers/media/video/bttv-driver.c
+++ b/linux/drivers/media/video/bttv-driver.c
@@ -745,8 +745,7 @@ static void set_pll(struct bttv *btv)
for (i=0; i<10; i++) {
/* Let other people run while the PLL stabilizes */
vprintk(".");
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/50);
+ msleep(10);
if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) {
btwrite(0,BT848_DSTATUS);
diff --git a/linux/drivers/media/video/cx88/cx88-blackbird.c b/linux/drivers/media/video/cx88/cx88-blackbird.c
index 218b2805f..a5a3c636f 100644
--- a/linux/drivers/media/video/cx88/cx88-blackbird.c
+++ b/linux/drivers/media/video/cx88/cx88-blackbird.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-blackbird.c,v 1.6 2004/08/31 11:58:53 kraxel Exp $
+ * $Id: cx88-blackbird.c,v 1.7 2004/09/03 14:54:46 kraxel Exp $
*
* Support for a cx23416 mpeg encoder via cx2388x host port.
* "blackbird" reference design.
@@ -790,6 +790,7 @@ static int blackbird_register_video(struct cx8802_dev *dev)
}
printk(KERN_INFO "%s/2: registered device video%d [mpeg]\n",
dev->core->name,dev->mpeg_dev->minor & 0x1f);
+ return 0;
}
/* ----------------------------------------------------------- */
diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c
index 3d560e58b..11315f10a 100644
--- a/linux/drivers/media/video/msp3400-driver.c
+++ b/linux/drivers/media/video/msp3400-driver.c
@@ -197,8 +197,7 @@ msp3400c_read(struct i2c_client *client, int dev, int addr)
err++;
printk(KERN_WARNING "msp34xx: I/O error #%d (read 0x%02x/0x%02x)\n",
err, dev, addr);
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(10);
}
if (3 == err) {
printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
@@ -226,8 +225,7 @@ msp3400c_write(struct i2c_client *client, int dev, int addr, int val)
err++;
printk(KERN_WARNING "msp34xx: I/O error #%d (write 0x%02x/0x%02x)\n",
err, dev, addr);
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(10);
}
if (3 == err) {
printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c
index 3d560e58b..11315f10a 100644
--- a/linux/drivers/media/video/msp3400.c
+++ b/linux/drivers/media/video/msp3400.c
@@ -197,8 +197,7 @@ msp3400c_read(struct i2c_client *client, int dev, int addr)
err++;
printk(KERN_WARNING "msp34xx: I/O error #%d (read 0x%02x/0x%02x)\n",
err, dev, addr);
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(10);
}
if (3 == err) {
printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
@@ -226,8 +225,7 @@ msp3400c_write(struct i2c_client *client, int dev, int addr, int val)
err++;
printk(KERN_WARNING "msp34xx: I/O error #%d (write 0x%02x/0x%02x)\n",
err, dev, addr);
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(10);
}
if (3 == err) {
printk(KERN_WARNING "msp34xx: giving up, reseting chip. Sound will go off, sorry folks :-|\n");
diff --git a/linux/drivers/media/video/saa6752hs.c b/linux/drivers/media/video/saa6752hs.c
index 8478a3d25..bfe47f293 100644
--- a/linux/drivers/media/video/saa6752hs.c
+++ b/linux/drivers/media/video/saa6752hs.c
@@ -175,13 +175,11 @@ static int saa6752hs_chip_command(struct i2c_client* client,
}
// wait a bit
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/100);
+ msleep(10);
}
// delay a bit to let encoder settle
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/20);
+ msleep(50);
// done
return status;
diff --git a/linux/drivers/media/video/saa7134/saa6752hs.c b/linux/drivers/media/video/saa7134/saa6752hs.c
index 8478a3d25..bfe47f293 100644
--- a/linux/drivers/media/video/saa7134/saa6752hs.c
+++ b/linux/drivers/media/video/saa7134/saa6752hs.c
@@ -175,13 +175,11 @@ static int saa6752hs_chip_command(struct i2c_client* client,
}
// wait a bit
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/100);
+ msleep(10);
}
// delay a bit to let encoder settle
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/20);
+ msleep(50);
// done
return status;
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c
index 5de7c05f5..732d6d4d7 100644
--- a/linux/drivers/media/video/saa7134/saa7134-core.c
+++ b/linux/drivers/media/video/saa7134/saa7134-core.c
@@ -27,6 +27,7 @@
#include <linux/kmod.h>
#include <linux/sound.h>
#include <linux/interrupt.h>
+#include <linux/delay.h>
#include "saa7134-reg.h"
#include "saa7134.h"
@@ -912,9 +913,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev,
}
/* wait a bit, register i2c bus */
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
- saa7134_i2c_register(dev);
+ msleep(100);
/* initialize hardware #2 */
saa7134_hwinit2(dev);
diff --git a/linux/drivers/media/video/saa7134/saa7134-ts.c b/linux/drivers/media/video/saa7134/saa7134-ts.c
index 9e1e0e296..aa0f5faf5 100644
--- a/linux/drivers/media/video/saa7134/saa7134-ts.c
+++ b/linux/drivers/media/video/saa7134/saa7134-ts.c
@@ -178,10 +178,9 @@ static struct videobuf_queue_ops ts_qops = {
static void ts_reset_encoder(struct saa7134_dev* dev)
{
saa_writeb(SAA7134_SPECIAL_MODE, 0x00);
- mdelay(10);
+ msleep(10);
saa_writeb(SAA7134_SPECIAL_MODE, 0x01);
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(HZ/10);
+ msleep(100);
}
static int ts_init_encoder(struct saa7134_dev* dev, void* arg)
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index 262cf1e63..5872e754d 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -453,7 +453,7 @@ struct saa7134_dev {
#define saa_setb(reg,bit) saa_andorb((reg),(bit),(bit))
#define saa_clearb(reg,bit) saa_andorb((reg),(bit),0)
-#define saa_wait(d) { udelay(d); }
+#define saa_wait(us) { udelay(us); }
/* ----------------------------------------------------------- */
/* saa7134-core.c */
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-10 01:49:54 +0000