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

Commit 8173090a authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

[media] v4l: fix compiler warnings 



media_build/v4l/adv7343.c: In function 'adv7343_setstd':
media_build/v4l/adv7343.c:133:6: warning: variable 'output_idx' set but not used [-Wunused-but-set-variable]
media_build/v4l/tvp5150.c: In function 'tvp5150_mbus_fmt':
media_build/v4l/tvp5150.c:833:14: warning: variable 'std' set but not used [-Wunused-but-set-variable]
media_build/v4l/tvp7002.c: In function 'tvp7002_query_dv_preset':
media_build/v4l/tvp7002.c:673:18: warning: variable 'device' set but not used [-Wunused-but-set-variable]
media_build/v4l/c-qcam.c: In function 'qc_capture':
media_build/v4l/c-qcam.c:381:33: warning: variable 'bitsperxfer' set but not used [-Wunused-but-set-variable]
media_build/v4l/pms.c: In function 'pms_s_std':
media_build/v4l/pms.c:738:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
media_build/v4l/pms.c: In function 'init_mediavision':
media_build/v4l/pms.c:959:6: warning: variable 'id' set but not used [-Wunused-but-set-variable]
media_build/v4l/cx25821-alsa.c: In function 'cx25821_irq':
media_build/v4l/cx25821-alsa.c:294:6: warning: variable 'audint_count' set but not used [-Wunused-but-set-variable]
media_build/v4l/zr364xx.c: In function 'zr364xx_fillbuff':
media_build/v4l/zr364xx.c:510:25: warning: variable 'frm' set but not used [-Wunused-but-set-variable]
media_build/v4l/s2255drv.c: In function 's2255_fillbuff':
media_build/v4l/s2255drv.c:637:23: warning: variable 'frm' set but not used [-Wunused-but-set-variable]
media_build/v4l/s2255drv.c: In function 'vidioc_s_fmt_vid_cap':
media_build/v4l/s2255drv.c:990:6: warning: variable 'norm' set but not used [-Wunused-but-set-variable]
media_build/v4l/tm6000-stds.c: In function 'tm6000_set_audio_std':
media_build/v4l/tm6000-stds.c:341:10: warning: variable 'nicam_flag' set but not used [-Wunused-but-set-variable]
media_build/v4l/tm6000-video.c: In function 'get_next_buf':
media_build/v4l/tm6000-video.c:172:8: warning: variable 'outp' set but not used [-Wunused-but-set-variable]
media_build/v4l/tm6000-video.c: In function 'copy_streams':
media_build/v4l/tm6000-video.c:214:36: warning: variable 'c' set but not used [-Wunused-but-set-variable]
media_build/v4l/tm6000-input.c: In function 'tm6000_ir_urb_received':
media_build/v4l/tm6000-input.c:171:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable]
media_build/v4l/usbvision-core.c: In function 'usbvision_decompress':
media_build/v4l/usbvision-core.c:604:23: warning: variable 'max_pos' set but not used [-Wunused-but-set-variable]
media_build/v4l/usbvision-core.c: In function 'usbvision_parse_compress':
media_build/v4l/usbvision-core.c:705:39: warning: variable 'rc' set but not used [-Wunused-but-set-variable]
media_build/v4l/usbvision-core.c:705:22: warning: variable 'bytes_per_pixel' set but not used [-Wunused-but-set-variable]
media_build/v4l/zoran_device.c: In function 'write_overlay_mask':
media_build/v4l/zoran_device.c:545:6: warning: variable 'reg' set but not used [-Wunused-but-set-variable]
media_build/v4l/go7007-v4l2.c: In function 'go7007_streamoff':
media_build/v4l/go7007-v4l2.c:79:6: warning: variable 'retval' set but not used [-Wunused-but-set-variable]

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent e92ba283

drivers/media/video/adv7343.c

