Commit fbdc5515 authored by Daniela Mormocea's avatar Daniela Mormocea Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: bcm2835-camera: Fix multiple line dereference 



Fix multiple line dereference to avoid checkpatch warnings

Signed-off-by: default avatarDaniela Mormocea <daniela.mormocea@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57a633dc

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

+13 −26
Original line number Diff line number Diff line
@@ -312,8 +312,7 @@ static void buffer_cleanup(struct vb2_buffer *vb) 
static inline bool is_capturing(struct bm2835_mmal_dev *dev)

{

	return dev->capture.camera_port ==

	    &dev->

	    component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_CAPTURE];

	    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_CAPTURE];

}



static void buffer_cb(struct vchiq_mmal_instance *instance,
@@ -751,8 +750,7 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on) 
		return 0;	/* already in requested state */



	src =

	    &dev->component[MMAL_COMPONENT_CAMERA]->

	    output[MMAL_CAMERA_PORT_PREVIEW];

	    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_PREVIEW];



	if (!on) {

		/* disconnect preview ports and disable component */
@@ -807,8 +805,7 @@ static int vidioc_g_fbuf(struct file *file, void *fh, 
	 */

	struct bm2835_mmal_dev *dev = video_drvdata(file);

	struct vchiq_mmal_port *preview_port =

		    &dev->component[MMAL_COMPONENT_CAMERA]->

		    output[MMAL_CAMERA_PORT_PREVIEW];

		    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_PREVIEW];



	a->capability = V4L2_FBUF_CAP_EXTERNOVERLAY |

			V4L2_FBUF_CAP_GLOBAL_ALPHA;
@@ -1000,8 +997,7 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, 
					       dev->capture.camera_port, NULL);

		dev->capture.camera_port = NULL;

		ret = vchiq_mmal_component_disable(dev->instance,

						   dev->capture.

						   encode_component);

						   dev->capture.encode_component);

		if (ret)

			v4l2_err(&dev->v4l2_dev,

				 "Failed to disable encode component %d\n",
@@ -1016,26 +1012,22 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, 
		if (f->fmt.pix.width <= max_video_width

		    && f->fmt.pix.height <= max_video_height)

			camera_port = port =

			    &dev->component[MMAL_COMPONENT_CAMERA]->

			    output[MMAL_CAMERA_PORT_VIDEO];

			    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO];

		else

			camera_port = port =

			    &dev->component[MMAL_COMPONENT_CAMERA]->

			    output[MMAL_CAMERA_PORT_CAPTURE];

			    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_CAPTURE];

		break;

	case MMAL_COMPONENT_IMAGE_ENCODE:

		encode_component = dev->component[MMAL_COMPONENT_IMAGE_ENCODE];

		port = &dev->component[MMAL_COMPONENT_IMAGE_ENCODE]->output[0];

		camera_port =

		    &dev->component[MMAL_COMPONENT_CAMERA]->

		    output[MMAL_CAMERA_PORT_CAPTURE];

		    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_CAPTURE];

		break;

	case MMAL_COMPONENT_VIDEO_ENCODE:

		encode_component = dev->component[MMAL_COMPONENT_VIDEO_ENCODE];

		port = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];

		camera_port =

		    &dev->component[MMAL_COMPONENT_CAMERA]->

		    output[MMAL_CAMERA_PORT_VIDEO];

		    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO];

		break;

	default:

		break;
@@ -1077,13 +1069,11 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, 


	if (!ret

	    && camera_port ==

	    &dev->component[MMAL_COMPONENT_CAMERA]->

	    output[MMAL_CAMERA_PORT_VIDEO]) {

	    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_VIDEO]) {

		bool overlay_enabled =

		    !!dev->component[MMAL_COMPONENT_PREVIEW]->enabled;

		struct vchiq_mmal_port *preview_port =

		    &dev->component[MMAL_COMPONENT_CAMERA]->

		    output[MMAL_CAMERA_PORT_PREVIEW];

		    &dev->component[MMAL_COMPONENT_CAMERA]->output[MMAL_CAMERA_PORT_PREVIEW];

		/* Preview and encode ports need to match on resolution */

		if (overlay_enabled) {

			/* Need to disable the overlay before we can update
@@ -1673,8 +1663,7 @@ static int mmal_init(struct bm2835_mmal_dev *dev) 


	/* get the video encoder component ready */

	ret = vchiq_mmal_component_init(dev->instance, "ril.video_encode",

					&dev->

					component[MMAL_COMPONENT_VIDEO_ENCODE]);

					&dev->component[MMAL_COMPONENT_VIDEO_ENCODE]);

	if (ret < 0)

		goto unreg_image_encoder;
@@ -1797,12 +1786,10 @@ static void bcm2835_cleanup_instance(struct bm2835_mmal_dev *dev) 
				     dev->component[MMAL_COMPONENT_CAMERA]);



	vchiq_mmal_component_finalise(dev->instance,

				      dev->

				      component[MMAL_COMPONENT_VIDEO_ENCODE]);

				      dev->component[MMAL_COMPONENT_VIDEO_ENCODE]);



	vchiq_mmal_component_finalise(dev->instance,

				      dev->

				      component[MMAL_COMPONENT_IMAGE_ENCODE]);

				      dev->component[MMAL_COMPONENT_IMAGE_ENCODE]);



	vchiq_mmal_component_finalise(dev->instance,

				      dev->component[MMAL_COMPONENT_PREVIEW]);

CRA Git | Maintained and supported by SUSTech CRA and CCSE