From: Narcisa Ana Maria Vasile Date: Wed, 1 Mar 2017 15:37:27 +0000 (+0200) Subject: staging: vc04_services: bcm2835-camera: Remove unnecessary variable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3302603e14838b19e41c46cbc400debfe95451db;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: vc04_services: bcm2835-camera: Remove unnecessary variable Instead of storing the result, make the function return directly Signed-off-by: Narcisa Ana Maria Vasile Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c index 53e275e70274..84650d9a8d06 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c @@ -671,7 +671,6 @@ static struct vb2_ops bm2835_mmal_video_qops = { static int set_overlay_params(struct bm2835_mmal_dev *dev, struct vchiq_mmal_port *port) { - int ret; struct mmal_parameter_displayregion prev_config = { .set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_ALPHA | MMAL_DISPLAY_SET_DEST_RECT | MMAL_DISPLAY_SET_FULLSCREEN, @@ -685,11 +684,9 @@ static int set_overlay_params(struct bm2835_mmal_dev *dev, .height = dev->overlay.w.height, }, }; - ret = vchiq_mmal_port_parameter_set(dev->instance, port, - MMAL_PARAMETER_DISPLAYREGION, - &prev_config, sizeof(prev_config)); - - return ret; + return vchiq_mmal_port_parameter_set(dev->instance, port, + MMAL_PARAMETER_DISPLAYREGION, + &prev_config, sizeof(prev_config)); } /* overlay ioctl */