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 8cbbe48..6a0028e 100644 (file)
--- 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;
 }