aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-03-11 14:51:18 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 03:54:05 -0400
commit972d724caf8b6c461b585c800d6460a12c098a5e (patch)
tree24a3edd3c7f0944ad42b8f95d4d2dc5ba6e045da /drivers/media/video
parentfa9448d9bdbae42bb10545f6fcfc980f38f53aa8 (diff)
[media] several drivers: Fix a few gcc 4.6 warnings
au0828-dvb.c:99:6: warning: variable 'ptr' set but not used [-Wunused-but-set-variable] au0828-video.c:1180:25: warning: variable 'maxheight' set but not used [-Wunused-but-set-variable] au0828-video.c:1180:15: warning: variable 'maxwidth' set but not used [-Wunused-but-set-variable] bttv-input.c:196:16: warning: variable 'current_jiffies' set but not used [-Wunused-but-set-variable] Those variables are not used at all, so just remove them. Cc: Steven Toth <stoth@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/au0828/au0828-dvb.c3
-rw-r--r--drivers/media/video/au0828/au0828-video.c4
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c2
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c
index f1edf1d4afe8..518216743c9c 100644
--- a/drivers/media/video/au0828/au0828-dvb.c
+++ b/drivers/media/video/au0828/au0828-dvb.c
@@ -96,7 +96,6 @@ static struct tda18271_config hauppauge_woodbury_tunerconfig = {
96/*-------------------------------------------------------------------*/ 96/*-------------------------------------------------------------------*/
97static void urb_completion(struct urb *purb) 97static void urb_completion(struct urb *purb)
98{ 98{
99 u8 *ptr;
100 struct au0828_dev *dev = purb->context; 99 struct au0828_dev *dev = purb->context;
101 int ptype = usb_pipetype(purb->pipe); 100 int ptype = usb_pipetype(purb->pipe);
102 101
@@ -114,8 +113,6 @@ static void urb_completion(struct urb *purb)
114 return; 113 return;
115 } 114 }
116 115
117 ptr = (u8 *)purb->transfer_buffer;
118
119 /* Feed the transport payload into the kernel demux */ 116 /* Feed the transport payload into the kernel demux */
120 dvb_dmx_swfilter_packets(&dev->dvb.demux, 117 dvb_dmx_swfilter_packets(&dev->dvb.demux,
121 purb->transfer_buffer, purb->actual_length / 188); 118 purb->transfer_buffer, purb->actual_length / 188);
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index 9c475c600fc9..6ad83a15d073 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -1177,10 +1177,6 @@ static int au0828_set_format(struct au0828_dev *dev, unsigned int cmd,
1177 int ret; 1177 int ret;
1178 int width = format->fmt.pix.width; 1178 int width = format->fmt.pix.width;
1179 int height = format->fmt.pix.height; 1179 int height = format->fmt.pix.height;
1180 unsigned int maxwidth, maxheight;
1181
1182 maxwidth = 720;
1183 maxheight = 480;
1184 1180
1185 if (format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) 1181 if (format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
1186 return -EINVAL; 1182 return -EINVAL;
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index e8b64bca9db2..677d70c0e1ce 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -193,12 +193,10 @@ static void bttv_rc5_timer_end(unsigned long data)
193{ 193{
194 struct bttv_ir *ir = (struct bttv_ir *)data; 194 struct bttv_ir *ir = (struct bttv_ir *)data;
195 struct timeval tv; 195 struct timeval tv;
196 unsigned long current_jiffies;
197 u32 gap; 196 u32 gap;
198 u32 rc5 = 0; 197 u32 rc5 = 0;
199 198
200 /* get time */ 199 /* get time */
201 current_jiffies = jiffies;
202 do_gettimeofday(&tv); 200 do_gettimeofday(&tv);
203 201
204 /* avoid overflow with gap >1s */ 202 /* avoid overflow with gap >1s */