Commit 564f87f9 authored by Adrien Descamps's avatar Adrien Descamps Committed by Greg Kroah-Hartman

staging: vc04: Fix coding style errors "open brace go on the same line"

Open braces for enum, union and struct go on the same line.
Signed-off-by: default avatarAdrien Descamps <adrien.descamps@gmail.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 079550b9
...@@ -217,8 +217,7 @@ typedef void (*VCHI_BUFFER_FREE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_hand ...@@ -217,8 +217,7 @@ typedef void (*VCHI_BUFFER_FREE)(VCHI_CONNECTION_SERVICE_HANDLE_T service_hand
System driver struct System driver struct
*****************************************************************************/ *****************************************************************************/
struct opaque_vchi_connection_api_t struct opaque_vchi_connection_api_t {
{
// Routine to init the connection // Routine to init the connection
VCHI_CONNECTION_INIT_T init; VCHI_CONNECTION_INIT_T init;
......
...@@ -53,14 +53,12 @@ typedef enum message_event_type { ...@@ -53,14 +53,12 @@ typedef enum message_event_type {
MESSAGE_EVENT_MSG_DISCARDED MESSAGE_EVENT_MSG_DISCARDED
} MESSAGE_EVENT_TYPE_T; } MESSAGE_EVENT_TYPE_T;
typedef enum vchi_msg_flags typedef enum vchi_msg_flags {
{
VCHI_MSG_FLAGS_NONE = 0x0, VCHI_MSG_FLAGS_NONE = 0x0,
VCHI_MSG_FLAGS_TERMINATE_DMA = 0x1 VCHI_MSG_FLAGS_TERMINATE_DMA = 0x1
} VCHI_MSG_FLAGS_T; } VCHI_MSG_FLAGS_T;
typedef enum message_tx_channel typedef enum message_tx_channel {
{
MESSAGE_TX_CHANNEL_MESSAGE = 0, MESSAGE_TX_CHANNEL_MESSAGE = 0,
MESSAGE_TX_CHANNEL_BULK = 1 // drivers may provide multiple bulk channels, from 1 upwards MESSAGE_TX_CHANNEL_BULK = 1 // drivers may provide multiple bulk channels, from 1 upwards
} MESSAGE_TX_CHANNEL_T; } MESSAGE_TX_CHANNEL_T;
...@@ -69,8 +67,7 @@ typedef enum message_tx_channel ...@@ -69,8 +67,7 @@ typedef enum message_tx_channel
#define MESSAGE_TX_CHANNEL_BULK_PREV(c) (MESSAGE_TX_CHANNEL_BULK+((c)-MESSAGE_TX_CHANNEL_BULK+VCHI_MAX_BULK_TX_CHANNELS_PER_CONNECTION-1)%VCHI_MAX_BULK_TX_CHANNELS_PER_CONNECTION) #define MESSAGE_TX_CHANNEL_BULK_PREV(c) (MESSAGE_TX_CHANNEL_BULK+((c)-MESSAGE_TX_CHANNEL_BULK+VCHI_MAX_BULK_TX_CHANNELS_PER_CONNECTION-1)%VCHI_MAX_BULK_TX_CHANNELS_PER_CONNECTION)
#define MESSAGE_TX_CHANNEL_BULK_NEXT(c) (MESSAGE_TX_CHANNEL_BULK+((c)-MESSAGE_TX_CHANNEL_BULK+1)%VCHI_MAX_BULK_TX_CHANNELS_PER_CONNECTION) #define MESSAGE_TX_CHANNEL_BULK_NEXT(c) (MESSAGE_TX_CHANNEL_BULK+((c)-MESSAGE_TX_CHANNEL_BULK+1)%VCHI_MAX_BULK_TX_CHANNELS_PER_CONNECTION)
typedef enum message_rx_channel typedef enum message_rx_channel {
{
MESSAGE_RX_CHANNEL_MESSAGE = 0, MESSAGE_RX_CHANNEL_MESSAGE = 0,
MESSAGE_RX_CHANNEL_BULK = 1 // drivers may provide multiple bulk channels, from 1 upwards MESSAGE_RX_CHANNEL_BULK = 1 // drivers may provide multiple bulk channels, from 1 upwards
} MESSAGE_RX_CHANNEL_T; } MESSAGE_RX_CHANNEL_T;
......
...@@ -61,8 +61,7 @@ struct vchi_version { ...@@ -61,8 +61,7 @@ struct vchi_version {
#define VCHI_VERSION(v_) { v_, v_ } #define VCHI_VERSION(v_) { v_, v_ }
#define VCHI_VERSION_EX(v_, m_) { v_, m_ } #define VCHI_VERSION_EX(v_, m_) { v_, m_ }
typedef enum typedef enum {
{
VCHI_VEC_POINTER, VCHI_VEC_POINTER,
VCHI_VEC_HANDLE, VCHI_VEC_HANDLE,
VCHI_VEC_LIST VCHI_VEC_LIST
...@@ -71,26 +70,22 @@ typedef enum ...@@ -71,26 +70,22 @@ typedef enum
typedef struct vchi_msg_vector_ex { typedef struct vchi_msg_vector_ex {
VCHI_MSG_VECTOR_TYPE_T type; VCHI_MSG_VECTOR_TYPE_T type;
union union {
{
// a memory handle // a memory handle
struct struct {
{
VCHI_MEM_HANDLE_T handle; VCHI_MEM_HANDLE_T handle;
uint32_t offset; uint32_t offset;
int32_t vec_len; int32_t vec_len;
} handle; } handle;
// an ordinary data pointer // an ordinary data pointer
struct struct {
{
const void *vec_base; const void *vec_base;
int32_t vec_len; int32_t vec_len;
} ptr; } ptr;
// a nested vector list // a nested vector list
struct struct {
{
struct vchi_msg_vector_ex *vec; struct vchi_msg_vector_ex *vec;
uint32_t vec_len; uint32_t vec_len;
} list; } list;
...@@ -114,8 +109,7 @@ struct opaque_vchi_service_t; ...@@ -114,8 +109,7 @@ struct opaque_vchi_service_t;
// Descriptor for a held message. Allocated by client, initialised by vchi_msg_hold, // Descriptor for a held message. Allocated by client, initialised by vchi_msg_hold,
// vchi_msg_iter_hold or vchi_msg_iter_hold_next. Fields are for internal VCHI use only. // vchi_msg_iter_hold or vchi_msg_iter_hold_next. Fields are for internal VCHI use only.
typedef struct typedef struct {
{
struct opaque_vchi_service_t *service; struct opaque_vchi_service_t *service;
void *message; void *message;
} VCHI_HELD_MSG_T; } VCHI_HELD_MSG_T;
......
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
//flags used when sending messages (must be bitmapped) //flags used when sending messages (must be bitmapped)
typedef enum typedef enum {
{
VCHI_FLAGS_NONE = 0x0, VCHI_FLAGS_NONE = 0x0,
VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE = 0x1, // waits for message to be received, or sent (NB. not the same as being seen on other side) VCHI_FLAGS_BLOCK_UNTIL_OP_COMPLETE = 0x1, // waits for message to be received, or sent (NB. not the same as being seen on other side)
VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE = 0x2, // run a callback when message sent VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE = 0x2, // run a callback when message sent
...@@ -62,8 +61,7 @@ typedef enum { ...@@ -62,8 +61,7 @@ typedef enum {
} VCHI_CRC_CONTROL_T; } VCHI_CRC_CONTROL_T;
//callback reasons when an event occurs on a service //callback reasons when an event occurs on a service
typedef enum typedef enum {
{
VCHI_CALLBACK_REASON_MIN, VCHI_CALLBACK_REASON_MIN,
//This indicates that there is data available //This indicates that there is data available
...@@ -111,8 +109,7 @@ typedef enum ...@@ -111,8 +109,7 @@ typedef enum
} VCHI_CALLBACK_REASON_T; } VCHI_CALLBACK_REASON_T;
// service control options // service control options
typedef enum typedef enum {
{
VCHI_SERVICE_OPTION_MIN, VCHI_SERVICE_OPTION_MIN,
VCHI_SERVICE_OPTION_TRACE, VCHI_SERVICE_OPTION_TRACE,
......
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
#include "vchiq_core.h" #include "vchiq_core.h"
typedef struct vchiq_debugfs_node_struct typedef struct vchiq_debugfs_node_struct {
{
struct dentry *dentry; struct dentry *dentry;
} VCHIQ_DEBUGFS_NODE_T; } VCHIQ_DEBUGFS_NODE_T;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment