Commit 29ebf64f authored by Jamal Shareef's avatar Jamal Shareef Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Replace VCHI_SERVICE_HANDLE_T typedef with struct vchi_service_handle 



Replaces VCHI_SERVICE_HANDLE_T typedef with vchi_service_handle struct
to match kernel code style. Issue found by checkpatch.

Signed-off-by: default avatarJamal Shareef <jamal.k.shareef@gmail.com>
Link: https://lore.kernel.org/r/ec9a1a4bdd87ff008e48835cf7c39847d999b147.1572994235.git.jamal.k.shareef@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fb22360d

drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


struct bcm2835_audio_instance {

	struct device *dev;

	VCHI_SERVICE_HANDLE_T vchi_handle;

	struct vchi_service_handle *vchi_handle;

	struct completion msg_avail_comp;

	struct mutex vchi_mutex;

	struct bcm2835_alsa_stream *alsa_stream;

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ struct mmal_msg_context { 
};



struct vchiq_mmal_instance {

	VCHI_SERVICE_HANDLE_T handle;

	struct vchi_service_handle *handle;



	/* ensure serialised access to service */

	struct mutex vchiq_mutex;

drivers/staging/vc04_services/interface/vchi/vchi.h

+21 −21
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct service_creation { 
struct vchi_instance_handle;



// Opaque handle for a server or client

typedef struct opaque_vchi_service_handle_t *VCHI_SERVICE_HANDLE_T;

struct vchi_service_handle;



/******************************************************************************

 * Global funcs - implementation is specific to which side you are on
@@ -76,53 +76,53 @@ extern int32_t vchi_connect(struct vchi_instance_handle *instance_handle); 
extern int32_t vchi_disconnect(struct vchi_instance_handle *instance_handle);



// helper functions

extern void *vchi_allocate_buffer(VCHI_SERVICE_HANDLE_T handle, uint32_t *length);

extern void vchi_free_buffer(VCHI_SERVICE_HANDLE_T handle, void *address);

extern void *vchi_allocate_buffer(struct vchi_service_handle *handle, uint32_t *length);

extern void vchi_free_buffer(struct vchi_service_handle *handle, void *address);

extern uint32_t vchi_current_time(struct vchi_instance_handle *instance_handle);



/******************************************************************************

 * Global service API

 *****************************************************************************/

// Routine to destroy a service

extern int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle);

extern int32_t vchi_service_destroy(const struct vchi_service_handle *handle);



// Routine to open a named service

extern int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,

				 struct service_creation *setup,

				 VCHI_SERVICE_HANDLE_T *handle);

				 struct vchi_service_handle **handle);



extern int32_t vchi_get_peer_version(const VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_get_peer_version(const struct vchi_service_handle *handle,

				     short *peer_version);



// Routine to close a named service

extern int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle);

extern int32_t vchi_service_close(const struct vchi_service_handle *handle);



// Routine to increment ref count on a named service

extern int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle);

extern int32_t vchi_service_use(const struct vchi_service_handle *handle);



// Routine to decrement ref count on a named service

extern int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle);

extern int32_t vchi_service_release(const struct vchi_service_handle *handle);



// Routine to set a control option for a named service

extern int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_service_set_option(const struct vchi_service_handle *handle,

				       enum vchi_service_option option,

				       int value);



/* Routine to send a message from kernel memory across a service */

extern int

