From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Mon, 31 Aug 2009 20:21:04 +0000 (-0300)
Subject: V4L/DVB (12612): si4713: simplify the code to remove a compiler warning.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a65f3159244f27ce6ff84dd1bb641079acdbd396;p=linux-beck.git

V4L/DVB (12612): si4713: simplify the code to remove a compiler warning.

The compiler warned about an uninitialized stereo variable. By simplifying
the code it 1) improved readability and 2) fixed the compiler warning.

Acked-by: Eduardo Valentin <eduardo.valentin@nokia.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index 8cbbe48b01bd..6a0028eb461f 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -1841,15 +1841,11 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
 	u16 stereo, rds;
 	u32 p;
 
-	if (!sdev) {
-		rval = -ENODEV;
-		goto exit;
-	}
+	if (!sdev)
+		return -ENODEV;
 
-	if (vm->index > 0) {
-		rval = -EINVAL;
-		goto exit;
-	}
+	if (vm->index > 0)
+		return -EINVAL;
 
 	/* Set audio mode: mono or stereo */
 	if (vm->txsubchans & V4L2_TUNER_SUB_STEREO)
@@ -1857,9 +1853,7 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
 	else if (vm->txsubchans & V4L2_TUNER_SUB_MONO)
 		stereo = 0;
 	else
-		rval = -EINVAL;
-	if (rval < 0)
-		goto exit;
+		return -EINVAL;
 
 	rds = !!(vm->txsubchans & V4L2_TUNER_SUB_RDS);
 
@@ -1885,7 +1879,6 @@ static int si4713_s_modulator(struct v4l2_subdev *sd, struct v4l2_modulator *vm)
 
 unlock:
 	mutex_unlock(&sdev->mutex);
-exit:
 	return rval;
 }