- nuke dvb functions stuff

10 files changed, 33 insertions, 33 deletions

diff --git a/linux/drivers/media/dvb/frontends/alps_tdmb7.c b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
index 73f7b6cad..ea2e73ca1 100644
--- a/linux/drivers/media/dvb/frontends/alps_tdmb7.c
+++ b/linux/drivers/media/dvb/frontends/alps_tdmb7.c
@@ -167,7 +167,7 @@ static int cx22700_init (struct i2c_adapter *i2c)
 	cx22700_writereg (i2c, 0x00, 0x02);   /*  soft reset */
 	cx22700_writereg (i2c, 0x00, 0x00);
 
-	dvb_delay(10);
+	msleep(10);
 
 	for (i=0; i<sizeof(init_tab); i+=2)
 		cx22700_writereg (i2c, init_tab[i], init_tab[i+1]);
diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c
index 49bcf805c..5ceccb13a 100644
--- a/linux/drivers/media/dvb/frontends/at76c651.c
+++ b/linux/drivers/media/dvb/frontends/at76c651.c
@@ -111,7 +111,7 @@ static int at76c651_writereg(struct i2c_adapter *i2c, u8 reg, u8 data)
 			"(reg == 0x%02x, val == 0x%02x, ret == %i)\n",
 			__FUNCTION__, reg, data, ret);
 
-	dvb_delay(10);
+	msleep(10);
 
 	return (ret != 1) ? -EREMOTEIO : 0;
 }
diff --git a/linux/drivers/media/dvb/frontends/cx24110.c b/linux/drivers/media/dvb/frontends/cx24110.c
index 654731713..56cafb25d 100644
--- a/linux/drivers/media/dvb/frontends/cx24110.c
+++ b/linux/drivers/media/dvb/frontends/cx24110.c
@@ -262,7 +262,7 @@ static int cx24108_set_tv_freq (struct i2c_adapter *i2c, u32 freq)
         cx24108_write(i2c,pll);
         cx24110_writereg(i2c,0x56,0x7f);
 
-	dvb_delay(10); /* wait a moment for the tuner pll to lock */
+	msleep(10); /* wait a moment for the tuner pll to lock */
 
 	/* tuner pll lock can be monitored on GPIO pin 4 of cx24110 */
         while (!(cx24110_readreg(i2c,0x66)&0x20)&&i<1000)
diff --git a/linux/drivers/media/dvb/frontends/dst.c b/linux/drivers/media/dvb/frontends/dst.c
index 17ea19740..820594b90 100644
--- a/linux/drivers/media/dvb/frontends/dst.c
+++ b/linux/drivers/media/dvb/frontends/dst.c
@@ -179,12 +179,12 @@ static int dst_reset8820(struct dst_data *dst)
 	retval = dst_gpio_outb(dst, DST_8820, DST_8820, 0);
 	if (retval < 0)
 		return retval;
