staging: vc04_services: bcm2835-camera: Compress two lines into one line

Return value directly without saving it in a variable and remove that
variable.

Issue suggested by Coccinelle.

Signed-off-by: Vatsala Narang <vatsalanarang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index c9b6346111a5d9b60ab5f496d62b91bf9d0526ba..68f08dc18da97a47a8c3a4adff599e3cbe8e32ff 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -1491,7 +1491,6 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
                                 struct vchiq_mmal_component *camera,
                                 struct bm2835_mmal_dev *dev)
 {
-       int ret;
        struct mmal_parameter_camera_config cam_config = {
                .max_stills_w = dev->max_width,
                .max_stills_h = dev->max_height,
@@ -1507,10 +1506,9 @@ static int set_camera_parameters(struct vchiq_mmal_instance *instance,
                .use_stc_timestamp = MMAL_PARAM_TIMESTAMP_MODE_RAW_STC
        };
 
-       ret = vchiq_mmal_port_parameter_set(instance, &camera->control,
+       return vchiq_mmal_port_parameter_set(instance, &camera->control,
                                            MMAL_PARAMETER_CAMERA_CONFIG,
                                            &cam_config, sizeof(cam_config));
-       return ret;
 }
 
 #define MAX_SUPPORTED_ENCODINGS 20