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

V4L/DVB (8757): v4l-dvb: fix a bunch of sparse warnings 



Fixed a lot of sparse warnings: mostly warnings about shadowed variables
and signed/unsigned mismatches.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 980d4f17

drivers/media/common/saa7146_video.c

+1 −3
Original line number Diff line number Diff line
@@ -1068,7 +1068,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int 
	{

		v4l2_std_id *id = arg;

		int found = 0;

		int i, err;

		int i;



		DEB_EE(("VIDIOC_S_STD\n"));
@@ -1116,7 +1116,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int 
	case VIDIOC_OVERLAY:

	{

		int on = *(int *)arg;

		int err = 0;



		DEB_D(("VIDIOC_OVERLAY on:%d\n",on));

		if (on != 0) {
@@ -1192,7 +1191,6 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int 
	case VIDIOCGMBUF:

	{

		struct video_mbuf *mbuf = arg;

		struct videobuf_queue *q;

		int i;



		/* fixme: number of capture buffers and sizes for v4l apps */

drivers/media/common/tuners/tuner-simple.c

+17 −16
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static struct tuner_params *simple_tuner_params(struct dvb_frontend *fe, 


static int simple_config_lookup(struct dvb_frontend *fe,

				struct tuner_params *t_params,

				int *frequency, u8 *config, u8 *cb)

				unsigned *frequency, u8 *config, u8 *cb)

{

	struct tuner_simple_priv *priv = fe->tuner_priv;

	int i;
@@ -587,45 +587,45 @@ static int simple_set_tv_freq(struct dvb_frontend *fe, 
	priv->last_div = div;

	if (t_params->has_tda9887) {

		struct v4l2_priv_tun_config tda9887_cfg;

		int config = 0;

		int tda_config = 0;

		int is_secam_l = (params->std & (V4L2_STD_SECAM_L |

						 V4L2_STD_SECAM_LC)) &&

			!(params->std & ~(V4L2_STD_SECAM_L |

					  V4L2_STD_SECAM_LC));



		tda9887_cfg.tuner = TUNER_TDA9887;

		tda9887_cfg.priv  = &config;

		tda9887_cfg.priv  = &tda_config;



		if (params->std == V4L2_STD_SECAM_LC) {

			if (t_params->port1_active ^ t_params->port1_invert_for_secam_lc)

				config |= TDA9887_PORT1_ACTIVE;

				tda_config |= TDA9887_PORT1_ACTIVE;

			if (t_params->port2_active ^ t_params->port2_invert_for_secam_lc)

				config |= TDA9887_PORT2_ACTIVE;

				tda_config |= TDA9887_PORT2_ACTIVE;

		} else {

			if (t_params->port1_active)

				config |= TDA9887_PORT1_ACTIVE;

				tda_config |= TDA9887_PORT1_ACTIVE;

			if (t_params->port2_active)

				config |= TDA9887_PORT2_ACTIVE;

				tda_config |= TDA9887_PORT2_ACTIVE;

		}

		if (t_params->intercarrier_mode)

			config |= TDA9887_INTERCARRIER;

			tda_config |= TDA9887_INTERCARRIER;

		if (is_secam_l) {

			if (i == 0 && t_params->default_top_secam_low)

				config |= TDA9887_TOP(t_params->default_top_secam_low);

				tda_config |= TDA9887_TOP(t_params->default_top_secam_low);

			else if (i == 1 && t_params->default_top_secam_mid)

				config |= TDA9887_TOP(t_params->default_top_secam_mid);

				tda_config |= TDA9887_TOP(t_params->default_top_secam_mid);

			else if (t_params->default_top_secam_high)

				config |= TDA9887_TOP(t_params->default_top_secam_high);

				tda_config |= TDA9887_TOP(t_params->default_top_secam_high);

		} else {

			if (i == 0 && t_params->default_top_low)

				config |= TDA9887_TOP(t_params->default_top_low);

				tda_config |= TDA9887_TOP(t_params->default_top_low);

			else if (i == 1 && t_params->default_top_mid)

				config |= TDA9887_TOP(t_params->default_top_mid);

				tda_config |= TDA9887_TOP(t_params->default_top_mid);

			else if (t_params->default_top_high)

				config |= TDA9887_TOP(t_params->default_top_high);

				tda_config |= TDA9887_TOP(t_params->default_top_high);

		}

		if (t_params->default_pll_gating_18)

			config |= TDA9887_GATING_18;

			tda_config |= TDA9887_GATING_18;

		i2c_clients_command(priv->i2c_props.adap, TUNER_SET_CONFIG,

				    &tda9887_cfg);

	}
@@ -813,7 +813,8 @@ static u32 simple_dvb_configure(struct dvb_frontend *fe, u8 *buf, 
	static struct tuner_params *t_params;

	u8 config, cb;

	u32 div;

	int ret, frequency = params->frequency / 62500;

	int ret;

	unsigned frequency = params->frequency / 62500;



	t_params = simple_tuner_params(fe, TUNER_PARAM_TYPE_DIGITAL);

	ret = simple_config_lookup(fe, t_params, &frequency, &config, &cb);

drivers/media/dvb/dvb-core/dmxdev.c

+0 −1
Original line number Diff line number Diff line
@@ -641,7 +641,6 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter) 
		struct timespec timeout = { 0 };

		struct dmx_pes_filter_params *para = &filter->params.pes;

		dmx_output_t otype;

		int ret;

		int ts_type;

		enum dmx_ts_pes ts_pes;

		struct dmx_ts_feed **tsfeed = &filter->feed.ts;

drivers/media/dvb/dvb-core/dvb_ca_en50221.c

+2 −2
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ static int dvb_ca_en50221_thread(void *data) 
					/* we need this extra check for annoying interfaces like the budget-av */

					if ((!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &&

					    (ca->pub->poll_slot_status)) {

						int status = ca->pub->poll_slot_status(ca->pub, slot, 0);

						status = ca->pub->poll_slot_status(ca->pub, slot, 0);

						if (!(status & DVB_CA_EN50221_POLL_CAM_PRESENT)) {

							ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;

							dvb_ca_en50221_thread_update_delay(ca);
@@ -1089,7 +1089,7 @@ static int dvb_ca_en50221_thread(void *data) 
					/* we need this extra check for annoying interfaces like the budget-av */

					if ((!(ca->flags & DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE)) &&

					    (ca->pub->poll_slot_status)) {

						int status = ca->pub->poll_slot_status(ca->pub, slot, 0);

						status = ca->pub->poll_slot_status(ca->pub, slot, 0);

						if (!(status & DVB_CA_EN50221_POLL_CAM_PRESENT)) {

							ca->slot_info[slot].slot_state = DVB_CA_SLOTSTATE_NONE;

							dvb_ca_en50221_thread_update_delay(ca);

drivers/media/dvb/dvb-core/dvb_frontend.c

+4 −4
Original line number Diff line number Diff line
@@ -889,13 +889,13 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, 
			 * initialization, so parg is 8 bits and does not

			 * include the initialization or start bit

			 */

			unsigned long cmd = ((unsigned long) parg) << 1;

			unsigned long swcmd = ((unsigned long) parg) << 1;

			struct timeval nexttime;

			struct timeval tv[10];

			int i;

			u8 last = 1;

			if (dvb_frontend_debug)

				printk("%s switch command: 0x%04lx\n", __func__, cmd);

				printk("%s switch command: 0x%04lx\n", __func__, swcmd);

			do_gettimeofday(&nexttime);

			if (dvb_frontend_debug)

				memcpy(&tv[0], &nexttime, sizeof(struct timeval));
@@ -908,12 +908,12 @@ static int dvb_frontend_ioctl(struct inode *inode, struct file *file, 
			for (i = 0; i < 9; i++) {

				if (dvb_frontend_debug)

					do_gettimeofday(&tv[i + 1]);

				if ((cmd & 0x01) != last) {

				if ((swcmd & 0x01) != last) {

					/* set voltage to (last ? 13V : 18V) */

					fe->ops.set_voltage(fe, (last) ? SEC_VOLTAGE_13 : SEC_VOLTAGE_18);

					last = (last) ? 0 : 1;

				}

				cmd = cmd >> 1;

				swcmd = swcmd >> 1;

				if (i != 8)

					dvb_frontend_sleep_until(&nexttime, 8000);

			}

CRA Git | Maintained and supported by SUSTech CRA and CCSE