-	dvb_delay(10);
+	msleep(10);
 	retval = dst_gpio_outb(dst, DST_8820, DST_8820, DST_8820);
 	if (retval < 0)
 		return retval;
 	/* wait for more feedback on what works here *
-	   dvb_delay(10);
+	   msleep(10);
 	   retval = dst_gpio_outb(dst, DST_8820, DST_8820, 0);
 	   if (retval < 0)
 	   return retval;
@@ -201,7 +201,7 @@ static int dst_i2c_enable(struct dst_data *dst)
 	if (retval < 0)
 		return retval;
 	// dprintk ("%s: i2c enable delay\n", __FUNCTION__);
-	dvb_delay(33);	
+	msleep(33);	
 	return 0;
 }
 
@@ -214,7 +214,7 @@ static int dst_i2c_disable(struct dst_data *dst)
 	if (retval < 0)
 		return retval;
 	// dprintk ("%s: i2c disable delay\n", __FUNCTION__);
-	dvb_delay(33);
+	msleep(33);
 	return 0;
 }
 
@@ -231,7 +231,7 @@ static int dst_wait_dst_ready(struct dst_data *dst)
 			dprintk("%s: dst wait ready after %d\n", __FUNCTION__, i);
 			return 1;
 		}
-		dvb_delay(5);
+		msleep(5);
 	}
 	dprintk("%s: dst wait NOT ready after %d\n", __FUNCTION__, i);
 	return 0;
@@ -253,14 +253,14 @@ static int write_dst(struct dst_data *dst, u8 * data, u8 len)
 		}
 		dprintk("\n");
 	}
-	dvb_delay(30);
+	msleep(30);
 	for (cnt = 0; cnt < 4; cnt++) {
 		if ((err = i2c_transfer(dst->i2c, &msg, 1)) < 0) {
 			dprintk("%s: write_dst error (err == %i, len == 0x%02x, b0 == 0x%02x)\n", __FUNCTION__, err, len, data[0]);
 			dst_i2c_disable(dst);
-			dvb_delay(500);
+			msleep(500);
 			dst_i2c_enable(dst);
-			dvb_delay(500);
+			msleep(500);
 			continue;
 		} else
 			break;
@@ -541,7 +541,7 @@ static int dst_check_ci(struct dst_data *dst)
 		dprintk("%s: write not successful, maybe no card?\n", __FUNCTION__);
 		return retval;
 	}
-	dvb_delay(3);
+	msleep(3);
 	retval = read_dst(dst, rxbuf, 1);
 	dst_i2c_disable(dst);
 	if (retval < 0) {
@@ -605,7 +605,7 @@ static int dst_command(struct dst_data *dst, u8 * data, u8 len)
 		dprintk("%s: write not successful\n", __FUNCTION__);
 		return retval;
 	}
-	dvb_delay(33);
+	msleep(33);
 	retval = read_dst(dst, &reply, 1);
 	dst_i2c_disable(dst);
 	if (retval < 0) {
@@ -852,7 +852,7 @@ static int dst_write_tuna(struct dst_data *dst)
 		dprintk("%s: write not successful\n", __FUNCTION__);
 		return retval;
 	}
-	dvb_delay(3);
+	msleep(3);
 	retval = read_dst(dst, &reply, 1);
 	dst_i2c_disable(dst);
 	if (retval < 0) {
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-401.c b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
index b8508718b..1621c54de 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-401.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-401.c
@@ -554,7 +554,7 @@ int l64781_ioctl (struct dvb_frontend *fe,
 		res = init (i2c);
 		if ((res == 0) && (state->first)) {
 			state->first = 0;
-			dvb_delay(200);
+			msleep(200);
 		}
 		return res;
 
diff --git a/linux/drivers/media/dvb/frontends/grundig_29504-491.c b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
index 4c9992066..e5f7db343 100644
--- a/linux/drivers/media/dvb/frontends/grundig_29504-491.c
+++ b/linux/drivers/media/dvb/frontends/grundig_29504-491.c
@@ -243,7 +243,7 @@ static void tda8083_wait_diseqc_fifo (struct i2c_adapter *i2c, int timeout)
 	while (jiffies - start < timeout &&
                !(tda8083_readreg(i2c, 0x02) & 0x80))
 	{
-		dvb_delay(50);
+		msleep(50);
 	};
 }
 
diff --git a/linux/drivers/media/dvb/frontends/stv0299.c b/linux/drivers/media/dvb/frontends/stv0299.c
index 9e730039d..9957e1fe4 100644
--- a/linux/drivers/media/dvb/frontends/stv0299.c
+++ b/linux/drivers/media/dvb/frontends/stv0299.c
@@ -722,7 +722,7 @@ static int stv0299_wait_diseqc_fifo (struct i2c_adapter *i2c, int timeout)
 			dprintk ("%s: timeout!!\n", __FUNCTION__);
 			return -ETIMEDOUT;
 		}
-		dvb_delay(10);
+		msleep(10);
 	};
 
 	return 0;
@@ -740,7 +740,7 @@ static int stv0299_wait_diseqc_idle (struct i2c_adapter *i2c, int timeout)
 			dprintk ("%s: timeout!!\n", __FUNCTION__);
 			return -ETIMEDOUT;
 		}
-		dvb_delay(10);
+		msleep(10);
 	};
 
 	return 0;
@@ -1358,7 +1358,7 @@ static int attach_adapter(struct i2c_adapter *adapter)
 	u8 id;
 
 	stv0299_writereg(adapter, 0x02, 0x34); /* standby off */
-	dvb_delay(200);
+	msleep(200);
 	id = stv0299_readreg(adapter, 0x00);
 
 	dprintk ("%s: id == 0x%02x\n", __FUNCTION__, id);
diff --git a/linux/drivers/media/dvb/frontends/tda1004x.c b/linux/drivers/media/dvb/frontends/tda1004x.c
index 7ea4dff61..888d83f4d 100644
--- a/linux/drivers/media/dvb/frontends/tda1004x.c
+++ b/linux/drivers/media/dvb/frontends/tda1004x.c
@@ -294,7 +294,7 @@ static int tda1004x_enable_tuner_i2c(struct i2c_adapter *i2c, struct tda1004x_st
 	dprintk("%s\n", __FUNCTION__);
 
 	result = tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 2, 2);
-	dvb_delay(1);
+	msleep(1);
 	return result;
 }
 
@@ -453,7 +453,7 @@ static int tda10045_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta
 	tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 0x10, 0);
 	tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 8, 8);
 	tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 8, 0);
-	dvb_delay(10);
+	msleep(10);
 
 	/* set parameters */
 	tda10045h_set_bandwidth(i2c, state, BANDWIDTH_8_MHZ);
@@ -464,7 +464,7 @@ static int tda10045_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta
 
 	/* wait for DSP to initialise */
 	/* DSPREADY doesn't seem to work on the TDA10045H */
-	dvb_delay(100);
+	msleep(100);
 
 	ret = tda1004x_check_upload_ok(i2c, state);
 	if (ret)
@@ -488,7 +488,7 @@ static int tda10046_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta
 	/* reset chip */
 	tda1004x_write_mask(i2c, state, TDA1004X_CONFC4, 1, 0);
 	tda1004x_write_mask(i2c, state, TDA10046H_CONF_TRISTATE1, 1, 0);
