From fbe7d42cc40bee7179ab9ba05959b2b3374acf08 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 6 Nov 2005 15:38:48 +0000 Subject: - msp3400 code cleanups Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/msp3400-driver.c | 12 ------------ linux/drivers/media/video/msp3400.c | 12 ------------ v4l/ChangeLog | 9 +++++++++ 3 files changed, 9 insertions(+), 24 deletions(-) diff --git a/linux/drivers/media/video/msp3400-driver.c b/linux/drivers/media/video/msp3400-driver.c index 8f94f2619..cc0c3caf8 100644 --- a/linux/drivers/media/video/msp3400-driver.c +++ b/linux/drivers/media/video/msp3400-driver.c @@ -1933,9 +1933,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) msp3400_dbg("AUDC_SET_RADIO\n"); msp->norm = VIDEO_MODE_RADIO; msp3400_dbg("switching to radio mode\n"); - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp->watch_stereo = 0; switch (msp->opmode) { case OPMODE_MANUAL: @@ -2052,9 +2049,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) msp3400_dbg("VIDIOCSCHAN (norm=%d)\n",vc->norm); msp->norm = vc->norm; - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp_wake_thread(client); break; } @@ -2064,9 +2058,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) { /* new channel -- kick audio carrier scan */ msp3400_dbg("VIDIOCSFREQ\n"); - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp_wake_thread(client); break; } @@ -2095,9 +2086,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) msp->norm=VIDEO_MODE_NTSC; } - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp_wake_thread(client); return 0; } diff --git a/linux/drivers/media/video/msp3400.c b/linux/drivers/media/video/msp3400.c index 8f94f2619..cc0c3caf8 100644 --- a/linux/drivers/media/video/msp3400.c +++ b/linux/drivers/media/video/msp3400.c @@ -1933,9 +1933,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) msp3400_dbg("AUDC_SET_RADIO\n"); msp->norm = VIDEO_MODE_RADIO; msp3400_dbg("switching to radio mode\n"); - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp->watch_stereo = 0; switch (msp->opmode) { case OPMODE_MANUAL: @@ -2052,9 +2049,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) msp3400_dbg("VIDIOCSCHAN (norm=%d)\n",vc->norm); msp->norm = vc->norm; - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp_wake_thread(client); break; } @@ -2064,9 +2058,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) { /* new channel -- kick audio carrier scan */ msp3400_dbg("VIDIOCSFREQ\n"); - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp_wake_thread(client); break; } @@ -2095,9 +2086,6 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg) msp->norm=VIDEO_MODE_NTSC; } - if (IS_MSP34XX_G(msp)) - msp34xxg_reset(client); - msp_wake_thread(client); return 0; } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index cb8836f68..aa776f5b3 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-11-06 15:36 mchehab + + * ../linux/drivers/media/video/msp3400.c: (msp_command): + + - msp3400 cleanups + + Signed-off-by: Hans Verkuil + Signed-off-by: Mauro Carvalho Chehab + 2005-11-06 13:06 mchehab * ../linux/drivers/media/video/saa7134/Makefile: -- cgit v1.2.3