aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25821/cx25821-medusa-video.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx25821/cx25821-medusa-video.c')
-rw-r--r--drivers/media/video/cx25821/cx25821-medusa-video.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/media/video/cx25821/cx25821-medusa-video.c b/drivers/media/video/cx25821/cx25821-medusa-video.c
index 298a68d98c2f..313fb20a0b47 100644
--- a/drivers/media/video/cx25821/cx25821-medusa-video.c
+++ b/drivers/media/video/cx25821/cx25821-medusa-video.c
@@ -35,7 +35,6 @@
35static void medusa_enable_bluefield_output(struct cx25821_dev *dev, int channel, 35static void medusa_enable_bluefield_output(struct cx25821_dev *dev, int channel,
36 int enable) 36 int enable)
37{ 37{
38 int ret_val = 1;
39 u32 value = 0; 38 u32 value = 0;
40 u32 tmp = 0; 39 u32 tmp = 0;
41 int out_ctrl = OUT_CTRL1; 40 int out_ctrl = OUT_CTRL1;
@@ -79,13 +78,13 @@ static void medusa_enable_bluefield_output(struct cx25821_dev *dev, int channel,
79 value &= 0xFFFFFF7F; /* clear BLUE_FIELD_EN */ 78 value &= 0xFFFFFF7F; /* clear BLUE_FIELD_EN */
80 if (enable) 79 if (enable)
81 value |= 0x00000080; /* set BLUE_FIELD_EN */ 80 value |= 0x00000080; /* set BLUE_FIELD_EN */
82 ret_val = cx25821_i2c_write(&dev->i2c_bus[0], out_ctrl, value); 81 cx25821_i2c_write(&dev->i2c_bus[0], out_ctrl, value);
83 82
84 value = cx25821_i2c_read(&dev->i2c_bus[0], out_ctrl_ns, &tmp); 83 value = cx25821_i2c_read(&dev->i2c_bus[0], out_ctrl_ns, &tmp);
85 value &= 0xFFFFFF7F; 84 value &= 0xFFFFFF7F;
86 if (enable) 85 if (enable)
87 value |= 0x00000080; /* set BLUE_FIELD_EN */ 86 value |= 0x00000080; /* set BLUE_FIELD_EN */
88 ret_val = cx25821_i2c_write(&dev->i2c_bus[0], out_ctrl_ns, value); 87 cx25821_i2c_write(&dev->i2c_bus[0], out_ctrl_ns, value);
89} 88}
90 89
91static int medusa_initialize_ntsc(struct cx25821_dev *dev) 90static int medusa_initialize_ntsc(struct cx25821_dev *dev)
@@ -431,7 +430,6 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
431{ 430{
432 int decoder = 0; 431 int decoder = 0;
433 int decoder_count = 0; 432 int decoder_count = 0;
434 int ret_val = 0;
435 u32 hscale = 0x0; 433 u32 hscale = 0x0;
436 u32 vscale = 0x0; 434 u32 vscale = 0x0;
437 const int MAX_WIDTH = 720; 435 const int MAX_WIDTH = 720;
@@ -482,9 +480,9 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
482 480
483 for (; decoder < decoder_count; decoder++) { 481 for (; decoder < decoder_count; decoder++) {
484 /* write scaling values for each decoder */ 482 /* write scaling values for each decoder */
485 ret_val = cx25821_i2c_write(&dev->i2c_bus[0], 483 cx25821_i2c_write(&dev->i2c_bus[0],
486 HSCALE_CTRL + (0x200 * decoder), hscale); 484 HSCALE_CTRL + (0x200 * decoder), hscale);
487 ret_val = cx25821_i2c_write(&dev->i2c_bus[0], 485 cx25821_i2c_write(&dev->i2c_bus[0],
488 VSCALE_CTRL + (0x200 * decoder), vscale); 486 VSCALE_CTRL + (0x200 * decoder), vscale);
489 } 487 }
490 488
@@ -494,7 +492,6 @@ void medusa_set_resolution(struct cx25821_dev *dev, int width,
494static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder, 492static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
495 int duration) 493 int duration)
496{ 494{
497 int ret_val = 0;
498 u32 fld_cnt = 0; 495 u32 fld_cnt = 0;
499 u32 tmp = 0; 496 u32 tmp = 0;
500 u32 disp_cnt_reg = DISP_AB_CNT; 497 u32 disp_cnt_reg = DISP_AB_CNT;
@@ -537,7 +534,7 @@ static void medusa_set_decoderduration(struct cx25821_dev *dev, int decoder,
537 fld_cnt |= ((u32) duration) << 16; 534 fld_cnt |= ((u32) duration) << 16;
538 } 535 }
539 536
540 ret_val = cx25821_i2c_write(&dev->i2c_bus[0], disp_cnt_reg, fld_cnt); 537 cx25821_i2c_write(&dev->i2c_bus[0], disp_cnt_reg, fld_cnt);
541 538
542 mutex_unlock(&dev->lock); 539 mutex_unlock(&dev->lock);
543} 540}