staging: bcm2835-camera: Fix spacing around operators

Fix checkpatch warnings over spaces around operators.
Many were around operations that can be replaced with the
BIT(x) macro, so replace with that where appropriate.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
index b142130e526c469057a90ce35ba4bff180b8e631..e79e7cd6fe868aa064232d793cb51712537b5934 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
@@ -1130,10 +1130,10 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        {
                V4L2_CID_MPEG_VIDEO_H264_PROFILE,
                MMAL_CONTROL_TYPE_STD_MENU,
-               ~((1<<V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
-                       (1<<V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
-                       (1<<V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
-                       (1<<V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
+               ~(BIT(V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE) |
+                 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_BASELINE) |
+                 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_MAIN) |
+                 BIT(V4L2_MPEG_VIDEO_H264_PROFILE_HIGH)),
                V4L2_MPEG_VIDEO_H264_PROFILE_HIGH,
                V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, 1, NULL,
                MMAL_PARAMETER_PROFILE,
@@ -1142,18 +1142,18 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        },
        {
                V4L2_CID_MPEG_VIDEO_H264_LEVEL, MMAL_CONTROL_TYPE_STD_MENU,
-               ~((1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1B) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
-                       (1<<V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),
+               ~(BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_0) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1B) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_1) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_2) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_1_3) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_0) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_1) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_2_2) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_0) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_1) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_3_2) |
+                 BIT(V4L2_MPEG_VIDEO_H264_LEVEL_4_0)),
                V4L2_MPEG_VIDEO_H264_LEVEL_4_0,
                V4L2_MPEG_VIDEO_H264_LEVEL_4_0, 1, NULL,
                MMAL_PARAMETER_PROFILE,

diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
index f165ddf792d2e2169c9b835478cc88e39cb66ea1..8e0aee81ff619a35303bd053f4de6f4943c93b72 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h
@@ -223,7 +223,8 @@ struct mmal_msg_port_action_reply {
 #define MMAL_BUFFER_HEADER_FLAG_FRAME_END              BIT(2)
 /* Signals that the current payload contains only complete frames (>1) */
 #define MMAL_BUFFER_HEADER_FLAG_FRAME                  \
-       (MMAL_BUFFER_HEADER_FLAG_FRAME_START|MMAL_BUFFER_HEADER_FLAG_FRAME_END)
+       (MMAL_BUFFER_HEADER_FLAG_FRAME_START | \
+        MMAL_BUFFER_HEADER_FLAG_FRAME_END)
 /* Signals that the current payload is a keyframe (i.e. self decodable) */
 #define MMAL_BUFFER_HEADER_FLAG_KEYFRAME               BIT(3)
 /*

diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
index 96e987d05ca08ee9117316b9d6c455699c8241db..6d21594ee384ad14a52bb4661695e02cf77f287f 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h
@@ -23,17 +23,17 @@
 #define __MMAL_PARAMETERS_H
 
 /** Common parameter ID group, used with many types of component. */
-#define MMAL_PARAMETER_GROUP_COMMON            (0<<16)
+#define MMAL_PARAMETER_GROUP_COMMON            (0 << 16)
 /** Camera-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_CAMERA            (1<<16)
+#define MMAL_PARAMETER_GROUP_CAMERA            (1 << 16)
 /** Video-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_VIDEO             (2<<16)
+#define MMAL_PARAMETER_GROUP_VIDEO             (2 << 16)
 /** Audio-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_AUDIO             (3<<16)
+#define MMAL_PARAMETER_GROUP_AUDIO             (3 << 16)
 /** Clock-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_CLOCK             (4<<16)
+#define MMAL_PARAMETER_GROUP_CLOCK             (4 << 16)
 /** Miracast-specific parameter ID group. */
-#define MMAL_PARAMETER_GROUP_MIRACAST       (5<<16)
+#define MMAL_PARAMETER_GROUP_MIRACAST       (5 << 16)
 
 /* Common parameters */
 enum mmal_parameter_common_type {