Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fb4a94d authored by Vatsala Narang's avatar Vatsala Narang Committed by Greg Kroah-Hartman
Browse files

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: default avatarVatsala Narang <vatsalanarang@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 33437124

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+1 −3
Original line number Diff line number Diff line
@@ -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