v4l: Cleanup redundant tests on unsigned

PATCH In review Roel Kluin 1 participant 2 messages Oct 23, 2009 Media (V4L/DVB)

Share & tools

Roel Kluin

author

2009-10-23 10:49 UTC #0 lore raw

PATCH 1/1 v4l: Cleanup redundant tests on unsigned

The variables are unsigned so the test >= 0' is always true, the < 0' test always fails. In these cases the other part of the test catches wrapped values.

Signed-off-by Roel Kluin <[email protected]>

---

drivers/media/common/tuners/tda9887.c +1 -1

index 544cdbe..a71c100 100644
@@ -463,7 +463,7 @@ static int tda9887_set_insmod(struct dvb_frontend *fe)
 			buf[1] &= ~cQSS;
 	}
 
-	if (adjust >= 0x00 && adjust < 0x20) {
+	if (adjust < 0x20) {
 		buf[2] &= ~cTopMask;
 		buf[2] |= adjust;
 	}

drivers/media/dvb/siano/smscoreapi.c +1 -1

index fa6a623..ca758bc 100644
@@ -1373,7 +1373,7 @@ static int GetGpioPinParams(u32 PinNum, u32 *pTranslatedPinNum,
 
 	*pGroupCfg = 1;
 
-	if (PinNum >= 0 && PinNum <= 1)	{
+	if (PinNum <= 1)	{
 		*pTranslatedPinNum = 0;
 		*pGroupNum = 9;
 		*pGroupCfg = 2;

drivers/media/video/bt819.c +1 -1

index f9330e3..5bb0f9e 100644
@@ -299,7 +299,7 @@ static int bt819_s_routing(struct v4l2_subdev *sd,
 
 	v4l2_dbg(1, debug, sd, "set input %x\n", input);
 
-	if (input < 0 || input > 7)
+	if (input > 7)
 		return -EINVAL;
 
 	if (sd->v4l2_dev == NULL || sd->v4l2_dev->notify == NULL)

drivers/media/video/hexium_gemini.c +1 -1

index 71c2114..60d992e 100644
@@ -251,7 +251,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
 
 	DEB_EE(("VIDIOC_S_INPUT %d.\n", input));
 
-	if (input < 0 || input >= HEXIUM_INPUTS)
+	if (input >= HEXIUM_INPUTS)
 		return -EINVAL;
 
 	hexium->cur_input = input;

drivers/media/video/hexium_orion.c +1 -1

index 39d65ca..938a1f8 100644
@@ -350,7 +350,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
 	struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
 	struct hexium *hexium = (struct hexium *) dev->ext_priv;
 
-	if (input < 0 || input >= HEXIUM_INPUTS)
+	if (input >= HEXIUM_INPUTS)
 		return -EINVAL;
 
 	hexium->cur_input = input;

drivers/media/video/mxb.c +1 -1

index 3454070..c1fc6dc 100644
@@ -478,7 +478,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
 
 	DEB_EE(("VIDIOC_S_INPUT %d.\n", input));
 
-	if (input < 0 || input >= MXB_INPUTS)
+	if (input >= MXB_INPUTS)
 		return -EINVAL;
 
 	mxb->cur_input = input;

drivers/media/video/s2255drv.c +1 -1

index 9e3262c..5f5d710 100644
@@ -1963,7 +1963,7 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
 				if (pdword[1] >= MAX_CHANNELS)
 					break;
 				cc = G_chnmap[pdword[1]];
-				if (!(cc >= 0 && cc < MAX_CHANNELS))
+				if (cc >= MAX_CHANNELS)
 					break;
 				switch (pdword[2]) {
 				case S2255_RESPONSE_SETMODE:

drivers/media/video/saa7110.c +1 -1

index 5c24c99..3bca744 100644
@@ -304,7 +304,7 @@ static int saa7110_s_routing(struct v4l2_subdev *sd,
 {
 	struct saa7110 *decoder = to_saa7110(sd);
 
-	if (input < 0 || input >= SAA7110_MAX_INPUT) {
+	if (input >= SAA7110_MAX_INPUT) {
 		v4l2_dbg(1, debug, sd, "input=%d not available\n", input);
 		return -EINVAL;
 	}

drivers/media/video/saa717x.c +1 -1

index b15c409..ad6cd37 100644
@@ -1115,7 +1115,7 @@ static int saa717x_s_video_routing(struct v4l2_subdev *sd,
 	v4l2_dbg(1, debug, sd, "decoder set input (%d)\n", input);
 	/* inputs from 0-9 are available*/
 	/* saa717x have mode0-mode9 but mode5 is reserved. */
-	if (input < 0 || input > 9 || input == 5)
+	if (input > 9 || input == 5)
 		return -EINVAL;
 
 	if (decoder->input != input) {

drivers/media/video/tuner-core.c +1 -1

index aba92e2..00830ee 100644
@@ -328,7 +328,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
 
 	t->type = type;
 	/* prevent invalid config values */
-	t->config = ((new_config >= 0) && (new_config < 256)) ? new_config : 0;
+	t->config = new_config < 256 ? new_config : 0;
 	if (tuner_callback != NULL) {
 		tuner_dbg("defining GPIO callback\n");
 		t->fe.callback = tuner_callback;

drivers/media/video/usbvision/usbvision-video.c +1 -1

index a2a50d6..c07b0ac 100644
@@ -601,7 +601,7 @@ static int vidioc_s_input (struct file *file, void *priv, unsigned int input)
 {
 	struct usb_usbvision *usbvision = video_drvdata(file);
 
-	if ((input >= usbvision->video_inputs) || (input < 0) )
+	if (input >= usbvision->video_inputs)
 		return -EINVAL;
 
 	mutex_lock(&usbvision->lock);

drivers/media/video/vpx3220.c +1 -1

index 97e0ce2..33205d7 100644
@@ -391,7 +391,7 @@ static int vpx3220_s_routing(struct v4l2_subdev *sd,
 		{0x0e, 1}
 	};
 
-	if (input < 0 || input > 2)
+	if (input > 2)
 		return -EINVAL;
 
 	v4l2_dbg(1, debug, sd, "input switched to %s\n", inputs[input]);

drivers/media/video/zoran/zoran_driver.c +1 -1

index 47137de..e9f72ca 100644
@@ -2764,7 +2764,7 @@ static int zoran_enum_input(struct file *file, void *__fh,
 	struct zoran_fh *fh = __fh;
 	struct zoran *zr = fh->zr;
 
-	if (inp->index < 0 || inp->index >= zr->card.inputs)
+	if (inp->index >= zr->card.inputs)
 		return -EINVAL;
 	else {
 		int id = inp->index;

Roel Kluin

author

2009-10-23 13:59 UTC #1 lore raw

Op 23-10-09 12:59, Roel Kluin schreef:

Quoted 6 lines

The variables are unsigned so the test >= 0' is always true, the < 0' test always fails. In these cases the other part of the test catches wrapped values.
Signed-off-by Roel Kluin <[email protected]>
---

I forgot the stats:

 drivers/media/common/tuners/tda9887.c           |    2 +-
 drivers/media/dvb/siano/smscoreapi.c            |    2 +-
 drivers/media/video/bt819.c                     |    2 +-
 drivers/media/video/hexium_gemini.c             |    2 +-
 drivers/media/video/hexium_orion.c              |    2 +-
 drivers/media/video/mxb.c                       |    2 +-
 drivers/media/video/s2255drv.c                  |    2 +-
 drivers/media/video/saa7110.c                   |    2 +-
 drivers/media/video/saa717x.c                   |    2 +-
 drivers/media/video/tuner-core.c                |    2 +-
 drivers/media/video/usbvision/usbvision-video.c |    2 +-
 drivers/media/video/vpx3220.c                   |    2 +-
 drivers/media/video/zoran/zoran_driver.c        |    2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)