vchi_queue_kernel_message(VCHI_SERVICE_HANDLE_T handle,

vchi_queue_kernel_message(struct vchi_service_handle *handle,

			  void *data,

			  unsigned int size);



/* Routine to send a message from user memory across a service */

extern int

vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle,

vchi_queue_user_message(struct vchi_service_handle *handle,

			void __user *data,

			unsigned int size);



// Routine to receive a msg from a service

// Dequeue is equivalent to hold, copy into client buffer, release

extern int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_msg_dequeue(struct vchi_service_handle *handle,

				void *data,

				uint32_t max_data_size_to_read,

				uint32_t *actual_msg_size,
@@ -131,26 +131,26 @@ extern int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle, 
// Routine to look at a message in place.

// The message is not dequeued, so a subsequent call to peek or dequeue

// will return the same message.

extern int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_msg_peek(struct vchi_service_handle *handle,

			     void **data,

			     uint32_t *msg_size,

			     enum vchi_flags flags);



// Routine to remove a message after it has been read in place with peek

// The first message on the queue is dequeued.

extern int32_t vchi_msg_remove(VCHI_SERVICE_HANDLE_T handle);

extern int32_t vchi_msg_remove(struct vchi_service_handle *handle);



// Routine to look at a message in place.

// The message is dequeued, so the caller is left holding it; the descriptor is

// filled in and must be released when the user has finished with the message.

extern int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_msg_hold(struct vchi_service_handle *handle,

			     void **data,        // } may be NULL, as info can be

			     uint32_t *msg_size, // } obtained from HELD_MSG_T

			     enum vchi_flags flags,

			     struct vchi_held_msg *message_descriptor);



// Initialise an iterator to look through messages in place

extern int32_t vchi_msg_look_ahead(VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_msg_look_ahead(struct vchi_service_handle *handle,

				   struct vchi_msg_iter *iter,

				   enum vchi_flags flags);
@@ -202,21 +202,21 @@ extern int32_t vchi_msg_iter_hold_next(struct vchi_msg_iter *iter, 
 *****************************************************************************/



// Routine to prepare interface for a transfer from the other side

extern int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle,

				       void *data_dst,

				       uint32_t data_size,

				       enum vchi_flags flags,

				       void *transfer_handle);



// Prepare interface for a transfer from the other side into relocatable memory.

int32_t vchi_bulk_queue_receive_reloc(const VCHI_SERVICE_HANDLE_T handle,

int32_t vchi_bulk_queue_receive_reloc(const struct vchi_service_handle *handle,

				      uint32_t offset,

				      uint32_t data_size,

				      const enum vchi_flags flags,

				      void * const bulk_handle);



// Routine to queue up data ready for transfer to the other (once they have signalled they are ready)

extern int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle,

					const void *data_src,

					uint32_t data_size,

					enum vchi_flags flags,
@@ -230,7 +230,7 @@ extern int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle, 
}

#endif



extern int32_t vchi_bulk_queue_transmit_reloc(VCHI_SERVICE_HANDLE_T handle,

extern int32_t vchi_bulk_queue_transmit_reloc(struct vchi_service_handle *handle,

					      uint32_t offset,

					      uint32_t data_size,

					      enum vchi_flags flags,

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c

+25 −25
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ struct shim_service { 
/***********************************************************

 * Name: vchi_msg_peek

 *

 * Arguments:  const VCHI_SERVICE_HANDLE_T handle,

 * Arguments:  struct vchi_service_handle *handle,

 *             void **data,

 *             uint32_t *msg_size,
@@ -36,7 +36,7 @@ struct shim_service { 
 * Returns: int32_t - success == 0

 *

 ***********************************************************/

int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle,

int32_t vchi_msg_peek(struct vchi_service_handle *handle,

		      void **data,

		      uint32_t *msg_size,

		      enum vchi_flags flags)
@@ -63,7 +63,7 @@ EXPORT_SYMBOL(vchi_msg_peek); 
/***********************************************************

 * Name: vchi_msg_remove

 *

 * Arguments:  const VCHI_SERVICE_HANDLE_T handle,

 * Arguments:  struct vchi_service_handle *handle,

 *

 * Description: Routine to remove a message (after it has been read with

 *              vchi_msg_peek)
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(vchi_msg_peek); 
 * Returns: int32_t - success == 0

 *

 ***********************************************************/

int32_t vchi_msg_remove(VCHI_SERVICE_HANDLE_T handle)

int32_t vchi_msg_remove(struct vchi_service_handle *handle)

{

	struct shim_service *service = (struct shim_service *)handle;

	struct vchiq_header *header;
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(vchi_msg_remove); 
/***********************************************************

 * Name: vchi_msg_queue

 *

 * Arguments:  VCHI_SERVICE_HANDLE_T handle,

 * Arguments:  struct vchi_service_handle *handle,

 *             ssize_t (*copy_callback)(void *context, void *dest,

 *				        size_t offset, size_t maxsize),

 *	       void *context,
@@ -99,7 +99,7 @@ EXPORT_SYMBOL(vchi_msg_remove); 
 *

 ***********************************************************/

static

int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,

int32_t vchi_msg_queue(struct vchi_service_handle *handle,

	ssize_t (*copy_callback)(void *context, void *dest,

				 size_t offset, size_t maxsize),

	void *context,
@@ -139,7 +139,7 @@ vchi_queue_kernel_message_callback(void *context, 
}



int

vchi_queue_kernel_message(VCHI_SERVICE_HANDLE_T handle,

vchi_queue_kernel_message(struct vchi_service_handle *handle,

			  void *data,

			  unsigned int size)

{
@@ -169,7 +169,7 @@ vchi_queue_user_message_callback(void *context, 
}



int

vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle,

vchi_queue_user_message(struct vchi_service_handle *handle,

			void __user *data,

			unsigned int size)

{
@@ -198,7 +198,7 @@ EXPORT_SYMBOL(vchi_queue_user_message); 
 * Returns: int32_t - success == 0

 *

 ***********************************************************/

int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle, void *data_dst,

int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle, void *data_dst,

				uint32_t data_size, enum vchi_flags flags,

				void *bulk_handle)

{
@@ -256,7 +256,7 @@ EXPORT_SYMBOL(vchi_bulk_queue_receive); 
 * Returns: int32_t - success == 0

 *

 ***********************************************************/

int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,

int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle,

				 const void *data_src,

				 uint32_t data_size,

				 enum vchi_flags flags,
@@ -307,7 +307,7 @@ EXPORT_SYMBOL(vchi_bulk_queue_transmit); 
/***********************************************************

 * Name: vchi_msg_dequeue

 *

 * Arguments:  VCHI_SERVICE_HANDLE_T handle,

 * Arguments:  struct vchi_service_handle *handle,

 *             void *data,

 *             uint32_t max_data_size_to_read,

 *             uint32_t *actual_msg_size
@@ -318,7 +318,7 @@ EXPORT_SYMBOL(vchi_bulk_queue_transmit); 
 * Returns: int32_t - success == 0

 *

 ***********************************************************/

int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle, void *data,

int32_t vchi_msg_dequeue(struct vchi_service_handle *handle, void *data,

			 uint32_t max_data_size_to_read,

			 uint32_t *actual_msg_size, enum vchi_flags flags)

{
@@ -376,7 +376,7 @@ EXPORT_SYMBOL(vchi_held_msg_release); 
/***********************************************************

 * Name: vchi_msg_hold

 *

 * Arguments:  VCHI_SERVICE_HANDLE_T handle,

 * Arguments:  struct vchi_service_handle *handle,

 *             void **data,

 *             uint32_t *msg_size,

 *             enum vchi_flags flags,
@@ -390,7 +390,7 @@ EXPORT_SYMBOL(vchi_held_msg_release); 
 * Returns: int32_t - success == 0

 *

 ***********************************************************/

int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle, void **data,

int32_t vchi_msg_hold(struct vchi_service_handle *handle, void **data,

		      uint32_t *msg_size, enum vchi_flags flags,

		      struct vchi_held_msg *message_handle)

{
@@ -495,7 +495,7 @@ EXPORT_SYMBOL(vchi_disconnect); 
 *

 * Arguments: struct vchi_instance_handle *instance_handle

 *            struct service_creation *setup,

 *            VCHI_SERVICE_HANDLE_T *handle

 *            struct vchi_service_handle **handle

 *

 * Description: Routine to open a service

 *
@@ -595,12 +595,12 @@ static void service_free(struct shim_service *service) 


int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,

	struct service_creation *setup,

	VCHI_SERVICE_HANDLE_T *handle)

	struct vchi_service_handle **handle)

{

	VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;

	struct shim_service *service = service_alloc(instance, setup);



	*handle = (VCHI_SERVICE_HANDLE_T)service;

	*handle = (struct vchi_service_handle *)service;



	if (service) {

		struct vchiq_service_params params;
@@ -626,7 +626,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle, 
}

EXPORT_SYMBOL(vchi_service_open);



int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle)

int32_t vchi_service_close(const struct vchi_service_handle *handle)

{

	int32_t ret = -1;

	struct shim_service *service = (struct shim_service *)handle;
@@ -642,7 +642,7 @@ int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle) 
}

EXPORT_SYMBOL(vchi_service_close);



int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle)

int32_t vchi_service_destroy(const struct vchi_service_handle *handle)

{

	int32_t ret = -1;

	struct shim_service *service = (struct shim_service *)handle;
@@ -661,7 +661,7 @@ int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle) 
}

EXPORT_SYMBOL(vchi_service_destroy);



int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,

int32_t vchi_service_set_option(const struct vchi_service_handle *handle,

				enum vchi_service_option option,

				int value)

{
@@ -692,7 +692,7 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle, 
}

EXPORT_SYMBOL(vchi_service_set_option);



int32_t vchi_get_peer_version(const VCHI_SERVICE_HANDLE_T handle, short *peer_version)

int32_t vchi_get_peer_version(const struct vchi_service_handle *handle, short *peer_version)

{

	int32_t ret = -1;

	struct shim_service *service = (struct shim_service *)handle;
@@ -710,14 +710,14 @@ EXPORT_SYMBOL(vchi_get_peer_version); 
/***********************************************************

 * Name: vchi_service_use

 *

 * Arguments: const VCHI_SERVICE_HANDLE_T handle

 * Arguments: const struct vchi_service_handle *handle

 *

 * Description: Routine to increment refcount on a service

 *

 * Returns: void

 *

 ***********************************************************/

int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle)

int32_t vchi_service_use(const struct vchi_service_handle *handle)

{

	int32_t ret = -1;
@@ -731,14 +731,14 @@ EXPORT_SYMBOL(vchi_service_use); 
/***********************************************************

 * Name: vchi_service_release

 *

 * Arguments: const VCHI_SERVICE_HANDLE_T handle

 * Arguments: const struct vchi_service_handle *handle

 *

 * Description: Routine to decrement refcount on a service

 *

 * Returns: void

 *

 ***********************************************************/

int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle)

int32_t vchi_service_release(const struct vchi_service_handle *handle)

{

	int32_t ret = -1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE