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

Commit 2ec4e84a authored by Himangi Saraogi's avatar Himangi Saraogi Committed by Mauro Carvalho Chehab
Browse files

[media] saa7164-dvb: Remove unnecessary null test 



This patch removes the null test on dvb. dvb is initialized at the
beginning of the function to &port->dvb. Since port is dereferenced
prior to the null test, port must be a valid pointer, and
&port->dvb cannot be null.

The following Coccinelle script is used for detecting the change:

@r@
expression e,f;
identifier g,y;
statement S1,S2;
@@

*e = &f->g
<+...
 f->y
 ...+>
*if (e != NULL || ...)
 S1 else S2

Signed-off-by: default avatarHimangi Saraogi <himangi774@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent b317d0f5

drivers/media/pci/saa7164/saa7164-dvb.c

+14 −18
Original line number Original line Diff line number Diff line
@@ -242,7 +242,6 @@ static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed) 
	if (!demux->dmx.frontend)

	if (!demux->dmx.frontend)

		return -EINVAL;

		return -EINVAL;





	if (dvb) {

	mutex_lock(&dvb->lock);

	mutex_lock(&dvb->lock);

	if (dvb->feeding++ == 0) {

	if (dvb->feeding++ == 0) {

		/* Start transport */

		/* Start transport */
@@ -251,7 +250,6 @@ static int saa7164_dvb_start_feed(struct dvb_demux_feed *feed) 
	mutex_unlock(&dvb->lock);

	mutex_unlock(&dvb->lock);

	dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",

	dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",

		__func__, port->nr, dvb->feeding);

		__func__, port->nr, dvb->feeding);

	}





	return ret;

	return ret;

}

}
@@ -266,7 +264,6 @@ static int saa7164_dvb_stop_feed(struct dvb_demux_feed *feed) 




	dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);

	dprintk(DBGLVL_DVB, "%s(port=%d)\n", __func__, port->nr);





	if (dvb) {

	mutex_lock(&dvb->lock);

	mutex_lock(&dvb->lock);

	if (--dvb->feeding == 0) {

	if (--dvb->feeding == 0) {

		/* Stop transport */

		/* Stop transport */
@@ -275,7 +272,6 @@ static int saa7164_dvb_stop_feed(struct dvb_demux_feed *feed) 
	mutex_unlock(&dvb->lock);

	mutex_unlock(&dvb->lock);

	dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",

	dprintk(DBGLVL_DVB, "%s(port=%d) now feeding = %d\n",

		__func__, port->nr, dvb->feeding);

		__func__, port->nr, dvb->feeding);

	}





	return ret;

	return ret;

}

}