brcm2708: organize kernel patches
[openwrt/staging/dedeckeh.git] / target / linux / brcm2708 / patches-4.19 / 950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch
diff --git a/target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch b/target/linux/brcm2708/patches-4.19/950-0225-staging-bcm2835-camera-Fix-spacing-around-operators.patch
new file mode 100644 (file)
index 0000000..38bcbbd
--- /dev/null
@@ -0,0 +1,102 @@
+From 54fde7601287891754bef85efbbc9b5648d043f4 Mon Sep 17 00:00:00 2001
+From: Dave Stevenson <dave.stevenson@raspberrypi.org>
+Date: Wed, 21 Feb 2018 14:13:03 +0000
+Subject: [PATCH] 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>
+---
+ .../vc04_services/bcm2835-camera/controls.c   | 32 +++++++++----------
+ .../vc04_services/bcm2835-camera/mmal-msg.h   |  3 +-
+ .../bcm2835-camera/mmal-parameters.h          | 12 +++----
+ 3 files changed, 24 insertions(+), 23 deletions(-)
+
+--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
++++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
+@@ -1123,10 +1123,10 @@ static const struct bm2835_mmal_v4l2_ctr
+       {
+               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,
+@@ -1135,18 +1135,18 @@ static const struct bm2835_mmal_v4l2_ctr
+       },
+       {
+               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,
+--- 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)
+ /*
+--- 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 {