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

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

[media] v4l: fix compiler warnings 



media_build/v4l/au0828-video.c: In function 'au0828_irq_callback':
media_build/v4l/au0828-video.c:123:6: warning: variable 'rc' set but not used [-Wunused-but-set-variable]
media_build/v4l/cx23888-ir.c: In function 'pulse_clocks_to_clock_divider':
media_build/v4l/cx23888-ir.c:334:6: warning: variable 'rem' set but not used [-Wunused-but-set-variable]
media_build/v4l/cx25840-ir.c: In function 'pulse_clocks_to_clock_divider':
media_build/v4l/cx25840-ir.c:319:6: warning: variable 'rem' set but not used [-Wunused-but-set-variable]
media_build/v4l/cx25840-ir.c: In function 'cx25840_ir_tx_write':
media_build/v4l/cx25840-ir.c:863:21: warning: variable 'c' set but not used [-Wunused-but-set-variable]
media_build/v4l/em28xx-audio.c: In function 'snd_em28xx_hw_capture_params':
media_build/v4l/em28xx-audio.c:346:31: warning: variable 'format' set but not used [-Wunused-but-set-variable]
media_build/v4l/em28xx-audio.c:346:25: warning: variable 'rate' set but not used [-Wunused-but-set-variable]
media_build/v4l/em28xx-audio.c:346:15: warning: variable 'channels' set but not used [-Wunused-but-set-variable]
media_build/v4l/hdpvr-control.c: In function 'get_input_lines_info':
media_build/v4l/hdpvr-control.c:98:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
media_build/v4l/hdpvr-video.c: In function 'hdpvr_try_ctrl':
media_build/v4l/hdpvr-video.c:955:6: warning: variable 'ret' set but not used [-Wunused-but-set-variable]
media_build/v4l/saa7134-video.c: In function 'saa7134_s_tuner':
media_build/v4l/saa7134-video.c:2030:6: warning: variable 'rx' set but not used [-Wunused-but-set-variable]
media_build/v4l/sn9c102_core.c: In function 'sn9c102_stream_interrupt':
media_build/v4l/sn9c102_core.c:998:7: warning: variable 'timeout' set but not used [-Wunused-but-set-variable]

Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarJanne Grunau <j@jannau.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 30fdf035

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

+2 −2
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static void au0828_irq_callback(struct urb *urb) 
	struct au0828_dmaqueue  *dma_q = urb->context;

	struct au0828_dev *dev = container_of(dma_q, struct au0828_dev, vidq);

	unsigned long flags = 0;

	int rc, i;

	int i;



	switch (urb->status) {

	case 0:             /* success */
@@ -138,7 +138,7 @@ static void au0828_irq_callback(struct urb *urb) 


	/* Copy data from URB */

	spin_lock_irqsave(&dev->slock, flags);

	rc = dev->isoc_ctl.isoc_copy(dev, urb);

	dev->isoc_ctl.isoc_copy(dev, urb);

	spin_unlock_irqrestore(&dev->slock, flags);



	/* Reset urb buffers */

drivers/media/video/cx23885/cx23888-ir.c

+1 −3
Original line number Diff line number Diff line
@@ -331,9 +331,7 @@ static u64 ns_to_pulse_clocks(u32 ns) 


static u16 pulse_clocks_to_clock_divider(u64 count)

{

	u32 rem;



	rem = do_div(count, (FIFO_RXTX << 2) | 0x3);

	do_div(count, (FIFO_RXTX << 2) | 0x3);



	/* net result needs to be rounded down and decremented by 1 */

	if (count > RXCLK_RCD + 1)

drivers/media/video/cx25840/cx25840-ir.c

+1 −5
Original line number Diff line number Diff line
@@ -316,9 +316,7 @@ static u64 ns_to_pulse_clocks(u32 ns) 


static u16 pulse_clocks_to_clock_divider(u64 count)

{

	u32 rem;



	rem = do_div(count, (FIFO_RXTX << 2) | 0x3);

	do_div(count, (FIFO_RXTX << 2) | 0x3);



	/* net result needs to be rounded down and decremented by 1 */

	if (count > RXCLK_RCD + 1)
@@ -860,12 +858,10 @@ static int cx25840_ir_tx_write(struct v4l2_subdev *sd, u8 *buf, size_t count, 
			       ssize_t *num)

{

	struct cx25840_ir_state *ir_state = to_ir_state(sd);

	struct i2c_client *c;



	if (ir_state == NULL)

		return -ENODEV;



	c = ir_state->c;

#if 0

	/*

	 * FIXME - the code below is an incomplete and untested sketch of what

drivers/media/video/em28xx/em28xx-audio.c

+7 −4
Original line number Diff line number Diff line
@@ -343,7 +343,6 @@ static int snd_em28xx_pcm_close(struct snd_pcm_substream *substream) 
static int snd_em28xx_hw_capture_params(struct snd_pcm_substream *substream,

					struct snd_pcm_hw_params *hw_params)

{

	unsigned int channels, rate, format;

	int ret;



	dprintk("Setting capture parameters\n");
@@ -352,13 +351,17 @@ static int snd_em28xx_hw_capture_params(struct snd_pcm_substream *substream, 
				params_buffer_bytes(hw_params));

	if (ret < 0)

		return ret;

#if 0

	/* TODO: set up em28xx audio chip to deliver the correct audio format,

	   current default is 48000hz multiplexed => 96000hz mono

	   which shouldn't matter since analogue TV only supports mono */

	unsigned int channels, rate, format;



	format = params_format(hw_params);

	rate = params_rate(hw_params);

	channels = params_channels(hw_params);

#endif



	/* TODO: set up em28xx audio chip to deliver the correct audio format,

	   current default is 48000hz multiplexed => 96000hz mono

	   which shouldn't matter since analogue TV only supports mono */

	return 0;

}

drivers/media/video/hdpvr/hdpvr-control.c

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ int get_input_lines_info(struct hdpvr_device *dev) 
			 "get input lines info returned: %d, %s\n", ret,

			 print_buf);

	}

#else

	(void)ret;	/* suppress compiler warning */

#endif

	lines = dev->usbc_buf[1] << 8 | dev->usbc_buf[0];

	mutex_unlock(&dev->usbc_mutex);