From a68eb156d2390bb92251032fc1d014c0901f9919 Mon Sep 17 00:00:00 2001 From: Narcisa Ana Maria Vasile Date: Wed, 1 Mar 2017 18:59:16 +0200 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- 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(-) diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h index 024d620dc1df..e71d9600b278 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h @@ -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 diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h index 123d86ef582b..993de442b0e6 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h @@ -20,7 +20,6 @@ /* MMAL_ES_FORMAT_T */ - struct mmal_audio_format { u32 channels; /**< Number of audio channels */ u32 sample_rate; /**< Sample rate */ diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h index 67b1076015a5..9fa222f65f5b 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h @@ -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 diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h index f6abb5cfa49d..e7300229842d 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h @@ -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, diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h index 9d1d11e4a53e..23079977a686 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h @@ -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, -- 2.11.0