Staging: vc04_services: bcm2835-camera: fix brace code style check
authorMoritz C. Weber <mo.c.weber@gmail.com>
Mon, 19 Feb 2024 11:22:34 +0000 (12:22 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Mar 2024 14:02:14 +0000 (14:02 +0000)
Reformat function parameters to fix checkpatch check:
Increase readability and consistency

Signed-off-by: "Moritz C. Weber" <mo.c.weber@gmail.com>
Link: https://lore.kernel.org/r/20240219112234.8673-3-mo.c.weber@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

index e6ff5ea04471fc655ff68f4c59b55b1aefad3ede..c3ba490e53cb4b32746a2987a716edfcf5a3ff76 100644 (file)
@@ -350,12 +350,11 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
                        if (is_capturing(dev)) {
                                v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
                                         "Grab another frame");
-                               vchiq_mmal_port_parameter_set(
-                                       instance,
-                                       dev->capture.camera_port,
-                                       MMAL_PARAMETER_CAPTURE,
-                                       &dev->capture.frame_count,
-                                       sizeof(dev->capture.frame_count));
+                               vchiq_mmal_port_parameter_set(instance,
+                                                             dev->capture.camera_port,
+                                                             MMAL_PARAMETER_CAPTURE,
+                                                             &dev->capture.frame_count,
+                                                             sizeof(dev->capture.frame_count));
                        }
                        if (vchiq_mmal_submit_buffer(instance, port,
                                                     &buf->mmal))
@@ -406,12 +405,11 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
            is_capturing(dev)) {
                v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
                         "Grab another frame as buffer has EOS");
-               vchiq_mmal_port_parameter_set(
-                       instance,
-                       dev->capture.camera_port,
-                       MMAL_PARAMETER_CAPTURE,
-                       &dev->capture.frame_count,
-                       sizeof(dev->capture.frame_count));
+               vchiq_mmal_port_parameter_set(instance,
+                                             dev->capture.camera_port,
+                                             MMAL_PARAMETER_CAPTURE,
+                                             &dev->capture.frame_count,
+                                             sizeof(dev->capture.frame_count));
        }
 }
 
@@ -420,11 +418,10 @@ static int enable_camera(struct bcm2835_mmal_dev *dev)
        int ret;
 
        if (!dev->camera_use_count) {
-               ret = vchiq_mmal_port_parameter_set(
-                       dev->instance,
-                       &dev->component[COMP_CAMERA]->control,
-                       MMAL_PARAMETER_CAMERA_NUM, &dev->camera_num,
-                       sizeof(dev->camera_num));
+               ret = vchiq_mmal_port_parameter_set(dev->instance,
+                                                   &dev->component[COMP_CAMERA]->control,
+                                                   MMAL_PARAMETER_CAMERA_NUM, &dev->camera_num,
+                                                   sizeof(dev->camera_num));
                if (ret < 0) {
                        v4l2_err(&dev->v4l2_dev,
                                 "Failed setting camera num, ret %d\n", ret);
@@ -468,11 +465,11 @@ static int disable_camera(struct bcm2835_mmal_dev *dev)
                                 "Failed disabling camera, ret %d\n", ret);
                        return -EINVAL;
                }
-               vchiq_mmal_port_parameter_set(
-                       dev->instance,
-                       &dev->component[COMP_CAMERA]->control,
-                       MMAL_PARAMETER_CAMERA_NUM, &i,
-                       sizeof(i));
+               vchiq_mmal_port_parameter_set(dev->instance,
+                                             &dev->component[COMP_CAMERA]->control,
+                                             MMAL_PARAMETER_CAMERA_NUM,
+                                             &i,
+                                             sizeof(i));
        }
        v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
                 "Camera refcount now %d\n", dev->camera_use_count);
@@ -786,9 +783,8 @@ static int vidioc_overlay(struct file *file, void *f, unsigned int on)
                        ret = vchiq_mmal_port_connect_tunnel(dev->instance, src,
                                                             NULL);
                if (ret >= 0)
-                       ret = vchiq_mmal_component_disable(
-                                       dev->instance,
-                                       dev->component[COMP_PREVIEW]);
+                       ret = vchiq_mmal_component_disable(dev->instance,
+                                                          dev->component[COMP_PREVIEW]);
 
                disable_camera(dev);
                return ret;
@@ -1041,8 +1037,8 @@ static int mmal_setup_video_component(struct bcm2835_mmal_dev *dev,
 
        if (overlay_enabled) {
                ret = vchiq_mmal_port_connect_tunnel(dev->instance,
-                               preview_port,
-                               &dev->component[COMP_PREVIEW]->input[0]);
+                                                    preview_port,
+                                                    &dev->component[COMP_PREVIEW]->input[0]);
                if (ret)
                        return ret;
 
@@ -1719,11 +1715,11 @@ static int mmal_init(struct bcm2835_mmal_dev *dev)
        {
                unsigned int enable = 1;
 
-               vchiq_mmal_port_parameter_set(
-                       dev->instance,
-                       &dev->component[COMP_VIDEO_ENCODE]->control,
-                       MMAL_PARAMETER_VIDEO_IMMUTABLE_INPUT,
-                       &enable, sizeof(enable));
+               vchiq_mmal_port_parameter_set(dev->instance,
+                                             &dev->component[COMP_VIDEO_ENCODE]->control,
+                                             MMAL_PARAMETER_VIDEO_IMMUTABLE_INPUT,
+                                             &enable,
+                                             sizeof(enable));
 
                vchiq_mmal_port_parameter_set(dev->instance,
                                              &dev->component[COMP_VIDEO_ENCODE]->control,