-	dvb_delay(10);
+	msleep(10);
 
 	/* set parameters */
 	tda1004x_write_byte(i2c, state, TDA10046H_CONFPLL2, 10);
@@ -509,7 +509,7 @@ static int tda10046_fwupload(struct i2c_adapter *i2c, struct tda1004x_state *sta
 			printk("tda1004x: DSP failed to initialised.\n");
 			return -EIO;
 		}
-		dvb_delay(1);
+		msleep(1);
 	}
 
 	ret = tda1004x_check_upload_ok(i2c, state);
@@ -784,7 +784,7 @@ static int tda1004x_set_frequency(struct i2c_adapter *i2c,
 		if (i2c_transfer(i2c, &tuner_msg, 1) != 1) {
 			return -EIO;
 		}
-		dvb_delay(1);
+		msleep(1);
 		tda1004x_disable_tuner_i2c(i2c, tda_state);
 		if (tda_state->fe_type == FE_TYPE_TDA10046H)
 			tda1004x_write_mask(i2c, tda_state, TDA10046H_AGC_CONF, 4, 4);
@@ -968,12 +968,12 @@ static int tda1004x_set_fe(struct i2c_adapter *i2c,
 	case FE_TYPE_TDA10045H:
 		tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 8, 8);
 		tda1004x_write_mask(i2c, tda_state, TDA1004X_CONFC4, 8, 0);
-		dvb_delay(10);
+		msleep(10);
 		break;
 
 	case FE_TYPE_TDA10046H:
 		tda1004x_write_mask(i2c, tda_state, TDA1004X_AUTO, 0x40, 0x40);
-		dvb_delay(10);
+		msleep(10);
 		break;
 	}
 
@@ -1394,7 +1394,7 @@ static int tda1004x_attach(struct i2c_adapter *i2c, struct tda1004x_state* state
 		tuner_msg.buf = td1344_init;
 		tuner_msg.len = sizeof(td1344_init);
 		if (i2c_transfer(i2c, &tuner_msg, 1) == 1) {
-			dvb_delay(1);
+			msleep(1);
 			tuner_address = 0x61;
 			tuner_type = TUNER_TYPE_TD1344;
 			printk("tda1004x: Detected Philips TD1344 tuner.\n");
@@ -1407,7 +1407,7 @@ static int tda1004x_attach(struct i2c_adapter *i2c, struct tda1004x_state* state
 		tuner_msg.buf = td1316_init;
 		tuner_msg.len = sizeof(td1316_init);
 		if (i2c_transfer(i2c, &tuner_msg, 1) == 1) {
-			dvb_delay(1);
+			msleep(1);
 			tuner_address = 0x63;
 			tuner_type = TUNER_TYPE_TD1316;
 			printk("tda1004x: Detected Philips TD1316 tuner.\n");
@@ -1420,7 +1420,7 @@ static int tda1004x_attach(struct i2c_adapter *i2c, struct tda1004x_state* state
 		tuner_msg.buf = td1316_init_tda10046h;
 		tuner_msg.len = sizeof(td1316_init_tda10046h);
 		if (i2c_transfer(i2c, &tuner_msg, 1) == 1) {
-			dvb_delay(1);
+			msleep(1);
 			tuner_address = 0x60;
 			tuner_type = TUNER_TYPE_TD1316;
 			printk("tda1004x: Detected Philips TD1316 tuner.\n");
diff --git a/linux/drivers/media/dvb/frontends/ves1820.c b/linux/drivers/media/dvb/frontends/ves1820.c
index 23fff9d2d..255a40462 100644
--- a/linux/drivers/media/dvb/frontends/ves1820.c
+++ b/linux/drivers/media/dvb/frontends/ves1820.c
@@ -110,7 +110,7 @@ static int ves1820_writereg(struct ves1820_state *state, u8 reg, u8 data)
 		printk("ves1820: %s(): writereg error (reg == 0x%02x,"
 			"val == 0x%02x, ret == %i)\n", __FUNCTION__, reg, data, ret);
 
-	dvb_delay(10);
+	msleep(10);
 	return (ret != 1) ? -EREMOTEIO : 0;
 }
 
diff --git a/linux/drivers/media/dvb/frontends/ves1x93.c b/linux/drivers/media/dvb/frontends/ves1x93.c
index 27e9e0401..6b2436c66 100644
--- a/linux/drivers/media/dvb/frontends/ves1x93.c
+++ b/linux/drivers/media/dvb/frontends/ves1x93.c
@@ -255,7 +255,7 @@ static int ves1x93_clr_bit (struct i2c_adapter *i2c)
 {
 	ves1x93_writereg (i2c, 0, init_1x93_tab[0] & 0xfe);
 	ves1x93_writereg (i2c, 0, init_1x93_tab[0]);
-	dvb_delay(5);
+	msleep(5);
 	return 0;
 }
 
@@ -263,7 +263,7 @@ static int ves1x93_init_aquire (struct i2c_adapter *i2c)
 {
 	ves1x93_writereg (i2c, 3, 0x00);
 	ves1x93_writereg (i2c, 3, init_1x93_tab[3]);
-	dvb_delay(5);
+	msleep(5);
 	return 0;
 }