diff options
author | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-13 08:30:26 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-01-13 08:30:26 -0500 |
commit | a622cc51879f70344c03d4e0de59728e9f5c31b9 (patch) | |
tree | 00cac8076396c49976c0a2c13a1de6795e9b15f3 /drivers/media | |
parent | 429df502d480aae10104e42181b8066a0e23bd3d (diff) |
[media] sh_vou: comment unused vars
Fix two warns below, by commenting the unused code:
drivers/media/platform/sh_vou.c: In function 'sh_vou_configure_geometry':
drivers/media/platform/sh_vou.c:446:49: warning: variable 'height_max' set but not used [-Wunused-but-set-variable]
unsigned int black_left, black_top, width_max, height_max,
^
drivers/media/platform/sh_vou.c: In function 'sh_vou_isr':
drivers/media/platform/sh_vou.c:1056:13: warning: variable 'side' set but not used [-Wunused-but-set-variable]
static int side;
^
Cc: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/platform/sh_vou.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c index 65c9f180a309..e5f1d4c14f2c 100644 --- a/drivers/media/platform/sh_vou.c +++ b/drivers/media/platform/sh_vou.c | |||
@@ -443,7 +443,7 @@ static void sh_vou_configure_geometry(struct sh_vou_device *vou_dev, | |||
443 | int pix_idx, int w_idx, int h_idx) | 443 | int pix_idx, int w_idx, int h_idx) |
444 | { | 444 | { |
445 | struct sh_vou_fmt *fmt = vou_fmt + pix_idx; | 445 | struct sh_vou_fmt *fmt = vou_fmt + pix_idx; |
446 | unsigned int black_left, black_top, width_max, height_max, | 446 | unsigned int black_left, black_top, width_max, |
447 | frame_in_height, frame_out_height, frame_out_top; | 447 | frame_in_height, frame_out_height, frame_out_top; |
448 | struct v4l2_rect *rect = &vou_dev->rect; | 448 | struct v4l2_rect *rect = &vou_dev->rect; |
449 | struct v4l2_pix_format *pix = &vou_dev->pix; | 449 | struct v4l2_pix_format *pix = &vou_dev->pix; |
@@ -451,10 +451,10 @@ static void sh_vou_configure_geometry(struct sh_vou_device *vou_dev, | |||
451 | 451 | ||
452 | if (vou_dev->std & V4L2_STD_525_60) { | 452 | if (vou_dev->std & V4L2_STD_525_60) { |
453 | width_max = 858; | 453 | width_max = 858; |
454 | height_max = 262; | 454 | /* height_max = 262; */ |
455 | } else { | 455 | } else { |
456 | width_max = 864; | 456 | width_max = 864; |
457 | height_max = 312; | 457 | /* height_max = 312; */ |
458 | } | 458 | } |
459 | 459 | ||
460 | frame_in_height = pix->height / 2; | 460 | frame_in_height = pix->height / 2; |
@@ -1053,7 +1053,6 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id) | |||
1053 | static unsigned long j; | 1053 | static unsigned long j; |
1054 | struct videobuf_buffer *vb; | 1054 | struct videobuf_buffer *vb; |
1055 | static int cnt; | 1055 | static int cnt; |
1056 | static int side; | ||
1057 | u32 irq_status = sh_vou_reg_a_read(vou_dev, VOUIR), masked; | 1056 | u32 irq_status = sh_vou_reg_a_read(vou_dev, VOUIR), masked; |
1058 | u32 vou_status = sh_vou_reg_a_read(vou_dev, VOUSTR); | 1057 | u32 vou_status = sh_vou_reg_a_read(vou_dev, VOUSTR); |
1059 | 1058 | ||
@@ -1081,7 +1080,7 @@ static irqreturn_t sh_vou_isr(int irq, void *dev_id) | |||
1081 | irq_status, masked, vou_status, cnt); | 1080 | irq_status, masked, vou_status, cnt); |
1082 | 1081 | ||
1083 | cnt++; | 1082 | cnt++; |
1084 | side = vou_status & 0x10000; | 1083 | /* side = vou_status & 0x10000; */ |
1085 | 1084 | ||
1086 | /* Clear only set interrupts */ | 1085 | /* Clear only set interrupts */ |
1087 | sh_vou_reg_a_write(vou_dev, VOUIR, masked); | 1086 | sh_vou_reg_a_write(vou_dev, VOUIR, masked); |