[media] several drivers: Fix a few gcc 4.6 warnings
authorMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 11 Mar 2011 19:51:18 +0000 (16:51 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 22 Mar 2011 07:54:05 +0000 (04:54 -0300)
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>
drivers/media/video/au0828/au0828-dvb.c
drivers/media/video/au0828/au0828-video.c
drivers/media/video/bt8xx/bttv-input.c

index f1edf1d4afe8e4c3d1111cb59ff333b18827f679..518216743c9ca4dbc5b1efde12f9bf805a73f349 100644 (file)
@@ -96,7 +96,6 @@ static struct tda18271_config hauppauge_woodbury_tunerconfig = {
 /*-------------------------------------------------------------------*/
 static void urb_completion(struct urb *purb)
 {
-       u8 *ptr;
        struct au0828_dev *dev = purb->context;
        int ptype = usb_pipetype(purb->pipe);
 
@@ -114,8 +113,6 @@ static void urb_completion(struct urb *purb)
                return;
        }
 
-       ptr = (u8 *)purb->transfer_buffer;
-
        /* Feed the transport payload into the kernel demux */
        dvb_dmx_swfilter_packets(&dev->dvb.demux,
                purb->transfer_buffer, purb->actual_length / 188);
index 9c475c600fc9c9a0d8a5f7a568dae7a88579ee4d..6ad83a15d073c07cb9ed0eda2029df155eb5cc15 100644 (file)
@@ -1177,10 +1177,6 @@ static int au0828_set_format(struct au0828_dev *dev, unsigned int cmd,
        int ret;
        int width = format->fmt.pix.width;
        int height = format->fmt.pix.height;
-       unsigned int maxwidth, maxheight;
-
-       maxwidth = 720;
-       maxheight = 480;
 
        if (format->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                return -EINVAL;
index e8b64bca9db22b1c5d72a89b740653060fb864fd..677d70c0e1cebf100649d52dec6587ab443a1b80 100644 (file)
@@ -193,12 +193,10 @@ static void bttv_rc5_timer_end(unsigned long data)
 {
        struct bttv_ir *ir = (struct bttv_ir *)data;
        struct timeval tv;
-       unsigned long current_jiffies;
        u32 gap;
        u32 rc5 = 0;
 
        /* get time */
-       current_jiffies = jiffies;
        do_gettimeofday(&tv);
 
        /* avoid overflow with gap >1s */