summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelle Foks <jelle@foks.8m.com>2007-05-21 19:46:06 +0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 22:03:48 +0100
commite21a5c68deab7cd300e8502488f844f77e0f26d0 (patch)
tree2c63129f7de661d3297affb78b58d1b86c8902b6
parentV4L/DVB (6828): cx88-blackbird: audio improvements (diff)
downloadlinux-e21a5c68deab7cd300e8502488f844f77e0f26d0.tar.xz
linux-e21a5c68deab7cd300e8502488f844f77e0f26d0.zip
V4L/DVB (6829): cx88-blackbird: remove unnecessary msleep()'s
Remove the unnecessary msleep()'s in cx88-blackbird.c Signed-off-by: Jelle Foks <jelle@foks.8m.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cx88/cx88-blackbird.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 7ce37f46b753..4a0e1f8992cd 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -541,9 +541,7 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
/* ping was not successful, reset and upload firmware */
cx_write(MO_SRST_IO, 0); /* SYS_RSTO=0 */
- msleep(1);
cx_write(MO_SRST_IO, 1); /* SYS_RSTO=1 */
- msleep(1);
retval = blackbird_load_firmware(dev);
if (retval < 0)
return retval;
@@ -565,7 +563,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
}
dprintk(0, "Firmware version is 0x%08x\n", version);
}
- msleep(1);
cx_write(MO_PINMUX_IO, 0x88); /* 656-8bit IO and enable MPEG parallel IO */
cx_clear(MO_INPUT_FORMAT, 0x100); /* chroma subcarrier lock to normal? */
@@ -573,7 +570,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
cx_clear(MO_OUTPUT_FORMAT, 0x0008); /* Normal Y-limits to let the mpeg encoder sync */
blackbird_codec_settings(dev);
- msleep(1);
blackbird_api_cmd(dev, CX2341X_ENC_SET_NUM_VSYNC_LINES, 2, 0,
BLACKBIRD_FIELD1_SAA7115,
@@ -584,7 +580,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
BLACKBIRD_CUSTOM_EXTENSION_USR_DATA,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
- msleep(1);
return 0;
}
@@ -616,9 +611,7 @@ static int blackbird_start_codec(struct file *file, void *priv)
cx_clear(AUD_VOL_CTL, (1 << 6));
blackbird_api_cmd(dev, CX2341X_ENC_MUTE_VIDEO, 1, 0, BLACKBIRD_UNMUTE);
- msleep(1);
blackbird_api_cmd(dev, CX2341X_ENC_MUTE_AUDIO, 1, 0, BLACKBIRD_UNMUTE);
- msleep(1);
blackbird_api_cmd(dev, CX2341X_ENC_REFRESH_INPUT, 0,0);
@@ -630,7 +623,6 @@ static int blackbird_start_codec(struct file *file, void *priv)
BLACKBIRD_MPEG_CAPTURE,
BLACKBIRD_RAW_BITS_NONE
);
- msleep(10);
dev->mpeg_active = 1;
return 0;