Skip to contentSkip to conversation

staging: bcm2835-camera: Fix multiple checkpatch issues

PATCH New Narcisa Ana Maria Vasile 1 participant 3 messages Mar 1, 2017

Subsystems (3)
Staging Broadcom BCM2711/BCM2835 Arm architecture Broadcom BCM281XX/BCM11XXX/BCM216XX Arm architecture
lore
Share & tools
lore

Narcisa Ana Maria Vasile

author
#0 lore raw

cover staging: bcm2835-camera: Fix multiple checkpatch issues

Fix coding style issues reported by checkpatch.pl

Narcisa Ana Maria Vasile (2):
staging: bcm2835-camera: Remove unnecessary blank lines
staging: bcm2835-camera: Add spaces around '<<'

 drivers/staging/vc04_services/bcm2835-camera/controls.c        | 4 ++--
 drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h  | 1 -
 drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h | 1 -
 drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h        | 7 -------
 drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h | 2 --
 drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h      | 4 ----
 6 files changed, 2 insertions(+), 17 deletions(-)
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/2 staging: bcm2835-camera: Remove unnecessary blank lines

This patch fixes the checkpatch.pl issue:
CHECK: Please don't use multiple blank lines

Signed-off-by Narcisa Ana Maria Vasile <[email protected]>
---
 drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h  | 1 -
 drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h | 1 -
 drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h        | 7 -------
 drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h | 2 --
 drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h      | 4 ----
 5 files changed, 15 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h +0 -1
index 024d620..e71d960 100644
@@ -95,7 +95,6 @@
 /** Implicitly delineated NAL units without emulation prevention */
 #define MMAL_ENCODING_VARIANT_H264_RAW       MMAL_FOURCC('R', 'A', 'W', ' ')
 
-
 /** \defgroup MmalColorSpace List of pre-defined video color spaces
  * This defines a list of common color spaces. This list isn't exhaustive and
  * is only provided as a convenience to avoid clients having to use FourCC
drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h +0 -1
index 123d86e..993de44 100644
@@ -20,7 +20,6 @@
 
 /* MMAL_ES_FORMAT_T */
 
-
 struct mmal_audio_format {
 	u32 channels;           /**< Number of audio channels */
 	u32 sample_rate;        /**< Sample rate */
drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +0 -7
index 67b1076..9fa222f 100644
@@ -126,7 +126,6 @@ struct mmal_msg_component_destroy_reply {
 	u32 status; /** The component destruction status */
 };
 
-
 /* request and reply to VC to enable a component */
 struct mmal_msg_component_enable {
 	u32 component_handle;

@@ -136,7 +135,6 @@ struct mmal_msg_component_enable_reply {
 	u32 status; /** The component enable status */
 };
 
-
 /* request and reply to VC to disable a component */
 struct mmal_msg_component_disable {
 	u32 component_handle;

@@ -192,7 +190,6 @@ struct mmal_msg_port_info_set_reply {
 	u8 extradata[MMAL_FORMAT_EXTRADATA_MAX_SIZE];
 };
 
-
 /* port action requests that take a mmal_port as a parameter */
 struct mmal_msg_port_action_port {
 	u32 component_handle;

@@ -214,9 +211,6 @@ struct mmal_msg_port_action_reply {
 	u32 status; /** The port action operation status */
 };
 
-
-
-
 /* MMAL buffer transfer */
 
 /** Size of space reserved in a buffer message for short messages. */

@@ -307,7 +301,6 @@ struct mmal_msg_buffer_from_host {
 	u8 short_data[MMAL_VC_SHORT_DATA];
 };
 
-
 /* port parameter setting */
 
 #define MMAL_WORKER_PORT_PARAMETER_SPACE      96
drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +0 -2
index f6abb5c..e730022 100644
@@ -191,7 +191,6 @@ struct mmal_parameter_fps_range {
 	struct mmal_parameter_rational	fps_high;
 };
 
-
 /* camera configuration parameter */
 struct mmal_parameter_camera_config {
 	/* Parameters for setting up the image pools */

@@ -223,7 +222,6 @@ struct mmal_parameter_camera_config {
 	s32 use_stc_timestamp;
 };
 
-
 enum mmal_parameter_exposuremode {
 	MMAL_PARAM_EXPOSUREMODE_OFF,
 	MMAL_PARAM_EXPOSUREMODE_AUTO,
drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h +0 -4
index 9d1d11e..2307997 100644
@@ -104,7 +104,6 @@ struct vchiq_mmal_component {
 	struct vchiq_mmal_port clock[MAX_PORT_COUNT]; /* clock ports */
 };
 
-
 int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance);
 int vchiq_mmal_finalise(struct vchiq_mmal_instance *instance);
 

@@ -128,8 +127,6 @@ int vchiq_mmal_component_disable(
 		struct vchiq_mmal_instance *instance,
 		struct vchiq_mmal_component *component);
 
-
-
 /* enable a mmal port
  *
  * enables a port and if a buffer callback provided enque buffer

@@ -147,7 +144,6 @@ int vchiq_mmal_port_enable(
 int vchiq_mmal_port_disable(struct vchiq_mmal_instance *instance,
 			   struct vchiq_mmal_port *port);
 
-
 int vchiq_mmal_port_parameter_set(struct vchiq_mmal_instance *instance,
 				  struct vchiq_mmal_port *port,
 				  u32 parameter,
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/2 staging: bcm2835-camera: Add spaces around '<<'

In reply to Narcisa Ana Maria Vasile

This patch fixes the checkpatch.pl issue:
CHECK: spaces preferred around that '<<' (ctx:VxV)

Signed-off-by Narcisa Ana Maria Vasile <[email protected]>
---
 drivers/staging/vc04_services/bcm2835-camera/controls.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/vc04_services/bcm2835-camera/controls.c +2 -2
index 9c0667e..341a072 100644
@@ -1271,11 +1271,11 @@ int bm2835_mmal_init_controls(struct bm2835_mmal_dev *dev,
 				 * mismatches.
 				 */
 				int i;
-				mask = 1<<V4L2_SCENE_MODE_NONE;
+				mask = 1 << V4L2_SCENE_MODE_NONE;
 				for (i = 0;
 				     i < ARRAY_SIZE(scene_configs);
 				     i++) {
-					mask |= 1<<scene_configs[i].v4l2_scene;
+					mask |= 1 << scene_configs[i].v4l2_scene;
 				}
 				mask = ~mask;
 			}
Signature · 1 line
1.9.1