Skip to contentSkip to conversation

dvb/dst: replace schedule_timeout() with msleep()

PATCH In review [email protected] 1 participant 1 message Sep 23, 2004 Media (V4L/DVB)

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 8/20 dvb/dst: replace schedule_timeout() with msleep()

I would appreciate any comments from the janitor@sternweltens list.

Thanks,
Nish

Description: Replace dvb_delay() with msleep() to guarantee the task delays the desired time.

Signed-off-by Nishanth Aravamudan <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>

---

 linux-2.6.9-rc2-bk7-max/drivers/media/dvb/frontends/dst.c |   20 +++++++-------
 1 files changed, 10 insertions(+), 10 deletions(-)
drivers/media/dvb/frontends/dst.c renamed from drivers/media/dvb/frontends/dst.c~msleep-drivers_media_dvb_frontends_dst +10 -10
diff -puN drivers/media/dvb/frontends/dst.c~msleep-drivers_media_dvb_frontends_dst drivers/media/dvb/frontends/dst.c
@@ -197,7 +197,7 @@ int retval;
 	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;

@@ -220,7 +220,7 @@ int retval;
 	if (retval < 0)
 		return retval;
 	// dprintk ("%s: i2c enable delay\n", __FUNCTION__);
-	dvb_delay(33);
+	msleep(33);
 	return 0;
 }
 

@@ -234,7 +234,7 @@ int retval;
 	if (retval < 0)
 		return retval;
 	// dprintk ("%s: i2c disable delay\n", __FUNCTION__);
-	dvb_delay(33);
+	msleep(33);
 	return 0;
 }
 

@@ -252,7 +252,7 @@ int i;
 			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;

@@ -275,14 +275,14 @@ static int write_dst (struct dst_data *d
 		}
 		dprintk("\n");
 	}
-	dvb_delay(30);
+	msleep(30);
 	for (cnt = 0; cnt < 4; cnt++) {
 		if ((err = dst->i2c->xfer (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;

@@ -564,7 +564,7 @@ static int dst_check_ci (struct dst_data
 		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) {

@@ -648,7 +648,7 @@ static int dst_command (struct dst_data 
 		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) {

@@ -899,7 +899,7 @@ static int dst_write_tuna (struct dst_da
 		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) {

_