+1 −3
Original line number Diff line number Diff line
@@ -130,14 +130,12 @@ static int adv7343_setstd(struct v4l2_subdev *sd, v4l2_std_id std) 
{

	struct adv7343_state *state = to_state(sd);

	struct adv7343_std_info *std_info;

	int output_idx, num_std;

	int num_std;

	char *fsc_ptr;

	u8 reg, val;

	int err = 0;

	int i = 0;



	output_idx = state->output;



	std_info = (struct adv7343_std_info *)stdinfo;

	num_std = ARRAY_SIZE(stdinfo);

drivers/media/video/c-qcam.c

+1 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static unsigned int qcam_read_bytes(struct qcam *qcam, unsigned char *buf, unsig 
static long qc_capture(struct qcam *qcam, char __user *buf, unsigned long len)

{

	struct v4l2_device *v4l2_dev = &qcam->v4l2_dev;

	unsigned lines, pixelsperline, bitsperxfer;

	unsigned lines, pixelsperline;

	unsigned int is_bi_dir = qcam->bidirectional;

	size_t wantlen, outptr = 0;

	char tmpbuf[BUFSZ];
@@ -404,7 +404,6 @@ static long qc_capture(struct qcam *qcam, char __user *buf, unsigned long len) 


	lines = qcam->height;

	pixelsperline = qcam->width;

	bitsperxfer = (is_bi_dir) ? 24 : 8;



	if (is_bi_dir) {

		/* Turn the port around */

drivers/media/video/cx25821/cx25821-alsa.c

+0 −2
Original line number Diff line number Diff line
@@ -290,11 +290,9 @@ static irqreturn_t cx25821_irq(int irq, void *dev_id) 
	u32 status, pci_status;

	u32 audint_status, audint_mask;

	int loop, handled = 0;

	int audint_count = 0;



	audint_status = cx_read(AUD_A_INT_STAT);

	audint_mask = cx_read(AUD_A_INT_MSK);

	audint_count = cx_read(AUD_A_GPCNT);

	status = cx_read(PCI_INT_STAT);



	for (loop = 0; loop < 1; loop++) {

drivers/media/video/pms.c

+0 −2
Original line number Diff line number Diff line
@@ -916,7 +916,6 @@ static const struct v4l2_ioctl_ops pms_ioctl_ops = { 


static int init_mediavision(struct pms *dev)

{

	int id;

	int idec, decst;

	int i;

	static const unsigned char i2c_defs[] = {
@@ -948,7 +947,6 @@ static int init_mediavision(struct pms *dev) 
	outb(dev->io >> 4, 0x9a01);	/* Set IO port */





	id = mvv_read(dev, 3);

	decst = pms_i2c_stat(dev, 0x43);



	if (decst != -1)

drivers/media/video/s2255drv.c

+0 −4
Original line number Diff line number Diff line
@@ -634,13 +634,11 @@ static void s2255_fillbuff(struct s2255_channel *channel, 
	const char *tmpbuf;

	char *vbuf = videobuf_to_vmalloc(&buf->vb);

	unsigned long last_frame;

	struct s2255_framei *frm;



	if (!vbuf)

		return;

	last_frame = channel->last_frame;

	if (last_frame != -1) {

		frm = &channel->buffer.frame[last_frame];

		tmpbuf =

		    (const char *)channel->buffer.frame[last_frame].lpvbits;

		switch (buf->fmt->fourcc) {
@@ -987,7 +985,6 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 
	struct videobuf_queue *q = &fh->vb_vidq;

	struct s2255_mode mode;

	int ret;

	int norm;



	ret = vidioc_try_fmt_vid_cap(file, fh, f);
@@ -1018,7 +1015,6 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv, 
	channel->height = f->fmt.pix.height;

	fh->vb_vidq.field = f->fmt.pix.field;

	fh->type = f->type;

	norm = norm_minw(&channel->vdev);

	if (channel->width > norm_minw(&channel->vdev)) {

		if (channel->height > norm_minh(&channel->vdev)) {

			if (channel->cap_parm.capturemode &