Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 972d724c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent fa9448d9

drivers/media/video/au0828/au0828-dvb.c

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/au0828/au0828-video.c

+0 −4
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/bt8xx/bttv-input.c

+0 −2
Original line number Diff line number Diff line
@@ -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 */