* [PATCH v5 00/10] staging: vc04_services: Remove typedefs
@ 2019-11-03 4:36 Jamal Shareef
2019-11-03 4:36 ` [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef Jamal Shareef
` (9 more replies)
0 siblings, 10 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:36 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
This patch removes typedefs from vc04_services files.
Renames callback function typedefs to match kernel code style.
Changes in v5:
- Separate vchi typedef structs into individual patches for each struct
(now Patch 1 and 2).
- Retain callback function pointer typedefs but Rename them to match
kernel code style (Patch 3, 5, 6, 7).
- Separate vchiq typedef structs into individual patches for each
struct (now Patch 9 and 10).
Changes in v4:
- Place removal of VCHIQ_USERDATA_TERM_T callback into callback patch
(Patch 6). Was in struct patch (Patch 8) previously.
Changes in v3:
- Separate removal of unused opaque struct typedefs that were remaining
in the vchi enum typedef patch to a separate patch (now Patch 1).
- Remove formatting in vchi enum typedef Patch 2 which was better
served in Patch 3.
Changes in v2:
- Split patches into smaller patches limitied to typedef type.
Patch 8:
- Rename "struct vchiq_instance_struct' to "struct vchiq_instance" due
to wordiness and agreement between header files.
Jamal Shareef (10):
staging: vc04_services: Remove instance struct typedef
staging: vc04_services: remove service struct typedef
staging: vc04_services: Rename function pointer typedef
staging: vc04_services: Remove vchiq_arm enum typedefs
staging: vc04_services: Rename userdata callback
staging: vc04_services: Renames vchiq callback
staging: vc04_services: Renames remote use callback
staging: vc04_services: Remove int typedef
staging: vc04_services: Remove vchiq instance typedefs
staging: vc04_services: Removes platform struct typedef
.../bcm2835-audio/bcm2835-vchiq.c | 4 +-
.../vc04_services/bcm2835-audio/bcm2835.h | 2 +-
.../vc04_services/bcm2835-camera/mmal-vchiq.c | 4 +-
.../vc04_services/interface/vchi/vchi.h | 56 +++---
.../interface/vchi/vchi_common.h | 7 +-
.../interface/vchiq_arm/vchiq_2835_arm.c | 10 +-
.../interface/vchiq_arm/vchiq_arm.c | 170 +++++++++---------
.../interface/vchiq_arm/vchiq_arm.h | 32 ++--
.../interface/vchiq_arm/vchiq_core.c | 116 ++++++------
.../interface/vchiq_arm/vchiq_core.h | 91 +++++-----
.../interface/vchiq_arm/vchiq_debugfs.c | 14 +-
.../interface/vchiq_arm/vchiq_debugfs.h | 4 +-
.../interface/vchiq_arm/vchiq_if.h | 93 +++++-----
.../interface/vchiq_arm/vchiq_ioctl.h | 4 +-
.../interface/vchiq_arm/vchiq_shim.c | 132 +++++++-------
15 files changed, 369 insertions(+), 370 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
@ 2019-11-03 4:36 ` Jamal Shareef
2019-11-03 12:12 ` Greg KH
2019-11-03 4:36 ` [PATCH v5 02/10] staging: vc04_services: remove service " Jamal Shareef
` (8 subsequent siblings)
9 siblings, 1 reply; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:36 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Removes opaque vchi instance struct typedefs. Issue found by
checkpatch.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../bcm2835-audio/bcm2835-vchiq.c | 2 +-
.../vc04_services/bcm2835-audio/bcm2835.h | 2 +-
.../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
.../vc04_services/interface/vchi/vchi.h | 12 +++---
.../interface/vchi/vchi_common.h | 2 +-
.../interface/vchiq_arm/vchiq_shim.c | 43 +++++++++----------
6 files changed, 31 insertions(+), 32 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index 84ece768854f..2022ff2388dc 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -122,7 +122,7 @@ static void audio_vchi_callback(void *param,
}
static int
-vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance,
+vc_vchi_audio_init(struct vchi_instance_handle *vchi_instance,
struct bcm2835_audio_instance *instance)
{
struct service_creation params = {
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
index ed0feb34b6c8..d2fe8d36ab7d 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
@@ -44,7 +44,7 @@ enum snd_bcm2835_ctrl {
};
struct bcm2835_vchi_ctx {
- VCHI_INSTANCE_T vchi_instance;
+ struct vchi_instance_handle *vchi_instance;
};
/* definition of the chip-specific record */
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index 06b7be7d8872..0f4db2f24944 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -1814,7 +1814,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
{
int status;
struct vchiq_mmal_instance *instance;
- static VCHI_INSTANCE_T vchi_instance;
+ static struct vchi_instance_handle *vchi_instance;
struct service_creation params = {
.version = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
.service_id = VC_MMAL_SERVER_NAME,
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index 75b1ab4919e3..5c8842114607 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -50,7 +50,7 @@ struct service_creation {
};
// Opaque handle for a VCHI instance
-typedef struct opaque_vchi_instance_handle_t *VCHI_INSTANCE_T;
+struct vchi_instance_handle;
// Opaque handle for a server or client
typedef struct opaque_vchi_service_handle_t *VCHI_SERVICE_HANDLE_T;
@@ -65,20 +65,20 @@ extern "C" {
#endif
// Routine used to initialise the vchi on both local + remote connections
-extern int32_t vchi_initialise(VCHI_INSTANCE_T *instance_handle);
+extern int32_t vchi_initialise(struct vchi_instance_handle **instance_handle);
extern int32_t vchi_exit(void);
-extern int32_t vchi_connect(VCHI_INSTANCE_T instance_handle);
+extern int32_t vchi_connect(struct vchi_instance_handle *instance_handle);
//When this is called, ensure that all services have no data pending.
//Bulk transfers can remain 'queued'
-extern int32_t vchi_disconnect(VCHI_INSTANCE_T 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 uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);
+extern uint32_t vchi_current_time(struct vchi_instance_handle *instance_handle);
/******************************************************************************
* Global service API
@@ -87,7 +87,7 @@ extern uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);
extern int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle);
// Routine to open a named service
-extern int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
+extern int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,
struct service_creation *setup,
VCHI_SERVICE_HANDLE_T *handle);
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi_common.h b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
index c99735fc0308..fba37559aa83 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi_common.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
@@ -86,7 +86,7 @@ enum vchi_service_option {
};
//Callback used by all services / bulk transfers
-typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
+ typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
enum vchi_callback_reason reason,
void *handle); //for transmitting msg's only
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index 704afd470c88..a2434a68fc2f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -23,7 +23,7 @@ struct shim_service {
/***********************************************************
* Name: vchi_msg_peek
*
- * Arguments: const VCHI_SERVICE_HANDLE_T handle,
+ * Arguments: VCHI_SERVICE_HANDLE_T handle,
* void **data,
* uint32_t *msg_size,
@@ -63,7 +63,7 @@ EXPORT_SYMBOL(vchi_msg_peek);
/***********************************************************
* Name: vchi_msg_remove
*
- * Arguments: const VCHI_SERVICE_HANDLE_T handle,
+ * Arguments: VCHI_SERVICE_HANDLE_T handle,
*
* Description: Routine to remove a message (after it has been read with
* vchi_msg_peek)
@@ -100,10 +100,9 @@ EXPORT_SYMBOL(vchi_msg_remove);
***********************************************************/
static
int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
- ssize_t (*copy_callback)(void *context, void *dest,
- size_t offset, size_t maxsize),
- void *context,
- uint32_t data_size)
+ ssize_t (*copy_callback)(void *context, void *dest,
+ size_t offset, size_t maxsize),
+ void *context, uint32_t data_size)
{
struct shim_service *service = (struct shim_service *)handle;
VCHIQ_STATUS_T status;
@@ -169,8 +168,7 @@ vchi_queue_user_message_callback(void *context,
}
int
-vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle,
- void __user *data,
+vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle, void __user *data,
unsigned int size)
{
struct vchi_queue_user_message_context copycontext = {
@@ -187,7 +185,7 @@ EXPORT_SYMBOL(vchi_queue_user_message);
/***********************************************************
* Name: vchi_bulk_queue_receive
*
- * Arguments: VCHI_BULK_HANDLE_T handle,
+ * Arguments: VCHI_SERVICE_HANDLE_T handle,
* void *data_dst,
* const uint32_t data_size,
* enum vchi_flags flags
@@ -245,7 +243,7 @@ EXPORT_SYMBOL(vchi_bulk_queue_receive);
/***********************************************************
* Name: vchi_bulk_queue_transmit
*
- * Arguments: VCHI_BULK_HANDLE_T handle,
+ * Arguments: VCHI_SERVICE_HANDLE_T handle,
* const void *data_src,
* uint32_t data_size,
* enum vchi_flags flags,
@@ -428,7 +426,7 @@ EXPORT_SYMBOL(vchi_msg_hold);
/***********************************************************
* Name: vchi_initialise
*
- * Arguments: VCHI_INSTANCE_T *instance_handle
+ * Arguments: struct vchi_instance_handle *instance_handle
*
* Description: Initialises the hardware but does not transmit anything
* When run as a Host App this will be called twice hence the need
@@ -438,14 +436,14 @@ EXPORT_SYMBOL(vchi_msg_hold);
*
***********************************************************/
-int32_t vchi_initialise(VCHI_INSTANCE_T *instance_handle)
+int32_t vchi_initialise(struct vchi_instance_handle **instance_handle)
{
VCHIQ_INSTANCE_T instance;
VCHIQ_STATUS_T status;
status = vchiq_initialise(&instance);
- *instance_handle = (VCHI_INSTANCE_T)instance;
+ *instance_handle = (struct vchi_instance_handle *)instance;
return vchiq_status_to_vchi(status);
}
@@ -454,7 +452,7 @@ EXPORT_SYMBOL(vchi_initialise);
/***********************************************************
* Name: vchi_connect
*
- * Arguments: VCHI_INSTANCE_T instance_handle
+ * Arguments: struct vchi_instance_handle *instance_handle
*
* Description: Starts the command service on each connection,
* causing INIT messages to be pinged back and forth
@@ -462,7 +460,7 @@ EXPORT_SYMBOL(vchi_initialise);
* Returns: 0 if successful, failure otherwise
*
***********************************************************/
-int32_t vchi_connect(VCHI_INSTANCE_T instance_handle)
+int32_t vchi_connect(struct vchi_instance_handle *instance_handle)
{
VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
@@ -473,7 +471,7 @@ EXPORT_SYMBOL(vchi_connect);
/***********************************************************
* Name: vchi_disconnect
*
- * Arguments: VCHI_INSTANCE_T instance_handle
+ * Arguments: struct vchi_instance_handle *instance_handle
*
* Description: Stops the command service on each connection,
* causing DE-INIT messages to be pinged back and forth
@@ -481,7 +479,7 @@ EXPORT_SYMBOL(vchi_connect);
* Returns: 0 if successful, failure otherwise
*
***********************************************************/
-int32_t vchi_disconnect(VCHI_INSTANCE_T instance_handle)
+int32_t vchi_disconnect(struct vchi_instance_handle *instance_handle)
{
VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
@@ -493,7 +491,7 @@ EXPORT_SYMBOL(vchi_disconnect);
* Name: vchi_service_open
* Name: vchi_service_create
*
- * Arguments: VCHI_INSTANCE_T *instance_handle
+ * Arguments: struct vchi_instance_handle *instance_handle
* struct service_creation *setup,
* VCHI_SERVICE_HANDLE_T *handle
*
@@ -593,9 +591,9 @@ static void service_free(struct shim_service *service)
}
}
-int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
- struct service_creation *setup,
- VCHI_SERVICE_HANDLE_T *handle)
+int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,
+ struct service_creation *setup,
+ VCHI_SERVICE_HANDLE_T *handle)
{
VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
struct shim_service *service = service_alloc(instance, setup);
@@ -692,7 +690,8 @@ 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 VCHI_SERVICE_HANDLE_T handle,
+ short *peer_version)
{
int32_t ret = -1;
struct shim_service *service = (struct shim_service *)handle;
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 02/10] staging: vc04_services: remove service struct typedef
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
2019-11-03 4:36 ` [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef Jamal Shareef
@ 2019-11-03 4:36 ` Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 03/10] staging: vc04_services: Rename function pointer typedef Jamal Shareef
` (7 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:36 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Removes opaque service struct typedef. Issue found by checkpatch.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../bcm2835-audio/bcm2835-vchiq.c | 2 +-
.../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
.../vc04_services/interface/vchi/vchi.h | 42 +++++++--------
.../interface/vchiq_arm/vchiq_shim.c | 54 +++++++++----------
4 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index 2022ff2388dc..73144f1ce45e 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -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;
diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
index 0f4db2f24944..de03b90021a8 100644
--- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
@@ -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;
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index 5c8842114607..05fb5c3e8ba0 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -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,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index a2434a68fc2f..c8e62789a540 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -23,7 +23,7 @@ struct shim_service {
/***********************************************************
* Name: vchi_msg_peek
*
- * Arguments: 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: 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, uint32_t data_size)
@@ -138,7 +138,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)
{
@@ -168,7 +168,7 @@ vchi_queue_user_message_callback(void *context,
}
int
-vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle, void __user *data,
+vchi_queue_user_message(struct vchi_service_handle *handle, void __user *data,
unsigned int size)
{
struct vchi_queue_user_message_context copycontext = {
@@ -185,7 +185,7 @@ EXPORT_SYMBOL(vchi_queue_user_message);
/***********************************************************
* Name: vchi_bulk_queue_receive
*
- * Arguments: VCHI_SERVICE_HANDLE_T handle,
+ * Arguments: struct vchi_service_handle *handle,
* void *data_dst,
* const uint32_t data_size,
* enum vchi_flags flags
@@ -196,7 +196,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)
{
@@ -243,7 +243,7 @@ EXPORT_SYMBOL(vchi_bulk_queue_receive);
/***********************************************************
* Name: vchi_bulk_queue_transmit
*
- * Arguments: VCHI_SERVICE_HANDLE_T handle,
+ * Arguments: struct vchi_service_handle *handle,
* const void *data_src,
* uint32_t data_size,
* enum vchi_flags flags,
@@ -254,7 +254,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,
@@ -305,7 +305,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
@@ -316,7 +316,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)
{
@@ -374,7 +374,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,
@@ -388,7 +388,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)
{
@@ -493,7 +493,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
*
@@ -593,12 +593,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;
@@ -624,7 +624,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;
@@ -640,7 +640,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;
@@ -659,7 +659,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)
{
@@ -690,7 +690,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,
+int32_t vchi_get_peer_version(const struct vchi_service_handle *handle,
short *peer_version)
{
int32_t ret = -1;
@@ -709,14 +709,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;
@@ -730,14 +730,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;
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 03/10] staging: vc04_services: Rename function pointer typedef
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
2019-11-03 4:36 ` [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef Jamal Shareef
2019-11-03 4:36 ` [PATCH v5 02/10] staging: vc04_services: remove service " Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 04/10] staging: vc04_services: Remove vchiq_arm enum typedefs Jamal Shareef
` (6 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Renames callback function pointer typedef in vchi files to better match
kernel code style.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
drivers/staging/vc04_services/interface/vchi/vchi.h | 2 +-
drivers/staging/vc04_services/interface/vchi/vchi_common.h | 7 ++++---
.../staging/vc04_services/interface/vchiq_arm/vchiq_shim.c | 3 +--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index 05fb5c3e8ba0..56b1037d8e25 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -45,7 +45,7 @@ struct vchi_held_msg {
struct service_creation {
struct vchi_version version;
int32_t service_id;
- VCHI_CALLBACK_T callback;
+ vchi_callback callback;
void *callback_param;
};
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi_common.h b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
index fba37559aa83..7b18d2346e09 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi_common.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
@@ -86,9 +86,10 @@ enum vchi_service_option {
};
//Callback used by all services / bulk transfers
- typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
- enum vchi_callback_reason reason,
- void *handle); //for transmitting msg's only
+ typedef void (*vchi_callback)(void *callback_param, //my service local param
+ enum vchi_callback_reason reason,
+ void *handle); //for transmitting msg's only
+
/*
* Define vector struct for scatter-gather (vector) operations
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index c8e62789a540..781c2916c5b8 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -15,8 +15,7 @@ struct shim_service {
VCHIQ_SERVICE_HANDLE_T handle;
struct vchiu_queue queue;
-
- VCHI_CALLBACK_T callback;
+ vchi_callback callback;
void *callback_param;
};
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 04/10] staging: vc04_services: Remove vchiq_arm enum typedefs
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
` (2 preceding siblings ...)
2019-11-03 4:37 ` [PATCH v5 03/10] staging: vc04_services: Rename function pointer typedef Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 8:03 ` [Outreachy kernel] " Julia Lawall
2019-11-03 4:37 ` [PATCH v5 05/10] staging: vc04_services: Rename userdata callback Jamal Shareef
` (5 subsequent siblings)
9 siblings, 1 reply; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Removes enum typedefs from vchiq_arm files. Issue found by checkpatch.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../interface/vchiq_arm/vchiq_2835_arm.c | 10 +-
.../interface/vchiq_arm/vchiq_arm.c | 118 +++++++++---------
.../interface/vchiq_arm/vchiq_arm.h | 18 +--
.../interface/vchiq_arm/vchiq_core.c | 82 ++++++------
.../interface/vchiq_arm/vchiq_core.h | 52 ++++----
.../interface/vchiq_arm/vchiq_if.h | 69 +++++-----
.../interface/vchiq_arm/vchiq_ioctl.h | 4 +-
.../interface/vchiq_arm/vchiq_shim.c | 28 ++---
8 files changed, 191 insertions(+), 190 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index b86d7e436357..e568e9e6eb95 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@ -168,10 +168,10 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
return 0;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_platform_init_state(struct vchiq_state *state)
{
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
struct vchiq_2835_state *platform_state;
state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);
@@ -214,7 +214,7 @@ remote_event_signal(struct remote_event *event)
writel(0, g_regs + BELL2); /* trigger vc interrupt */
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size,
int dir)
{
@@ -258,13 +258,13 @@ vchiq_dump_platform_state(void *dump_context)
vchiq_dump(dump_context, buf, len + 1);
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_platform_suspend(struct vchiq_state *state)
{
return VCHIQ_ERROR;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_platform_resume(struct vchiq_state *state)
{
return VCHIQ_SUCCESS;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index dc54f443ef3d..0c615099b067 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -172,14 +172,14 @@ static const char *const ioctl_names[] = {
vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==
(VCHIQ_IOC_MAX + 1));
-static VCHIQ_STATUS_T
+static enum vchiq_status
vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
- unsigned int size, VCHIQ_BULK_DIR_T dir);
+ unsigned int size, enum vchiq_bulk_dir dir);
#define VCHIQ_INIT_RETRIES 10
-VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
+enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
{
- VCHIQ_STATUS_T status = VCHIQ_ERROR;
+ enum vchiq_status status = VCHIQ_ERROR;
struct vchiq_state *state;
VCHIQ_INSTANCE_T instance = NULL;
int i;
@@ -230,9 +230,9 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
}
EXPORT_SYMBOL(vchiq_initialise);
-VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
+enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
struct vchiq_state *state = instance->state;
vchiq_log_trace(vchiq_core_log_level,
@@ -272,9 +272,9 @@ static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
return instance->connected;
}
-VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
+enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
struct vchiq_state *state = instance->state;
vchiq_log_trace(vchiq_core_log_level,
@@ -301,12 +301,12 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
}
EXPORT_SYMBOL(vchiq_connect);
-VCHIQ_STATUS_T vchiq_add_service(
- VCHIQ_INSTANCE_T instance,
+enum vchiq_status vchiq_add_service(
+ VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
VCHIQ_SERVICE_HANDLE_T *phandle)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
struct vchiq_state *state = instance->state;
struct vchiq_service *service = NULL;
int srvstate;
@@ -340,12 +340,12 @@ VCHIQ_STATUS_T vchiq_add_service(
}
EXPORT_SYMBOL(vchiq_add_service);
-VCHIQ_STATUS_T vchiq_open_service(
- VCHIQ_INSTANCE_T instance,
+enum vchiq_status vchiq_open_service(
+ VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
VCHIQ_SERVICE_HANDLE_T *phandle)
{
- VCHIQ_STATUS_T status = VCHIQ_ERROR;
+ enum vchiq_status status = VCHIQ_ERROR;
struct vchiq_state *state = instance->state;
struct vchiq_service *service = NULL;
@@ -380,11 +380,11 @@ VCHIQ_STATUS_T vchiq_open_service(
}
EXPORT_SYMBOL(vchiq_open_service);
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,
- unsigned int size, void *userdata, VCHIQ_BULK_MODE_T mode)
+ unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
switch (mode) {
case VCHIQ_BULK_MODE_NOCALLBACK:
@@ -405,11 +405,11 @@ vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,
}
EXPORT_SYMBOL(vchiq_bulk_transmit);
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,
- unsigned int size, void *userdata, VCHIQ_BULK_MODE_T mode)
+ unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
switch (mode) {
case VCHIQ_BULK_MODE_NOCALLBACK:
@@ -429,13 +429,13 @@ vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,
}
EXPORT_SYMBOL(vchiq_bulk_receive);
-static VCHIQ_STATUS_T
+static enum vchiq_status
vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
- unsigned int size, VCHIQ_BULK_DIR_T dir)
+ unsigned int size, enum vchiq_bulk_dir dir)
{
VCHIQ_INSTANCE_T instance;
struct vchiq_service *service;
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
struct bulk_waiter_node *waiter = NULL;
service = find_service_by_handle(handle);
@@ -515,7 +515,7 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
*
***************************************************************************/
-static VCHIQ_STATUS_T
+static enum vchiq_status
add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,
struct vchiq_header *header, struct user_service *user_service,
void *bulk_userdata)
@@ -582,7 +582,7 @@ add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,
*
***************************************************************************/
-static VCHIQ_STATUS_T
+static enum vchiq_status
service_callback(enum vchiq_reason reason, struct vchiq_header *header,
VCHIQ_SERVICE_HANDLE_T handle, void *bulk_userdata)
{
@@ -630,7 +630,7 @@ service_callback(enum vchiq_reason reason, struct vchiq_header *header,
*/
if ((user_service->message_available_pos -
instance->completion_remove) < 0) {
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
vchiq_log_info(vchiq_arm_log_level,
"Inserting extra MESSAGE_AVAILABLE");
@@ -772,7 +772,7 @@ static ssize_t vchiq_ioc_copy_element_data(void *context, void *dest,
* vchiq_ioc_queue_message
*
**************************************************************************/
-static VCHIQ_STATUS_T
+static enum vchiq_status
vchiq_ioc_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
struct vchiq_element *elements,
unsigned long count)
@@ -805,7 +805,7 @@ static long
vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
VCHIQ_INSTANCE_T instance = file->private_data;
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
struct vchiq_service *service = NULL;
long ret = 0;
int i, rc;
@@ -952,7 +952,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case VCHIQ_IOC_CLOSE_SERVICE:
case VCHIQ_IOC_REMOVE_SERVICE: {
- VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
+ VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
struct user_service *user_service;
service = find_service_for_instance(instance, handle);
@@ -985,7 +985,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case VCHIQ_IOC_USE_SERVICE:
case VCHIQ_IOC_RELEASE_SERVICE: {
- VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
+ VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
service = find_service_for_instance(instance, handle);
if (service) {
@@ -1042,7 +1042,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
struct vchiq_queue_bulk_transfer args;
struct bulk_waiter_node *waiter = NULL;
- VCHIQ_BULK_DIR_T dir =
+ enum vchiq_bulk_dir dir =
(cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ?
VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;
@@ -1107,7 +1107,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
}
kfree(waiter);
} else {
- const VCHIQ_BULK_MODE_T mode_waiting =
+ const enum vchiq_bulk_mode mode_waiting =
VCHIQ_BULK_MODE_WAITING;
waiter->pid = current->pid;
mutex_lock(&instance->bulk_waiter_list_mutex);
@@ -1368,7 +1368,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} break;
case VCHIQ_IOC_GET_CLIENT_ID: {
- VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
+ VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
ret = vchiq_get_client_id(handle);
} break;
@@ -1423,7 +1423,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} break;
case VCHIQ_IOC_CLOSE_DELIVERED: {
- VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
+ VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
service = find_closed_service_for_instance(instance, handle);
if (service) {
@@ -1484,7 +1484,7 @@ struct vchiq_create_service32 {
struct vchiq_service_params32 params;
int is_open;
int is_vchi;
- unsigned int handle; /* OUT */
+ VCHIQ_SERVICE_HANDLE_T handle; /* OUT */
};
#define VCHIQ_IOC_CREATE_SERVICE32 \
@@ -1544,7 +1544,7 @@ struct vchiq_element32 {
};
struct vchiq_queue_message32 {
- unsigned int handle;
+ VCHIQ_SERVICE_HANDLE_T handle;
unsigned int count;
compat_uptr_t elements;
};
@@ -1607,11 +1607,11 @@ vchiq_compat_ioctl_queue_message(struct file *file,
}
struct vchiq_queue_bulk_transfer32 {
- unsigned int handle;
+ VCHIQ_SERVICE_HANDLE_T handle;
compat_uptr_t data;
unsigned int size;
compat_uptr_t userdata;
- VCHIQ_BULK_MODE_T mode;
+ enum vchiq_bulk_mode mode;
};
#define VCHIQ_IOC_QUEUE_BULK_TRANSMIT32 \
@@ -1824,7 +1824,7 @@ vchiq_compat_ioctl_await_completion(struct file *file,
}
struct vchiq_dequeue_message32 {
- unsigned int handle;
+ VCHIQ_SERVICE_HANDLE_T handle;
int blocking;
unsigned int bufsize;
compat_uptr_t buf;
@@ -2270,7 +2270,7 @@ vchiq_videocore_wanted(struct vchiq_state *state)
return 1;
}
-static VCHIQ_STATUS_T
+static enum vchiq_status
vchiq_keepalive_vchiq_callback(enum vchiq_reason reason,
struct vchiq_header *header,
VCHIQ_SERVICE_HANDLE_T service_user,
@@ -2287,7 +2287,7 @@ vchiq_keepalive_thread_func(void *v)
struct vchiq_state *state = (struct vchiq_state *)v;
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
VCHIQ_INSTANCE_T instance;
VCHIQ_SERVICE_HANDLE_T ka_handle;
@@ -2361,7 +2361,7 @@ vchiq_keepalive_thread_func(void *v)
return 0;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_arm_init_state(struct vchiq_state *state,
struct vchiq_arm_state *arm_state)
{
@@ -2563,10 +2563,10 @@ unblock_resume(struct vchiq_arm_state *arm_state)
/* Initiate suspend via slot handler. Should be called with the write lock
* held */
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_arm_vcsuspend(struct vchiq_state *state)
{
- VCHIQ_STATUS_T status = VCHIQ_ERROR;
+ enum vchiq_status status = VCHIQ_ERROR;
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
if (!arm_state)
@@ -2684,12 +2684,12 @@ vchiq_check_resume(struct vchiq_state *state)
return resume;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
enum USE_TYPE_E use_type)
{
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
- VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
+ enum vchiq_status ret = VCHIQ_SUCCESS;
char entity[16];
int *entity_uc;
int local_uc, local_entity_uc;
@@ -2798,7 +2798,7 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
}
if (ret == VCHIQ_SUCCESS) {
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
long ack_cnt = atomic_xchg(&arm_state->ka_use_ack_count, 0);
while (ack_cnt && (status == VCHIQ_SUCCESS)) {
@@ -2817,11 +2817,11 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
return ret;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service)
{
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
- VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
+ enum vchiq_status ret = VCHIQ_SUCCESS;
char entity[16];
int *entity_uc;
@@ -2898,13 +2898,13 @@ vchiq_on_remote_release(struct vchiq_state *state)
complete(&arm_state->ka_evt);
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_use_service_internal(struct vchiq_service *service)
{
return vchiq_use_internal(service->state, service, USE_TYPE_SERVICE);
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_release_service_internal(struct vchiq_service *service)
{
return vchiq_release_internal(service->state, service);
@@ -2969,10 +2969,10 @@ static void suspend_timer_callback(struct timer_list *t)
vchiq_check_suspend(state);
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
{
- VCHIQ_STATUS_T ret = VCHIQ_ERROR;
+ enum vchiq_status ret = VCHIQ_ERROR;
struct vchiq_service *service = find_service_by_handle(handle);
if (service) {
@@ -2983,10 +2983,10 @@ vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
return ret;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle)
{
- VCHIQ_STATUS_T ret = VCHIQ_ERROR;
+ enum vchiq_status ret = VCHIQ_ERROR;
struct vchiq_service *service = find_service_by_handle(handle);
if (service) {
@@ -3088,11 +3088,11 @@ vchiq_dump_service_use_state(struct vchiq_state *state)
vchiq_dump_platform_use_state(state);
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_check_service(struct vchiq_service *service)
{
struct vchiq_arm_state *arm_state;
- VCHIQ_STATUS_T ret = VCHIQ_ERROR;
+ enum vchiq_status ret = VCHIQ_ERROR;
if (!service || !service->state)
goto out;
@@ -3128,8 +3128,8 @@ void vchiq_on_remote_use_active(struct vchiq_state *state)
}
void vchiq_platform_conn_state_changed(struct vchiq_state *state,
- VCHIQ_CONNSTATE_T oldstate,
- VCHIQ_CONNSTATE_T newstate)
+ enum vchiq_connstate oldstate,
+ enum vchiq_connstate newstate)
{
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index b424323e9613..ebab08b567fa 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -109,13 +109,13 @@ int vchiq_platform_init(struct platform_device *pdev,
extern struct vchiq_state *
vchiq_get_state(void);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_arm_vcsuspend(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_arm_vcresume(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_arm_init_state(struct vchiq_state *state,
struct vchiq_arm_state *arm_state);
@@ -124,16 +124,16 @@ vchiq_check_resume(struct vchiq_state *state);
extern void
vchiq_check_suspend(struct vchiq_state *state);
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_check_service(struct vchiq_service *service);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_platform_suspend(struct vchiq_state *state);
extern int
@@ -154,10 +154,10 @@ vchiq_platform_get_arm_state(struct vchiq_state *state);
extern int
vchiq_videocore_wanted(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
enum USE_TYPE_E use_type);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_release_internal(struct vchiq_state *state,
struct vchiq_service *service);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index e1898cfa5e91..6e4ad0929ba3 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -59,7 +59,7 @@ DEFINE_SPINLOCK(bulk_waiter_spinlock);
static DEFINE_SPINLOCK(quota_spinlock);
struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES];
-static unsigned int handle_seq;
+static VCHIQ_SERVICE_HANDLE_T handle_seq;
static const char *const srvstate_names[] = {
"FREE",
@@ -354,11 +354,11 @@ mark_service_closing(struct vchiq_service *service)
mark_service_closing_internal(service, 0);
}
-static inline VCHIQ_STATUS_T
+static inline enum vchiq_status
make_service_callback(struct vchiq_service *service, enum vchiq_reason reason,
struct vchiq_header *header, void *bulk_userdata)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %pK, %pK)",
service->state->id, service->localport, reason_names[reason],
@@ -375,9 +375,9 @@ make_service_callback(struct vchiq_service *service, enum vchiq_reason reason,
}
inline void
-vchiq_set_conn_state(struct vchiq_state *state, VCHIQ_CONNSTATE_T newstate)
+vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate)
{
- VCHIQ_CONNSTATE_T oldstate = state->conn_state;
+ enum vchiq_connstate oldstate = state->conn_state;
vchiq_log_info(vchiq_core_log_level, "%d: %s->%s", state->id,
conn_state_names[oldstate],
@@ -779,7 +779,7 @@ copy_message_data(
}
/* Called by the slot handler and application threads */
-static VCHIQ_STATUS_T
+static enum vchiq_status
queue_message(struct vchiq_state *state, struct vchiq_service *service,
int msgid,
ssize_t (*copy_callback)(void *context, void *dest,
@@ -1027,7 +1027,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
}
/* Called by the slot handler and application threads */
-static VCHIQ_STATUS_T
+static enum vchiq_status
queue_message_sync(struct vchiq_state *state, struct vchiq_service *service,
int msgid,
ssize_t (*copy_callback)(void *context, void *dest,
@@ -1178,11 +1178,11 @@ release_slot(struct vchiq_state *state, struct vchiq_slot_info *slot_info,
}
/* Called by the slot handler - don't hold the bulk mutex */
-static VCHIQ_STATUS_T
+static enum vchiq_status
notify_bulks(struct vchiq_service *service, struct vchiq_bulk_queue *queue,
int retry_poll)
{
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
vchiq_log_trace(vchiq_core_log_level,
"%d: nb:%d %cx - p=%x rn=%x r=%x",
@@ -2078,7 +2078,7 @@ init_bulk_queue(struct vchiq_bulk_queue *queue)
}
inline const char *
-get_conn_state_name(VCHIQ_CONNSTATE_T conn_state)
+get_conn_state_name(enum vchiq_connstate conn_state)
{
return conn_state_names[conn_state];
}
@@ -2123,12 +2123,12 @@ vchiq_init_slots(void *mem_base, int mem_size)
return slot_zero;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)
{
struct vchiq_shared_state *local;
struct vchiq_shared_state *remote;
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
char threadname[16];
int i;
@@ -2281,7 +2281,7 @@ struct vchiq_service *
vchiq_add_service_internal(struct vchiq_state *state,
const struct vchiq_service_params *params,
int srvstate, VCHIQ_INSTANCE_T instance,
- VCHIQ_USERDATA_TERM_T userdata_term)
+ void (*userdata_term)(void *userdata))
{
struct vchiq_service *service;
struct vchiq_service **pservice = NULL;
@@ -2409,7 +2409,7 @@ vchiq_add_service_internal(struct vchiq_state *state,
return service;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_open_service_internal(struct vchiq_service *service, int client_id)
{
struct vchiq_open_payload payload = {
@@ -2418,7 +2418,7 @@ vchiq_open_service_internal(struct vchiq_service *service, int client_id)
service->version,
service->version_min
};
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
service->client_id = client_id;
vchiq_use_service_internal(service);
@@ -2516,7 +2516,7 @@ release_service_messages(struct vchiq_service *service)
static int
do_abort_bulks(struct vchiq_service *service)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
/* Abort any outstanding bulk transfers */
if (mutex_lock_killable(&service->bulk_mutex))
@@ -2532,10 +2532,10 @@ do_abort_bulks(struct vchiq_service *service)
return (status == VCHIQ_SUCCESS);
}
-static VCHIQ_STATUS_T
+static enum vchiq_status
close_service_complete(struct vchiq_service *service, int failstate)
{
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID);
int newstate;
@@ -2594,11 +2594,11 @@ close_service_complete(struct vchiq_service *service, int failstate)
}
/* Called by the slot handler */
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_close_service_internal(struct vchiq_service *service, int close_recvd)
{
struct vchiq_state *state = service->state;
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID);
vchiq_log_info(vchiq_core_log_level, "%d: csi:%d,%d (%s)",
@@ -2774,7 +2774,7 @@ vchiq_free_service_internal(struct vchiq_service *service)
unlock_service(service);
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
{
struct vchiq_service *service;
@@ -2810,7 +2810,7 @@ vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
return VCHIQ_SUCCESS;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
{
struct vchiq_service *service;
@@ -2827,12 +2827,12 @@ vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
return VCHIQ_SUCCESS;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
{
/* Unregister the service */
struct vchiq_service *service = find_service_by_handle(handle);
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
if (!service)
return VCHIQ_ERROR;
@@ -2886,12 +2886,12 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
return status;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
{
/* Unregister the service */
struct vchiq_service *service = find_service_by_handle(handle);
- VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
+ enum vchiq_status status = VCHIQ_SUCCESS;
if (!service)
return VCHIQ_ERROR;
@@ -2952,10 +2952,10 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
* When called in blocking mode, the userdata field points to a bulk_waiter
* structure.
*/
-VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
+enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
void *offset, int size, void *userdata,
- VCHIQ_BULK_MODE_T mode,
- VCHIQ_BULK_DIR_T dir)
+ enum vchiq_bulk_mode mode,
+ enum vchiq_bulk_dir dir)
{
struct vchiq_service *service = find_service_by_handle(handle);
struct vchiq_bulk_queue *queue;
@@ -2965,7 +2965,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
const char dir_char = (dir == VCHIQ_BULK_TRANSMIT) ? 't' : 'r';
const int dir_msgtype = (dir == VCHIQ_BULK_TRANSMIT) ?
VCHIQ_MSG_BULK_TX : VCHIQ_MSG_BULK_RX;
- VCHIQ_STATUS_T status = VCHIQ_ERROR;
+ enum vchiq_status status = VCHIQ_ERROR;
int payload[2];
if (!service || service->srvstate != VCHIQ_SRVSTATE_OPEN ||
@@ -3100,7 +3100,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
return status;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
ssize_t (*copy_callback)(void *context, void *dest,
size_t offset, size_t maxsize),
@@ -3108,7 +3108,7 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
size_t size)
{
struct vchiq_service *service = find_service_by_handle(handle);
- VCHIQ_STATUS_T status = VCHIQ_ERROR;
+ enum vchiq_status status = VCHIQ_ERROR;
if (!service ||
(vchiq_check_service(service) != VCHIQ_SUCCESS))
@@ -3192,10 +3192,10 @@ release_message_sync(struct vchiq_state *state, struct vchiq_header *header)
remote_event_signal(&state->remote->sync_release);
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle, short *peer_version)
{
- VCHIQ_STATUS_T status = VCHIQ_ERROR;
+ enum vchiq_status status = VCHIQ_ERROR;
struct vchiq_service *service = find_service_by_handle(handle);
if (!service ||
@@ -3221,12 +3221,12 @@ void vchiq_get_config(struct vchiq_config *config)
config->version_min = VCHIQ_VERSION_MIN;
}
-VCHIQ_STATUS_T
+enum vchiq_status
vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T handle,
- VCHIQ_SERVICE_OPTION_T option, int value)
+ enum vchiq_service_option option, int value)
{
struct vchiq_service *service = find_service_by_handle(handle);
- VCHIQ_STATUS_T status = VCHIQ_ERROR;
+ enum vchiq_status status = VCHIQ_ERROR;
if (service) {
switch (option) {
@@ -3524,9 +3524,9 @@ vchiq_loud_error_footer(void)
"================");
}
-VCHIQ_STATUS_T vchiq_send_remote_use(struct vchiq_state *state)
+enum vchiq_status vchiq_send_remote_use(struct vchiq_state *state)
{
- VCHIQ_STATUS_T status = VCHIQ_RETRY;
+ enum vchiq_status status = VCHIQ_RETRY;
if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
status = queue_message(state, NULL,
@@ -3535,9 +3535,9 @@ VCHIQ_STATUS_T vchiq_send_remote_use(struct vchiq_state *state)
return status;
}
-VCHIQ_STATUS_T vchiq_send_remote_use_active(struct vchiq_state *state)
+enum vchiq_status vchiq_send_remote_use_active(struct vchiq_state *state)
{
- VCHIQ_STATUS_T status = VCHIQ_RETRY;
+ enum vchiq_status status = VCHIQ_RETRY;
if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
status = queue_message(state, NULL,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index 75104986201b..d33d6bd96617 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -169,7 +169,7 @@ enum {
#endif /* VCHIQ_ENABLE_DEBUG */
-typedef enum {
+enum vchiq_connstate {
VCHIQ_CONNSTATE_DISCONNECTED,
VCHIQ_CONNSTATE_CONNECTING,
VCHIQ_CONNSTATE_CONNECTED,
@@ -179,7 +179,7 @@ typedef enum {
VCHIQ_CONNSTATE_RESUMING,
VCHIQ_CONNSTATE_PAUSE_TIMEOUT,
VCHIQ_CONNSTATE_RESUME_TIMEOUT
-} VCHIQ_CONNSTATE_T;
+};
enum {
VCHIQ_SRVSTATE_FREE,
@@ -202,10 +202,10 @@ enum {
VCHIQ_POLL_COUNT
};
-typedef enum {
+enum vchiq_bulk_dir {
VCHIQ_BULK_TRANSMIT,
VCHIQ_BULK_RECEIVE
-} VCHIQ_BULK_DIR_T;
+};
typedef void (*VCHIQ_USERDATA_TERM_T)(void *userdata);
@@ -367,7 +367,7 @@ struct vchiq_slot_zero {
struct vchiq_state {
int id;
int initialised;
- VCHIQ_CONNSTATE_T conn_state;
+ enum vchiq_connstate conn_state;
short version_common;
struct vchiq_shared_state *local;
@@ -467,7 +467,7 @@ struct vchiq_state {
struct vchiq_service *services[VCHIQ_MAX_SERVICES];
struct vchiq_service_quota service_quotas[VCHIQ_MAX_SERVICES];
struct vchiq_slot_info slot_info[VCHIQ_MAX_SLOTS];
-
+
VCHIQ_PLATFORM_STATE_T platform_state;
};
@@ -486,15 +486,15 @@ extern int vchiq_sync_log_level;
extern struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES];
extern const char *
-get_conn_state_name(VCHIQ_CONNSTATE_T conn_state);
+get_conn_state_name(enum vchiq_connstate conn_state);
extern struct vchiq_slot_zero *
vchiq_init_slots(void *mem_base, int mem_size);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance);
extern struct vchiq_service *
@@ -503,10 +503,10 @@ vchiq_add_service_internal(struct vchiq_state *state,
int srvstate, VCHIQ_INSTANCE_T instance,
VCHIQ_USERDATA_TERM_T userdata_term);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_open_service_internal(struct vchiq_service *service, int client_id);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_close_service_internal(struct vchiq_service *service, int close_recvd);
extern void
@@ -515,16 +515,16 @@ vchiq_terminate_service_internal(struct vchiq_service *service);
extern void
vchiq_free_service_internal(struct vchiq_service *service);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance);
extern void
remote_event_pollall(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *offset, int size,
- void *userdata, VCHIQ_BULK_MODE_T mode,
- VCHIQ_BULK_DIR_T dir);
+ void *userdata, enum vchiq_bulk_mode mode,
+ enum vchiq_bulk_dir dir);
extern void
vchiq_dump_state(void *dump_context, struct vchiq_state *state);
@@ -580,7 +580,7 @@ unlock_service(struct vchiq_service *service);
/* The following functions are called from vchiq_core, and external
** implementations must be provided. */
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size,
int dir);
@@ -596,7 +596,7 @@ vchiq_platform_check_suspend(struct vchiq_state *state);
extern void
vchiq_platform_paused(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_platform_resume(struct vchiq_state *state);
extern void
@@ -615,10 +615,10 @@ extern void
vchiq_dump_platform_service_state(void *dump_context,
struct vchiq_service *service);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_use_service_internal(struct vchiq_service *service);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_release_service_internal(struct vchiq_service *service);
extern void
@@ -627,31 +627,31 @@ vchiq_on_remote_use(struct vchiq_state *state);
extern void
vchiq_on_remote_release(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_platform_init_state(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_check_service(struct vchiq_service *service);
extern void
vchiq_on_remote_use_active(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_send_remote_use(struct vchiq_state *state);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status
vchiq_send_remote_use_active(struct vchiq_state *state);
extern void
vchiq_platform_conn_state_changed(struct vchiq_state *state,
- VCHIQ_CONNSTATE_T oldstate,
- VCHIQ_CONNSTATE_T newstate);
+ enum vchiq_connstate oldstate,
+ enum vchiq_connstate newstate);
extern void
vchiq_platform_handle_timeout(struct vchiq_state *state);
extern void
-vchiq_set_conn_state(struct vchiq_state *state, VCHIQ_CONNSTATE_T newstate);
+vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate);
extern void
vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index f911612a6a54..f506858987b7 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -25,26 +25,26 @@ enum vchiq_reason {
VCHIQ_BULK_RECEIVE_ABORTED /* service, -, bulk_userdata */
};
-typedef enum {
+enum vchiq_status {
VCHIQ_ERROR = -1,
VCHIQ_SUCCESS = 0,
VCHIQ_RETRY = 1
-} VCHIQ_STATUS_T;
+};
-typedef enum {
+enum vchiq_bulk_mode {
VCHIQ_BULK_MODE_CALLBACK,
VCHIQ_BULK_MODE_BLOCKING,
VCHIQ_BULK_MODE_NOCALLBACK,
VCHIQ_BULK_MODE_WAITING /* Reserved for internal use */
-} VCHIQ_BULK_MODE_T;
+};
-typedef enum {
+enum vchiq_service_option {
VCHIQ_SERVICE_OPTION_AUTOCLOSE,
VCHIQ_SERVICE_OPTION_SLOT_QUOTA,
VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA,
VCHIQ_SERVICE_OPTION_SYNCHRONOUS,
VCHIQ_SERVICE_OPTION_TRACE
-} VCHIQ_SERVICE_OPTION_T;
+};
struct vchiq_header {
/* The message identifier - opaque to applications. */
@@ -63,9 +63,10 @@ struct vchiq_element {
typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
-typedef VCHIQ_STATUS_T (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
- struct vchiq_header *,
- VCHIQ_SERVICE_HANDLE_T, void *);
+typedef enum vchiq_status (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
+ struct vchiq_header *,
+ VCHIQ_SERVICE_HANDLE_T, void *);
+
struct vchiq_service_base {
int fourcc;
@@ -95,20 +96,20 @@ struct vchiq_config {
typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
-extern VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
-extern VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance);
-extern VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance);
-extern VCHIQ_STATUS_T vchiq_add_service(VCHIQ_INSTANCE_T instance,
+extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
+extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
+extern enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance);
+extern enum vchiq_status vchiq_add_service(VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
VCHIQ_SERVICE_HANDLE_T *pservice);
-extern VCHIQ_STATUS_T vchiq_open_service(VCHIQ_INSTANCE_T instance,
+extern enum vchiq_status vchiq_open_service(VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
VCHIQ_SERVICE_HANDLE_T *pservice);
-extern VCHIQ_STATUS_T vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);
-extern VCHIQ_STATUS_T vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);
-extern VCHIQ_STATUS_T vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
-extern VCHIQ_STATUS_T vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
-extern VCHIQ_STATUS_T
+extern enum vchiq_status vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);
+extern enum vchiq_status vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);
+extern enum vchiq_status vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
+extern enum vchiq_status vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
+extern enum vchiq_status
vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
ssize_t (*copy_callback)(void *context, void *dest,
size_t offset, size_t maxsize),
@@ -116,33 +117,33 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
size_t size);
extern void vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service,
struct vchiq_header *header);
-extern VCHIQ_STATUS_T vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
const void *data, unsigned int size, void *userdata,
- VCHIQ_BULK_MODE_T mode);
-extern VCHIQ_STATUS_T vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
+ enum vchiq_bulk_mode mode);
+extern enum vchiq_status vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
void *data, unsigned int size, void *userdata,
- VCHIQ_BULK_MODE_T mode);
-extern VCHIQ_STATUS_T vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service,
+ enum vchiq_bulk_mode mode);
+extern enum vchiq_status vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service,
const void *offset, unsigned int size,
- void *userdata, VCHIQ_BULK_MODE_T mode);
-extern VCHIQ_STATUS_T vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
+ void *userdata, enum vchiq_bulk_mode mode);
+extern enum vchiq_status vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
void *offset, unsigned int size, void *userdata,
- VCHIQ_BULK_MODE_T mode);
+ enum vchiq_bulk_mode mode);
extern int vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T service);
extern void *vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T service);
extern int vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T service);
extern void vchiq_get_config(struct vchiq_config *config);
-extern VCHIQ_STATUS_T vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,
- VCHIQ_SERVICE_OPTION_T option, int value);
+extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,
+ enum vchiq_service_option option, int value);
-extern VCHIQ_STATUS_T vchiq_remote_use(VCHIQ_INSTANCE_T instance,
- VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
-extern VCHIQ_STATUS_T vchiq_remote_release(VCHIQ_INSTANCE_T instance);
+extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
+ VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
+extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
-extern VCHIQ_STATUS_T vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
void *ptr, size_t num_bytes);
-extern VCHIQ_STATUS_T vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle,
+extern enum vchiq_status vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle,
short *peer_version);
#endif /* VCHIQ_IF_H */
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
index c2343a1a3a6a..202889b3774f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -28,7 +28,7 @@ struct vchiq_queue_bulk_transfer {
void *data;
unsigned int size;
void *userdata;
- VCHIQ_BULK_MODE_T mode;
+ enum vchiq_bulk_mode mode;
};
struct vchiq_completion_data {
@@ -60,7 +60,7 @@ struct vchiq_get_config {
struct vchiq_set_service_option {
unsigned int handle;
- VCHIQ_SERVICE_OPTION_T option;
+ enum vchiq_service_option option;
int value;
};
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index 781c2916c5b8..e247ed1d3037 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -104,7 +104,7 @@ int32_t vchi_msg_queue(struct vchi_service_handle *handle,
void *context, uint32_t data_size)
{
struct shim_service *service = (struct shim_service *)handle;
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
while (1) {
status = vchiq_queue_message(service->handle,
@@ -200,8 +200,8 @@ int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle, void *data_d
void *bulk_handle)
{
struct shim_service *service = (struct shim_service *)handle;
- VCHIQ_BULK_MODE_T mode;
- VCHIQ_STATUS_T status;
+ enum vchiq_bulk_mode mode;
+ enum vchiq_status status;
switch ((int)flags) {
case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
@@ -260,8 +260,8 @@ int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle,
void *bulk_handle)
{
struct shim_service *service = (struct shim_service *)handle;
- VCHIQ_BULK_MODE_T mode;
- VCHIQ_STATUS_T status;
+ enum vchiq_bulk_mode mode;
+ enum vchiq_status status;
switch ((int)flags) {
case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
@@ -363,7 +363,7 @@ int32_t vchi_held_msg_release(struct vchi_held_msg *message)
* to a pointer.
*/
- vchiq_release_message((VCHIQ_SERVICE_HANDLE_T)(long)message->service,
+ vchiq_release_message((unsigned int)(long)message->service,
(struct vchiq_header *)message->message);
return 0;
@@ -438,7 +438,7 @@ EXPORT_SYMBOL(vchi_msg_hold);
int32_t vchi_initialise(struct vchi_instance_handle **instance_handle)
{
VCHIQ_INSTANCE_T instance;
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
status = vchiq_initialise(&instance);
@@ -500,7 +500,7 @@ EXPORT_SYMBOL(vchi_disconnect);
*
***********************************************************/
-static VCHIQ_STATUS_T shim_callback(enum vchiq_reason reason,
+static enum vchiq_status shim_callback(enum vchiq_reason reason,
struct vchiq_header *header,
VCHIQ_SERVICE_HANDLE_T handle,
void *bulk_user)
@@ -601,7 +601,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,
if (service) {
struct vchiq_service_params params;
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
memset(¶ms, 0, sizeof(params));
params.fourcc = setup->service_id;
@@ -629,7 +629,7 @@ int32_t vchi_service_close(const struct vchi_service_handle *handle)
struct shim_service *service = (struct shim_service *)handle;
if (service) {
- VCHIQ_STATUS_T status = vchiq_close_service(service->handle);
+ enum vchiq_status status = vchiq_close_service(service->handle);
if (status == VCHIQ_SUCCESS)
service_free(service);
@@ -645,7 +645,7 @@ int32_t vchi_service_destroy(const struct vchi_service_handle *handle)
struct shim_service *service = (struct shim_service *)handle;
if (service) {
- VCHIQ_STATUS_T status = vchiq_remove_service(service->handle);
+ enum vchiq_status status = vchiq_remove_service(service->handle);
if (status == VCHIQ_SUCCESS) {
service_free(service);
@@ -664,7 +664,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle,
{
int32_t ret = -1;
struct shim_service *service = (struct shim_service *)handle;
- VCHIQ_SERVICE_OPTION_T vchiq_option;
+ enum vchiq_service_option vchiq_option;
switch (option) {
case VCHI_SERVICE_OPTION_TRACE:
@@ -678,7 +678,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle,
break;
}
if (service) {
- VCHIQ_STATUS_T status =
+ enum vchiq_status status =
vchiq_set_service_option(service->handle,
vchiq_option,
value);
@@ -696,7 +696,7 @@ int32_t vchi_get_peer_version(const struct vchi_service_handle *handle,
struct shim_service *service = (struct shim_service *)handle;
if (service) {
- VCHIQ_STATUS_T status;
+ enum vchiq_status status;
status = vchiq_get_peer_version(service->handle, peer_version);
ret = vchiq_status_to_vchi(status);
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 05/10] staging: vc04_services: Rename userdata callback
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
` (3 preceding siblings ...)
2019-11-03 4:37 ` [PATCH v5 04/10] staging: vc04_services: Remove vchiq_arm enum typedefs Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 06/10] staging: vc04_services: Renames vchiq callback Jamal Shareef
` (4 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Renames userdata callback function pointer. Name was too wordy.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../vc04_services/interface/vchiq_arm/vchiq_core.h | 7 ++++---
.../staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 9 ++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index d33d6bd96617..af830dccc20c 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -207,7 +207,8 @@ enum vchiq_bulk_dir {
VCHIQ_BULK_RECEIVE
};
-typedef void (*VCHIQ_USERDATA_TERM_T)(void *userdata);
+typedef void (*vchiq_userdata_term)(void *userdata);
+
struct vchiq_bulk {
short mode;
@@ -253,7 +254,7 @@ struct vchiq_service {
VCHIQ_SERVICE_HANDLE_T handle;
unsigned int ref_count;
int srvstate;
- VCHIQ_USERDATA_TERM_T userdata_term;
+ vchiq_userdata_term userdata_term;
unsigned int localport;
unsigned int remoteport;
int public_fourcc;
@@ -501,7 +502,7 @@ extern struct vchiq_service *
vchiq_add_service_internal(struct vchiq_state *state,
const struct vchiq_service_params *params,
int srvstate, VCHIQ_INSTANCE_T instance,
- VCHIQ_USERDATA_TERM_T userdata_term);
+ vchiq_userdata_term userdata_term);
extern enum vchiq_status
vchiq_open_service_internal(struct vchiq_service *service, int client_id);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index f506858987b7..7ad3db3bf096 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -63,11 +63,10 @@ struct vchiq_element {
typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
-typedef enum vchiq_status (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
- struct vchiq_header *,
- VCHIQ_SERVICE_HANDLE_T, void *);
-
+typedef enum vchiq_status (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
+ struct vchiq_header *,
+ VCHIQ_SERVICE_HANDLE_T, void *);
struct vchiq_service_base {
int fourcc;
VCHIQ_CALLBACK_T callback;
@@ -137,7 +136,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service
enum vchiq_service_option option, int value);
extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
- VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
+ VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 06/10] staging: vc04_services: Renames vchiq callback
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
` (4 preceding siblings ...)
2019-11-03 4:37 ` [PATCH v5 05/10] staging: vc04_services: Rename userdata callback Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 07/10] staging: vc04_services: Renames remote use callback Jamal Shareef
` (3 subsequent siblings)
9 siblings, 0 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Renames vchiq callback function. Original does not match kernel code
style.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index 7ad3db3bf096..6f3d3b00066d 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -64,18 +64,18 @@ struct vchiq_element {
typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
-typedef enum vchiq_status (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
+typedef enum vchiq_status (*vchiq_callback)(enum vchiq_reason,
struct vchiq_header *,
VCHIQ_SERVICE_HANDLE_T, void *);
struct vchiq_service_base {
int fourcc;
- VCHIQ_CALLBACK_T callback;
+ vchiq_callback callback;
void *userdata;
};
struct vchiq_service_params {
int fourcc;
- VCHIQ_CALLBACK_T callback;
+ vchiq_callback callback;
void *userdata;
short version; /* Increment for non-trivial changes */
short version_min; /* Update for incompatible changes */
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 07/10] staging: vc04_services: Renames remote use callback
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
` (5 preceding siblings ...)
2019-11-03 4:37 ` [PATCH v5 06/10] staging: vc04_services: Renames vchiq callback Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 7:45 ` [Outreachy kernel] " Julia Lawall
2019-11-03 4:37 ` [PATCH v5 08/10] staging: vc04_services: Remove int typedef Jamal Shareef
` (2 subsequent siblings)
9 siblings, 1 reply; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Renames remote use callback function pointer to match kernel style.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index 6f3d3b00066d..869ca218c515 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -93,7 +93,7 @@ struct vchiq_config {
};
typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
-typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
+typedef void (*vchiq_remote_callback)(void *cb_arg);
extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
@@ -136,7 +136,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service
enum vchiq_service_option option, int value);
extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
- VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
+ vchiq_remote_callback callback, void *cb_arg);
extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 08/10] staging: vc04_services: Remove int typedef
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
` (6 preceding siblings ...)
2019-11-03 4:37 ` [PATCH v5 07/10] staging: vc04_services: Renames remote use callback Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 09/10] staging: vc04_services: Remove vchiq instance typedefs Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 10/10] staging: vc04_services: Removes platform struct typedef Jamal Shareef
9 siblings, 0 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Removes unsigned int typedef. Issue found by checkpatch.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../interface/vchiq_arm/vchiq_arm.c | 40 +++++++++---------
.../interface/vchiq_arm/vchiq_arm.h | 4 +-
.../interface/vchiq_arm/vchiq_core.c | 28 ++++++-------
.../interface/vchiq_arm/vchiq_core.h | 12 +++---
.../interface/vchiq_arm/vchiq_if.h | 41 +++++++++----------
.../interface/vchiq_arm/vchiq_shim.c | 8 ++--
6 files changed, 65 insertions(+), 68 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 0c615099b067..1581e9a858d5 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -173,7 +173,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==
(VCHIQ_IOC_MAX + 1));
static enum vchiq_status
-vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
+vchiq_blocking_bulk_transfer(unsigned int handle, void *data,
unsigned int size, enum vchiq_bulk_dir dir);
#define VCHIQ_INIT_RETRIES 10
@@ -304,7 +304,7 @@ EXPORT_SYMBOL(vchiq_connect);
enum vchiq_status vchiq_add_service(
VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
- VCHIQ_SERVICE_HANDLE_T *phandle)
+ unsigned int *phandle)
{
enum vchiq_status status;
struct vchiq_state *state = instance->state;
@@ -343,7 +343,7 @@ EXPORT_SYMBOL(vchiq_add_service);
enum vchiq_status vchiq_open_service(
VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
- VCHIQ_SERVICE_HANDLE_T *phandle)
+ unsigned int *phandle)
{
enum vchiq_status status = VCHIQ_ERROR;
struct vchiq_state *state = instance->state;
@@ -381,7 +381,7 @@ enum vchiq_status vchiq_open_service(
EXPORT_SYMBOL(vchiq_open_service);
enum vchiq_status
-vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,
+vchiq_bulk_transmit(unsigned int handle, const void *data,
unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
{
enum vchiq_status status;
@@ -406,7 +406,7 @@ vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,
EXPORT_SYMBOL(vchiq_bulk_transmit);
enum vchiq_status
-vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,
+vchiq_bulk_receive(unsigned int handle, void *data,
unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
{
enum vchiq_status status;
@@ -430,7 +430,7 @@ vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,
EXPORT_SYMBOL(vchiq_bulk_receive);
static enum vchiq_status
-vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
+vchiq_blocking_bulk_transfer(unsigned int handle, void *data,
unsigned int size, enum vchiq_bulk_dir dir)
{
VCHIQ_INSTANCE_T instance;
@@ -584,7 +584,7 @@ add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,
static enum vchiq_status
service_callback(enum vchiq_reason reason, struct vchiq_header *header,
- VCHIQ_SERVICE_HANDLE_T handle, void *bulk_userdata)
+ unsigned int handle, void *bulk_userdata)
{
/* How do we ensure the callback goes to the right client?
** The service_user data points to a user_service record
@@ -773,7 +773,7 @@ static ssize_t vchiq_ioc_copy_element_data(void *context, void *dest,
*
**************************************************************************/
static enum vchiq_status
-vchiq_ioc_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
+vchiq_ioc_queue_message(unsigned int handle,
struct vchiq_element *elements,
unsigned long count)
{
@@ -952,7 +952,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case VCHIQ_IOC_CLOSE_SERVICE:
case VCHIQ_IOC_REMOVE_SERVICE: {
- VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
+ unsigned int handle = (unsigned int)arg;
struct user_service *user_service;
service = find_service_for_instance(instance, handle);
@@ -985,7 +985,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
case VCHIQ_IOC_USE_SERVICE:
case VCHIQ_IOC_RELEASE_SERVICE: {
- VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
+ unsigned int handle = (unsigned int)arg;
service = find_service_for_instance(instance, handle);
if (service) {
@@ -1368,7 +1368,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} break;
case VCHIQ_IOC_GET_CLIENT_ID: {
- VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
+ unsigned int handle = (unsigned int)arg;
ret = vchiq_get_client_id(handle);
} break;
@@ -1423,7 +1423,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
} break;
case VCHIQ_IOC_CLOSE_DELIVERED: {
- VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
+ unsigned int handle = (unsigned int)arg;
service = find_closed_service_for_instance(instance, handle);
if (service) {
@@ -1484,7 +1484,7 @@ struct vchiq_create_service32 {
struct vchiq_service_params32 params;
int is_open;
int is_vchi;
- VCHIQ_SERVICE_HANDLE_T handle; /* OUT */
+ unsigned int handle; /* OUT */
};
#define VCHIQ_IOC_CREATE_SERVICE32 \
@@ -1544,7 +1544,7 @@ struct vchiq_element32 {
};
struct vchiq_queue_message32 {
- VCHIQ_SERVICE_HANDLE_T handle;
+ unsigned int handle;
unsigned int count;
compat_uptr_t elements;
};
@@ -1607,7 +1607,7 @@ vchiq_compat_ioctl_queue_message(struct file *file,
}
struct vchiq_queue_bulk_transfer32 {
- VCHIQ_SERVICE_HANDLE_T handle;
+ unsigned int handle;
compat_uptr_t data;
unsigned int size;
compat_uptr_t userdata;
@@ -1824,7 +1824,7 @@ vchiq_compat_ioctl_await_completion(struct file *file,
}
struct vchiq_dequeue_message32 {
- VCHIQ_SERVICE_HANDLE_T handle;
+ unsigned int handle;
int blocking;
unsigned int bufsize;
compat_uptr_t buf;
@@ -2273,7 +2273,7 @@ vchiq_videocore_wanted(struct vchiq_state *state)
static enum vchiq_status
vchiq_keepalive_vchiq_callback(enum vchiq_reason reason,
struct vchiq_header *header,
- VCHIQ_SERVICE_HANDLE_T service_user,
+ unsigned int service_user,
void *bulk_user)
{
vchiq_log_error(vchiq_susp_log_level,
@@ -2289,7 +2289,7 @@ vchiq_keepalive_thread_func(void *v)
enum vchiq_status status;
VCHIQ_INSTANCE_T instance;
- VCHIQ_SERVICE_HANDLE_T ka_handle;
+ unsigned int ka_handle;
struct vchiq_service_params params = {
.fourcc = VCHIQ_MAKE_FOURCC('K', 'E', 'E', 'P'),
@@ -2970,7 +2970,7 @@ static void suspend_timer_callback(struct timer_list *t)
}
enum vchiq_status
-vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
+vchiq_use_service(unsigned int handle)
{
enum vchiq_status ret = VCHIQ_ERROR;
struct vchiq_service *service = find_service_by_handle(handle);
@@ -2984,7 +2984,7 @@ vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
}
enum vchiq_status
-vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle)
+vchiq_release_service(unsigned int handle)
{
enum vchiq_status ret = VCHIQ_ERROR;
struct vchiq_service *service = find_service_by_handle(handle);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index ebab08b567fa..229dd262ec7d 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -125,10 +125,10 @@ vchiq_check_resume(struct vchiq_state *state);
extern void
vchiq_check_suspend(struct vchiq_state *state);
enum vchiq_status
-vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle);
+vchiq_use_service(unsigned int handle);
extern enum vchiq_status
-vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle);
+vchiq_release_service(unsigned int handle);
extern enum vchiq_status
vchiq_check_service(struct vchiq_service *service);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 6e4ad0929ba3..95e892d45242 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -59,7 +59,7 @@ DEFINE_SPINLOCK(bulk_waiter_spinlock);
static DEFINE_SPINLOCK(quota_spinlock);
struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES];
-static VCHIQ_SERVICE_HANDLE_T handle_seq;
+static unsigned int handle_seq;
static const char *const srvstate_names[] = {
"FREE",
@@ -132,7 +132,7 @@ vchiq_set_service_state(struct vchiq_service *service, int newstate)
}
struct vchiq_service *
-find_service_by_handle(VCHIQ_SERVICE_HANDLE_T handle)
+find_service_by_handle(unsigned int handle)
{
struct vchiq_service *service;
@@ -178,7 +178,7 @@ find_service_by_port(struct vchiq_state *state, int localport)
struct vchiq_service *
find_service_for_instance(VCHIQ_INSTANCE_T instance,
- VCHIQ_SERVICE_HANDLE_T handle)
+ unsigned int handle)
{
struct vchiq_service *service;
@@ -202,7 +202,7 @@ find_service_for_instance(VCHIQ_INSTANCE_T instance,
struct vchiq_service *
find_closed_service_for_instance(VCHIQ_INSTANCE_T instance,
- VCHIQ_SERVICE_HANDLE_T handle)
+ unsigned int handle)
{
struct vchiq_service *service;
@@ -295,7 +295,7 @@ unlock_service(struct vchiq_service *service)
}
int
-vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T handle)
+vchiq_get_client_id(unsigned int handle)
{
struct vchiq_service *service = find_service_by_handle(handle);
int id;
@@ -308,7 +308,7 @@ vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T handle)
}
void *
-vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T handle)
+vchiq_get_service_userdata(unsigned int handle)
{
struct vchiq_service *service = handle_to_service(handle);
@@ -316,7 +316,7 @@ vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T handle)
}
int
-vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T handle)
+vchiq_get_service_fourcc(unsigned int handle)
{
struct vchiq_service *service = handle_to_service(handle);
@@ -2828,7 +2828,7 @@ vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
}
enum vchiq_status
-vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
+vchiq_close_service(unsigned int handle)
{
/* Unregister the service */
struct vchiq_service *service = find_service_by_handle(handle);
@@ -2887,7 +2887,7 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
}
enum vchiq_status
-vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
+vchiq_remove_service(unsigned int handle)
{
/* Unregister the service */
struct vchiq_service *service = find_service_by_handle(handle);
@@ -2952,7 +2952,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
* When called in blocking mode, the userdata field points to a bulk_waiter
* structure.
*/
-enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
+enum vchiq_status vchiq_bulk_transfer(unsigned int handle,
void *offset, int size, void *userdata,
enum vchiq_bulk_mode mode,
enum vchiq_bulk_dir dir)
@@ -3101,7 +3101,7 @@ enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
}
enum vchiq_status
-vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
+vchiq_queue_message(unsigned int handle,
ssize_t (*copy_callback)(void *context, void *dest,
size_t offset, size_t maxsize),
void *context,
@@ -3153,7 +3153,7 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
}
void
-vchiq_release_message(VCHIQ_SERVICE_HANDLE_T handle,
+vchiq_release_message(unsigned int handle,
struct vchiq_header *header)
{
struct vchiq_service *service = find_service_by_handle(handle);
@@ -3193,7 +3193,7 @@ release_message_sync(struct vchiq_state *state, struct vchiq_header *header)
}
enum vchiq_status
-vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle, short *peer_version)
+vchiq_get_peer_version(unsigned int handle, short *peer_version)
{
enum vchiq_status status = VCHIQ_ERROR;
struct vchiq_service *service = find_service_by_handle(handle);
@@ -3222,7 +3222,7 @@ void vchiq_get_config(struct vchiq_config *config)
}
enum vchiq_status
-vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T handle,
+vchiq_set_service_option(unsigned int handle,
enum vchiq_service_option option, int value)
{
struct vchiq_service *service = find_service_by_handle(handle);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index af830dccc20c..21c56a1b9b52 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -251,7 +251,7 @@ struct vchiq_slot_info {
struct vchiq_service {
struct vchiq_service_base base;
- VCHIQ_SERVICE_HANDLE_T handle;
+ unsigned int handle;
unsigned int ref_count;
int srvstate;
vchiq_userdata_term userdata_term;
@@ -523,7 +523,7 @@ extern void
remote_event_pollall(struct vchiq_state *state);
extern enum vchiq_status
-vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *offset, int size,
+vchiq_bulk_transfer(unsigned int handle, void *offset, int size,
void *userdata, enum vchiq_bulk_mode mode,
enum vchiq_bulk_dir dir);
@@ -544,7 +544,7 @@ request_poll(struct vchiq_state *state, struct vchiq_service *service,
int poll_type);
static inline struct vchiq_service *
-handle_to_service(VCHIQ_SERVICE_HANDLE_T handle)
+handle_to_service(unsigned int handle)
{
struct vchiq_state *state = vchiq_states[(handle / VCHIQ_MAX_SERVICES) &
(VCHIQ_MAX_STATES - 1)];
@@ -555,18 +555,18 @@ handle_to_service(VCHIQ_SERVICE_HANDLE_T handle)
}
extern struct vchiq_service *
-find_service_by_handle(VCHIQ_SERVICE_HANDLE_T handle);
+find_service_by_handle(unsigned int handle);
extern struct vchiq_service *
find_service_by_port(struct vchiq_state *state, int localport);
extern struct vchiq_service *
find_service_for_instance(VCHIQ_INSTANCE_T instance,
- VCHIQ_SERVICE_HANDLE_T handle);
+ unsigned int handle);
extern struct vchiq_service *
find_closed_service_for_instance(VCHIQ_INSTANCE_T instance,
- VCHIQ_SERVICE_HANDLE_T handle);
+ unsigned int handle);
extern struct vchiq_service *
next_service_by_instance(struct vchiq_state *state, VCHIQ_INSTANCE_T instance,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index 869ca218c515..7f6b8637b42a 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -61,12 +61,9 @@ struct vchiq_element {
unsigned int size;
};
-typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
-
-
typedef enum vchiq_status (*vchiq_callback)(enum vchiq_reason,
struct vchiq_header *,
- VCHIQ_SERVICE_HANDLE_T, void *);
+ unsigned int, void *);
struct vchiq_service_base {
int fourcc;
vchiq_callback callback;
@@ -100,49 +97,49 @@ extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
extern enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance);
extern enum vchiq_status vchiq_add_service(VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
- VCHIQ_SERVICE_HANDLE_T *pservice);
+ unsigned int *pservice);
extern enum vchiq_status vchiq_open_service(VCHIQ_INSTANCE_T instance,
const struct vchiq_service_params *params,
- VCHIQ_SERVICE_HANDLE_T *pservice);
-extern enum vchiq_status vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);
-extern enum vchiq_status vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);
-extern enum vchiq_status vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
-extern enum vchiq_status vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
+ unsigned int *pservice);
+extern enum vchiq_status vchiq_close_service(unsigned int service);
+extern enum vchiq_status vchiq_remove_service(unsigned int service);
+extern enum vchiq_status vchiq_use_service(unsigned int service);
+extern enum vchiq_status vchiq_release_service(unsigned int service);
extern enum vchiq_status
-vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
+vchiq_queue_message(unsigned int handle,
ssize_t (*copy_callback)(void *context, void *dest,
size_t offset, size_t maxsize),
void *context,
size_t size);
-extern void vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service,
+extern void vchiq_release_message(unsigned int service,
struct vchiq_header *header);
-extern enum vchiq_status vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_bulk_transmit(unsigned int service,
const void *data, unsigned int size, void *userdata,
enum vchiq_bulk_mode mode);
-extern enum vchiq_status vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_bulk_receive(unsigned int service,
void *data, unsigned int size, void *userdata,
enum vchiq_bulk_mode mode);
-extern enum vchiq_status vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_bulk_transmit_handle(unsigned int service,
const void *offset, unsigned int size,
void *userdata, enum vchiq_bulk_mode mode);
-extern enum vchiq_status vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_bulk_receive_handle(unsigned int service,
void *offset, unsigned int size, void *userdata,
enum vchiq_bulk_mode mode);
-extern int vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T service);
-extern void *vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T service);
-extern int vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T service);
+extern int vchiq_get_client_id(unsigned int service);
+extern void *vchiq_get_service_userdata(unsigned int service);
+extern int vchiq_get_service_fourcc(unsigned int service);
extern void vchiq_get_config(struct vchiq_config *config);
-extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_set_service_option(unsigned int service,
enum vchiq_service_option option, int value);
extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
vchiq_remote_callback callback, void *cb_arg);
extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
-extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
+extern enum vchiq_status vchiq_dump_phys_mem(unsigned int service,
void *ptr, size_t num_bytes);
-extern enum vchiq_status vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle,
+extern enum vchiq_status vchiq_get_peer_version(unsigned int handle,
short *peer_version);
#endif /* VCHIQ_IF_H */
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index e247ed1d3037..e14e59125f75 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -12,7 +12,7 @@
#define vchiq_status_to_vchi(status) ((int32_t)status)
struct shim_service {
- VCHIQ_SERVICE_HANDLE_T handle;
+ unsigned int handle;
struct vchiu_queue queue;
vchi_callback callback;
@@ -357,7 +357,7 @@ int32_t vchi_held_msg_release(struct vchi_held_msg *message)
{
/*
* Convert the service field pointer back to an
- * VCHIQ_SERVICE_HANDLE_T which is an int.
+ * unsigned int which is an int.
* This pointer is opaque to everything except
* vchi_msg_hold which simply upcasted the int
* to a pointer.
@@ -407,7 +407,7 @@ int32_t vchi_msg_hold(struct vchi_service_handle *handle, void **data,
*msg_size = header->size;
/*
- * upcast the VCHIQ_SERVICE_HANDLE_T which is an int
+ * upcast the unsigned int which is an int
* to a pointer and stuff it in the held message.
* This pointer is opaque to everything except
* vchi_held_msg_release which simply downcasts it back
@@ -502,7 +502,7 @@ EXPORT_SYMBOL(vchi_disconnect);
static enum vchiq_status shim_callback(enum vchiq_reason reason,
struct vchiq_header *header,
- VCHIQ_SERVICE_HANDLE_T handle,
+ unsigned int handle,
void *bulk_user)
{
struct shim_service *service =
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 09/10] staging: vc04_services: Remove vchiq instance typedefs
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
` (7 preceding siblings ...)
2019-11-03 4:37 ` [PATCH v5 08/10] staging: vc04_services: Remove int typedef Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 10/10] staging: vc04_services: Removes platform struct typedef Jamal Shareef
9 siblings, 0 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Removes struct vchiq instance struct typedefs. Issue found by checkpatch.
Additionally, renames "struct vchiq_instance_struct" due to wordiness.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../interface/vchiq_arm/vchiq_arm.c | 46 +++++++++----------
.../interface/vchiq_arm/vchiq_arm.h | 10 ++--
.../interface/vchiq_arm/vchiq_core.c | 12 ++---
.../interface/vchiq_arm/vchiq_core.h | 16 +++----
.../interface/vchiq_arm/vchiq_debugfs.c | 14 +++---
.../interface/vchiq_arm/vchiq_debugfs.h | 4 +-
.../interface/vchiq_arm/vchiq_if.h | 18 ++++----
.../interface/vchiq_arm/vchiq_shim.c | 10 ++--
8 files changed, 66 insertions(+), 64 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 1581e9a858d5..bbc51d2a6c6d 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -84,7 +84,7 @@ static void suspend_timer_callback(struct timer_list *t);
struct user_service {
struct vchiq_service *service;
void *userdata;
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
char is_vchi;
char dequeue_pending;
char close_pending;
@@ -103,7 +103,7 @@ struct bulk_waiter_node {
struct list_head list;
};
-struct vchiq_instance_struct {
+struct vchiq_instance {
struct vchiq_state *state;
struct vchiq_completion_data completions[MAX_COMPLETIONS];
int completion_insert;
@@ -177,11 +177,11 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,
unsigned int size, enum vchiq_bulk_dir dir);
#define VCHIQ_INIT_RETRIES 10
-enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
+enum vchiq_status vchiq_initialise(struct vchiq_instance **instance_out)
{
enum vchiq_status status = VCHIQ_ERROR;
struct vchiq_state *state;
- VCHIQ_INSTANCE_T instance = NULL;
+ struct vchiq_instance *instance = NULL;
int i;
vchiq_log_trace(vchiq_core_log_level, "%s called", __func__);
@@ -230,7 +230,7 @@ enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
}
EXPORT_SYMBOL(vchiq_initialise);
-enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance)
+enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance)
{
enum vchiq_status status;
struct vchiq_state *state = instance->state;
@@ -267,12 +267,12 @@ enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance)
}
EXPORT_SYMBOL(vchiq_shutdown);
-static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
+static int vchiq_is_connected(struct vchiq_instance *instance)
{
return instance->connected;
}
-enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance)
+enum vchiq_status vchiq_connect(struct vchiq_instance *instance)
{
enum vchiq_status status;
struct vchiq_state *state = instance->state;
@@ -302,7 +302,7 @@ enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance)
EXPORT_SYMBOL(vchiq_connect);
enum vchiq_status vchiq_add_service(
- VCHIQ_INSTANCE_T instance,
+ struct vchiq_instance *instance,
const struct vchiq_service_params *params,
unsigned int *phandle)
{
@@ -341,7 +341,7 @@ enum vchiq_status vchiq_add_service(
EXPORT_SYMBOL(vchiq_add_service);
enum vchiq_status vchiq_open_service(
- VCHIQ_INSTANCE_T instance,
+ struct vchiq_instance *instance,
const struct vchiq_service_params *params,
unsigned int *phandle)
{
@@ -433,7 +433,7 @@ static enum vchiq_status
vchiq_blocking_bulk_transfer(unsigned int handle, void *data,
unsigned int size, enum vchiq_bulk_dir dir)
{
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
struct vchiq_service *service;
enum vchiq_status status;
struct bulk_waiter_node *waiter = NULL;
@@ -516,7 +516,7 @@ vchiq_blocking_bulk_transfer(unsigned int handle, void *data,
***************************************************************************/
static enum vchiq_status
-add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,
+add_completion(struct vchiq_instance *instance, enum vchiq_reason reason,
struct vchiq_header *header, struct user_service *user_service,
void *bulk_userdata)
{
@@ -593,7 +593,7 @@ service_callback(enum vchiq_reason reason, struct vchiq_header *header,
*/
struct user_service *user_service;
struct vchiq_service *service;
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
bool skip_completion = false;
DEBUG_INITIALISE(g_state.local)
@@ -804,7 +804,7 @@ vchiq_ioc_queue_message(unsigned int handle,
static long
vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
- VCHIQ_INSTANCE_T instance = file->private_data;
+ struct vchiq_instance *instance = file->private_data;
enum vchiq_status status = VCHIQ_SUCCESS;
struct vchiq_service *service = NULL;
long ret = 0;
@@ -1919,7 +1919,7 @@ vchiq_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static int vchiq_open(struct inode *inode, struct file *file)
{
struct vchiq_state *state = vchiq_get_state();
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
vchiq_log_info(vchiq_arm_log_level, "vchiq_open");
@@ -1951,7 +1951,7 @@ static int vchiq_open(struct inode *inode, struct file *file)
static int vchiq_release(struct inode *inode, struct file *file)
{
- VCHIQ_INSTANCE_T instance = file->private_data;
+ struct vchiq_instance *instance = file->private_data;
struct vchiq_state *state = vchiq_get_state();
struct vchiq_service *service;
int ret = 0;
@@ -2130,7 +2130,7 @@ vchiq_dump_platform_instances(void *dump_context)
for (i = 0; i < state->unused_service; i++) {
struct vchiq_service *service = state->services[i];
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
if (service && (service->base.callback == service_callback)) {
instance = service->instance;
@@ -2141,7 +2141,7 @@ vchiq_dump_platform_instances(void *dump_context)
for (i = 0; i < state->unused_service; i++) {
struct vchiq_service *service = state->services[i];
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
if (service && (service->base.callback == service_callback)) {
instance = service->instance;
@@ -2288,7 +2288,7 @@ vchiq_keepalive_thread_func(void *v)
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
enum vchiq_status status;
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
unsigned int ka_handle;
struct vchiq_service_params params = {
@@ -2911,13 +2911,13 @@ vchiq_release_service_internal(struct vchiq_service *service)
}
struct vchiq_debugfs_node *
-vchiq_instance_get_debugfs_node(VCHIQ_INSTANCE_T instance)
+vchiq_instance_get_debugfs_node(struct vchiq_instance *instance)
{
return &instance->debugfs_node;
}
int
-vchiq_instance_get_use_count(VCHIQ_INSTANCE_T instance)
+vchiq_instance_get_use_count(struct vchiq_instance *instance)
{
struct vchiq_service *service;
int use_count = 0, i;
@@ -2932,19 +2932,19 @@ vchiq_instance_get_use_count(VCHIQ_INSTANCE_T instance)
}
int
-vchiq_instance_get_pid(VCHIQ_INSTANCE_T instance)
+vchiq_instance_get_pid(struct vchiq_instance *instance)
{
return instance->pid;
}
int
-vchiq_instance_get_trace(VCHIQ_INSTANCE_T instance)
+vchiq_instance_get_trace(struct vchiq_instance *instance)
{
return instance->trace;
}
void
-vchiq_instance_set_trace(VCHIQ_INSTANCE_T instance, int trace)
+vchiq_instance_set_trace(struct vchiq_instance *instance, int trace)
{
struct vchiq_service *service;
int i;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index 229dd262ec7d..19d2a2eefb6a 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -162,19 +162,19 @@ vchiq_release_internal(struct vchiq_state *state,
struct vchiq_service *service);
extern struct vchiq_debugfs_node *
-vchiq_instance_get_debugfs_node(VCHIQ_INSTANCE_T instance);
+vchiq_instance_get_debugfs_node(struct vchiq_instance *instance);
extern int
-vchiq_instance_get_use_count(VCHIQ_INSTANCE_T instance);
+vchiq_instance_get_use_count(struct vchiq_instance *instance);
extern int
-vchiq_instance_get_pid(VCHIQ_INSTANCE_T instance);
+vchiq_instance_get_pid(struct vchiq_instance *instance);
extern int
-vchiq_instance_get_trace(VCHIQ_INSTANCE_T instance);
+vchiq_instance_get_trace(struct vchiq_instance *instance);
extern void
-vchiq_instance_set_trace(VCHIQ_INSTANCE_T instance, int trace);
+vchiq_instance_set_trace(struct vchiq_instance *instance, int trace);
extern void
set_suspend_state(struct vchiq_arm_state *arm_state,
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 95e892d45242..a5a68dcc5477 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -177,7 +177,7 @@ find_service_by_port(struct vchiq_state *state, int localport)
}
struct vchiq_service *
-find_service_for_instance(VCHIQ_INSTANCE_T instance,
+find_service_for_instance(struct vchiq_instance *instance,
unsigned int handle)
{
struct vchiq_service *service;
@@ -201,7 +201,7 @@ find_service_for_instance(VCHIQ_INSTANCE_T instance,
}
struct vchiq_service *
-find_closed_service_for_instance(VCHIQ_INSTANCE_T instance,
+find_closed_service_for_instance(struct vchiq_instance *instance,
unsigned int handle)
{
struct vchiq_service *service;
@@ -227,7 +227,7 @@ find_closed_service_for_instance(VCHIQ_INSTANCE_T instance,
}
struct vchiq_service *
-next_service_by_instance(struct vchiq_state *state, VCHIQ_INSTANCE_T instance,
+next_service_by_instance(struct vchiq_state *state, struct vchiq_instance *instance,
int *pidx)
{
struct vchiq_service *service = NULL;
@@ -2280,7 +2280,7 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)
struct vchiq_service *
vchiq_add_service_internal(struct vchiq_state *state,
const struct vchiq_service_params *params,
- int srvstate, VCHIQ_INSTANCE_T instance,
+ int srvstate, struct vchiq_instance *instance,
void (*userdata_term)(void *userdata))
{
struct vchiq_service *service;
@@ -2775,7 +2775,7 @@ vchiq_free_service_internal(struct vchiq_service *service)
}
enum vchiq_status
-vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
+vchiq_connect_internal(struct vchiq_state *state, struct vchiq_instance *instance)
{
struct vchiq_service *service;
int i;
@@ -2811,7 +2811,7 @@ vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
}
enum vchiq_status
-vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
+vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instance)
{
struct vchiq_service *service;
int i;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index 21c56a1b9b52..5bc5c816bd1c 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -269,7 +269,7 @@ struct vchiq_service {
short peer_version;
struct vchiq_state *state;
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
int service_use_count;
@@ -383,7 +383,7 @@ struct vchiq_state {
/* Mutex protecting services */
struct mutex mutex;
- VCHIQ_INSTANCE_T *instance;
+ struct vchiq_instance **instance;
/* Processes incoming messages */
struct task_struct *slot_handler_thread;
@@ -496,12 +496,12 @@ extern enum vchiq_status
vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero);
extern enum vchiq_status
-vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance);
+vchiq_connect_internal(struct vchiq_state *state, struct vchiq_instance *instance);
extern struct vchiq_service *
vchiq_add_service_internal(struct vchiq_state *state,
const struct vchiq_service_params *params,
- int srvstate, VCHIQ_INSTANCE_T instance,
+ int srvstate, struct vchiq_instance *instance,
vchiq_userdata_term userdata_term);
extern enum vchiq_status
@@ -517,7 +517,7 @@ extern void
vchiq_free_service_internal(struct vchiq_service *service);
extern enum vchiq_status
-vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance);
+vchiq_shutdown_internal(struct vchiq_state *state, struct vchiq_instance *instance);
extern void
remote_event_pollall(struct vchiq_state *state);
@@ -561,15 +561,15 @@ extern struct vchiq_service *
find_service_by_port(struct vchiq_state *state, int localport);
extern struct vchiq_service *
-find_service_for_instance(VCHIQ_INSTANCE_T instance,
+find_service_for_instance(struct vchiq_instance *instance,
unsigned int handle);
extern struct vchiq_service *
-find_closed_service_for_instance(VCHIQ_INSTANCE_T instance,
+find_closed_service_for_instance(struct vchiq_instance *instance,
unsigned int handle);
extern struct vchiq_service *
-next_service_by_instance(struct vchiq_state *state, VCHIQ_INSTANCE_T instance,
+next_service_by_instance(struct vchiq_state *state, struct vchiq_instance *instance,
int *pidx);
extern void
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
index f217b78d95a0..89cc52211de4 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c
@@ -117,7 +117,7 @@ static const struct file_operations debugfs_log_fops = {
static int debugfs_usecount_show(struct seq_file *f, void *offset)
{
- VCHIQ_INSTANCE_T instance = f->private;
+ struct vchiq_instance *instance = f->private;
int use_count;
use_count = vchiq_instance_get_use_count(instance);
@@ -129,7 +129,7 @@ DEFINE_SHOW_ATTRIBUTE(debugfs_usecount);
static int debugfs_trace_show(struct seq_file *f, void *offset)
{
- VCHIQ_INSTANCE_T instance = f->private;
+ struct vchiq_instance *instance = f->private;
int trace;
trace = vchiq_instance_get_trace(instance);
@@ -148,7 +148,7 @@ static ssize_t debugfs_trace_write(struct file *file,
size_t count, loff_t *ppos)
{
struct seq_file *f = (struct seq_file *)file->private_data;
- VCHIQ_INSTANCE_T instance = f->private;
+ struct vchiq_instance *instance = f->private;
char firstchar;
if (copy_from_user(&firstchar, buffer, 1))
@@ -184,7 +184,7 @@ static const struct file_operations debugfs_trace_fops = {
};
/* add an instance (process) to the debugfs entries */
-void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance)
+void vchiq_debugfs_add_instance(struct vchiq_instance *instance)
{
char pidstr[16];
struct dentry *top;
@@ -201,7 +201,7 @@ void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance)
vchiq_instance_get_debugfs_node(instance)->dentry = top;
}
-void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance)
+void vchiq_debugfs_remove_instance(struct vchiq_instance *instance)
{
struct vchiq_debugfs_node *node =
vchiq_instance_get_debugfs_node(instance);
@@ -242,11 +242,11 @@ void vchiq_debugfs_deinit(void)
{
}
-void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance)
+void vchiq_debugfs_add_instance(struct vchiq_instance *instance)
{
}
-void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance)
+void vchiq_debugfs_remove_instance(struct vchiq_instance *instance)
{
}
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
index 9b563d105fdb..ec2f033cdf32 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.h
@@ -14,8 +14,8 @@ void vchiq_debugfs_init(void);
void vchiq_debugfs_deinit(void);
-void vchiq_debugfs_add_instance(VCHIQ_INSTANCE_T instance);
+void vchiq_debugfs_add_instance(struct vchiq_instance *instance);
-void vchiq_debugfs_remove_instance(VCHIQ_INSTANCE_T instance);
+void vchiq_debugfs_remove_instance(struct vchiq_instance *instance);
#endif /* VCHIQ_DEBUGFS_H */
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
index 7f6b8637b42a..22722b5a7459 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -64,6 +64,7 @@ struct vchiq_element {
typedef enum vchiq_status (*vchiq_callback)(enum vchiq_reason,
struct vchiq_header *,
unsigned int, void *);
+
struct vchiq_service_base {
int fourcc;
vchiq_callback callback;
@@ -89,16 +90,17 @@ struct vchiq_config {
short version_min; /* The minimum compatible version of VCHIQ */
};
-typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
typedef void (*vchiq_remote_callback)(void *cb_arg);
-extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
-extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
-extern enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance);
-extern enum vchiq_status vchiq_add_service(VCHIQ_INSTANCE_T instance,
+struct vchiq_instance;
+
+extern enum vchiq_status vchiq_initialise(struct vchiq_instance **pinstance);
+extern enum vchiq_status vchiq_shutdown(struct vchiq_instance *instance);
+extern enum vchiq_status vchiq_connect(struct vchiq_instance *instance);
+extern enum vchiq_status vchiq_add_service(struct vchiq_instance *instance,
const struct vchiq_service_params *params,
unsigned int *pservice);
-extern enum vchiq_status vchiq_open_service(VCHIQ_INSTANCE_T instance,
+extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance,
const struct vchiq_service_params *params,
unsigned int *pservice);
extern enum vchiq_status vchiq_close_service(unsigned int service);
@@ -132,9 +134,9 @@ extern void vchiq_get_config(struct vchiq_config *config);
extern enum vchiq_status vchiq_set_service_option(unsigned int service,
enum vchiq_service_option option, int value);
-extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
+extern enum vchiq_status vchiq_remote_use(struct vchiq_instance *instance,
vchiq_remote_callback callback, void *cb_arg);
-extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
+extern enum vchiq_status vchiq_remote_release(struct vchiq_instance *instance);
extern enum vchiq_status vchiq_dump_phys_mem(unsigned int service,
void *ptr, size_t num_bytes);
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index e14e59125f75..378d1b7c4112 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -437,7 +437,7 @@ EXPORT_SYMBOL(vchi_msg_hold);
int32_t vchi_initialise(struct vchi_instance_handle **instance_handle)
{
- VCHIQ_INSTANCE_T instance;
+ struct vchiq_instance *instance;
enum vchiq_status status;
status = vchiq_initialise(&instance);
@@ -461,7 +461,7 @@ EXPORT_SYMBOL(vchi_initialise);
***********************************************************/
int32_t vchi_connect(struct vchi_instance_handle *instance_handle)
{
- VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
+ struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;
return vchiq_connect(instance);
}
@@ -480,7 +480,7 @@ EXPORT_SYMBOL(vchi_connect);
***********************************************************/
int32_t vchi_disconnect(struct vchi_instance_handle *instance_handle)
{
- VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
+ struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;
return vchiq_status_to_vchi(vchiq_shutdown(instance));
}
@@ -562,7 +562,7 @@ static enum vchiq_status shim_callback(enum vchiq_reason reason,
return VCHIQ_SUCCESS;
}
-static struct shim_service *service_alloc(VCHIQ_INSTANCE_T instance,
+static struct shim_service *service_alloc(struct vchiq_instance *instance,
struct service_creation *setup)
{
struct shim_service *service = kzalloc(sizeof(struct shim_service), GFP_KERNEL);
@@ -594,7 +594,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,
struct service_creation *setup,
struct vchi_service_handle **handle)
{
- VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
+ struct vchiq_instance *instance = (struct vchiq_instance *)instance_handle;
struct shim_service *service = service_alloc(instance, setup);
*handle = (struct vchi_service_handle *)service;
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* [PATCH v5 10/10] staging: vc04_services: Removes platform struct typedef
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
` (8 preceding siblings ...)
2019-11-03 4:37 ` [PATCH v5 09/10] staging: vc04_services: Remove vchiq instance typedefs Jamal Shareef
@ 2019-11-03 4:37 ` Jamal Shareef
2019-11-03 7:14 ` [Outreachy kernel] " Julia Lawall
9 siblings, 1 reply; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 4:37 UTC (permalink / raw)
To: outreachy-kernel; +Cc: eric, wahrenst, gregkh, Jamal Shareef
Removes opaque platform struct typedef. Issue found by checkpatch.
Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
---
.../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index 5bc5c816bd1c..e1d97ddd88b1 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -237,7 +237,7 @@ struct remote_event {
u32 __unused;
};
-typedef struct opaque_platform_state_t *VCHIQ_PLATFORM_STATE_T;
+struct opaque_platform_state;
struct vchiq_slot {
char data[VCHIQ_SLOT_SIZE];
@@ -469,7 +469,7 @@ struct vchiq_state {
struct vchiq_service_quota service_quotas[VCHIQ_MAX_SERVICES];
struct vchiq_slot_info slot_info[VCHIQ_MAX_SLOTS];
- VCHIQ_PLATFORM_STATE_T platform_state;
+ struct opaque_platform_state *platform_state;
};
struct bulk_waiter {
--
2.17.1
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 10/10] staging: vc04_services: Removes platform struct typedef
2019-11-03 4:37 ` [PATCH v5 10/10] staging: vc04_services: Removes platform struct typedef Jamal Shareef
@ 2019-11-03 7:14 ` Julia Lawall
0 siblings, 0 replies; 19+ messages in thread
From: Julia Lawall @ 2019-11-03 7:14 UTC (permalink / raw)
To: Jamal Shareef; +Cc: outreachy-kernel, eric, wahrenst, gregkh
On Sat, 2 Nov 2019, Jamal Shareef wrote:
> Removes opaque platform struct typedef. Issue found by checkpatch.
>
> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
> ---
> .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> index 5bc5c816bd1c..e1d97ddd88b1 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> @@ -237,7 +237,7 @@ struct remote_event {
> u32 __unused;
> };
>
> -typedef struct opaque_platform_state_t *VCHIQ_PLATFORM_STATE_T;
> +struct opaque_platform_state;
Interesting. I didn't realize that C was able to declare the name of a
type in a typedef. I would have expected there there would have to be a
definition of opaque_platform_state_t somewhere, at least as struct
opaque_platform_state_t, but it seems that that is not necessary.
julia
>
> struct vchiq_slot {
> char data[VCHIQ_SLOT_SIZE];
> @@ -469,7 +469,7 @@ struct vchiq_state {
> struct vchiq_service_quota service_quotas[VCHIQ_MAX_SERVICES];
> struct vchiq_slot_info slot_info[VCHIQ_MAX_SLOTS];
>
> - VCHIQ_PLATFORM_STATE_T platform_state;
> + struct opaque_platform_state *platform_state;
> };
>
> struct bulk_waiter {
> --
> 2.17.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/a78981f351beff822a8fe0aaecfb9132314636a5.1572755439.git.jamal.k.shareef%40gmail.com.
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 07/10] staging: vc04_services: Renames remote use callback
2019-11-03 4:37 ` [PATCH v5 07/10] staging: vc04_services: Renames remote use callback Jamal Shareef
@ 2019-11-03 7:45 ` Julia Lawall
2019-11-03 8:17 ` Stefan Wahren
0 siblings, 1 reply; 19+ messages in thread
From: Julia Lawall @ 2019-11-03 7:45 UTC (permalink / raw)
To: Jamal Shareef; +Cc: outreachy-kernel, eric, wahrenst, gregkh
On Sat, 2 Nov 2019, Jamal Shareef wrote:
> Renames remote use callback function pointer to match kernel style.
>
> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
> ---
> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> index 6f3d3b00066d..869ca218c515 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> @@ -93,7 +93,7 @@ struct vchiq_config {
> };
>
> typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
> -typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
> +typedef void (*vchiq_remote_callback)(void *cb_arg);
>
> extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
> extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
> @@ -136,7 +136,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service
> enum vchiq_service_option option, int value);
>
> extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
> - VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
> + vchiq_remote_callback callback, void *cb_arg);
> extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
>
> extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
Are any of these definitions actually useful? It is suspicious to change
a prototype without changing the corresponding definition, but grep
suggests that there is none (and no use either). And likewise no
definition or use of the other two functions that we see here.
julia
> --
> 2.17.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/5ea44f2d87ff127023dffb70da182e32faac39e8.1572755439.git.jamal.k.shareef%40gmail.com.
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 04/10] staging: vc04_services: Remove vchiq_arm enum typedefs
2019-11-03 4:37 ` [PATCH v5 04/10] staging: vc04_services: Remove vchiq_arm enum typedefs Jamal Shareef
@ 2019-11-03 8:03 ` Julia Lawall
0 siblings, 0 replies; 19+ messages in thread
From: Julia Lawall @ 2019-11-03 8:03 UTC (permalink / raw)
To: Jamal Shareef; +Cc: outreachy-kernel, eric, wahrenst, gregkh
On Sat, 2 Nov 2019, Jamal Shareef wrote:
> Removes enum typedefs from vchiq_arm files. Issue found by checkpatch.
This patch updates multiple typedefs, not all of them related to enums.
If you search in this patch for (unsigned int), you will even find some
lines where one instance of a non enum typedef is changed and another
instance of the same non-enum typedef is not.
julia
>
> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
> ---
> .../interface/vchiq_arm/vchiq_2835_arm.c | 10 +-
> .../interface/vchiq_arm/vchiq_arm.c | 118 +++++++++---------
> .../interface/vchiq_arm/vchiq_arm.h | 18 +--
> .../interface/vchiq_arm/vchiq_core.c | 82 ++++++------
> .../interface/vchiq_arm/vchiq_core.h | 52 ++++----
> .../interface/vchiq_arm/vchiq_if.h | 69 +++++-----
> .../interface/vchiq_arm/vchiq_ioctl.h | 4 +-
> .../interface/vchiq_arm/vchiq_shim.c | 28 ++---
> 8 files changed, 191 insertions(+), 190 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
> index b86d7e436357..e568e9e6eb95 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
> @@ -168,10 +168,10 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state)
> return 0;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_platform_init_state(struct vchiq_state *state)
> {
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
> struct vchiq_2835_state *platform_state;
>
> state->platform_state = kzalloc(sizeof(*platform_state), GFP_KERNEL);
> @@ -214,7 +214,7 @@ remote_event_signal(struct remote_event *event)
> writel(0, g_regs + BELL2); /* trigger vc interrupt */
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size,
> int dir)
> {
> @@ -258,13 +258,13 @@ vchiq_dump_platform_state(void *dump_context)
> vchiq_dump(dump_context, buf, len + 1);
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_platform_suspend(struct vchiq_state *state)
> {
> return VCHIQ_ERROR;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_platform_resume(struct vchiq_state *state)
> {
> return VCHIQ_SUCCESS;
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> index dc54f443ef3d..0c615099b067 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
> @@ -172,14 +172,14 @@ static const char *const ioctl_names[] = {
> vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==
> (VCHIQ_IOC_MAX + 1));
>
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
> - unsigned int size, VCHIQ_BULK_DIR_T dir);
> + unsigned int size, enum vchiq_bulk_dir dir);
>
> #define VCHIQ_INIT_RETRIES 10
> -VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
> +enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
> {
> - VCHIQ_STATUS_T status = VCHIQ_ERROR;
> + enum vchiq_status status = VCHIQ_ERROR;
> struct vchiq_state *state;
> VCHIQ_INSTANCE_T instance = NULL;
> int i;
> @@ -230,9 +230,9 @@ VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
> }
> EXPORT_SYMBOL(vchiq_initialise);
>
> -VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance)
> +enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
> struct vchiq_state *state = instance->state;
>
> vchiq_log_trace(vchiq_core_log_level,
> @@ -272,9 +272,9 @@ static int vchiq_is_connected(VCHIQ_INSTANCE_T instance)
> return instance->connected;
> }
>
> -VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
> +enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
> struct vchiq_state *state = instance->state;
>
> vchiq_log_trace(vchiq_core_log_level,
> @@ -301,12 +301,12 @@ VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance)
> }
> EXPORT_SYMBOL(vchiq_connect);
>
> -VCHIQ_STATUS_T vchiq_add_service(
> - VCHIQ_INSTANCE_T instance,
> +enum vchiq_status vchiq_add_service(
> + VCHIQ_INSTANCE_T instance,
> const struct vchiq_service_params *params,
> VCHIQ_SERVICE_HANDLE_T *phandle)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
> struct vchiq_state *state = instance->state;
> struct vchiq_service *service = NULL;
> int srvstate;
> @@ -340,12 +340,12 @@ VCHIQ_STATUS_T vchiq_add_service(
> }
> EXPORT_SYMBOL(vchiq_add_service);
>
> -VCHIQ_STATUS_T vchiq_open_service(
> - VCHIQ_INSTANCE_T instance,
> +enum vchiq_status vchiq_open_service(
> + VCHIQ_INSTANCE_T instance,
> const struct vchiq_service_params *params,
> VCHIQ_SERVICE_HANDLE_T *phandle)
> {
> - VCHIQ_STATUS_T status = VCHIQ_ERROR;
> + enum vchiq_status status = VCHIQ_ERROR;
> struct vchiq_state *state = instance->state;
> struct vchiq_service *service = NULL;
>
> @@ -380,11 +380,11 @@ VCHIQ_STATUS_T vchiq_open_service(
> }
> EXPORT_SYMBOL(vchiq_open_service);
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,
> - unsigned int size, void *userdata, VCHIQ_BULK_MODE_T mode)
> + unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> switch (mode) {
> case VCHIQ_BULK_MODE_NOCALLBACK:
> @@ -405,11 +405,11 @@ vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T handle, const void *data,
> }
> EXPORT_SYMBOL(vchiq_bulk_transmit);
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,
> - unsigned int size, void *userdata, VCHIQ_BULK_MODE_T mode)
> + unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> switch (mode) {
> case VCHIQ_BULK_MODE_NOCALLBACK:
> @@ -429,13 +429,13 @@ vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T handle, void *data,
> }
> EXPORT_SYMBOL(vchiq_bulk_receive);
>
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
> - unsigned int size, VCHIQ_BULK_DIR_T dir)
> + unsigned int size, enum vchiq_bulk_dir dir)
> {
> VCHIQ_INSTANCE_T instance;
> struct vchiq_service *service;
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
> struct bulk_waiter_node *waiter = NULL;
>
> service = find_service_by_handle(handle);
> @@ -515,7 +515,7 @@ vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
> *
> ***************************************************************************/
>
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,
> struct vchiq_header *header, struct user_service *user_service,
> void *bulk_userdata)
> @@ -582,7 +582,7 @@ add_completion(VCHIQ_INSTANCE_T instance, enum vchiq_reason reason,
> *
> ***************************************************************************/
>
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> service_callback(enum vchiq_reason reason, struct vchiq_header *header,
> VCHIQ_SERVICE_HANDLE_T handle, void *bulk_userdata)
> {
> @@ -630,7 +630,7 @@ service_callback(enum vchiq_reason reason, struct vchiq_header *header,
> */
> if ((user_service->message_available_pos -
> instance->completion_remove) < 0) {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> vchiq_log_info(vchiq_arm_log_level,
> "Inserting extra MESSAGE_AVAILABLE");
> @@ -772,7 +772,7 @@ static ssize_t vchiq_ioc_copy_element_data(void *context, void *dest,
> * vchiq_ioc_queue_message
> *
> **************************************************************************/
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> vchiq_ioc_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
> struct vchiq_element *elements,
> unsigned long count)
> @@ -805,7 +805,7 @@ static long
> vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> {
> VCHIQ_INSTANCE_T instance = file->private_data;
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
> struct vchiq_service *service = NULL;
> long ret = 0;
> int i, rc;
> @@ -952,7 +952,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>
> case VCHIQ_IOC_CLOSE_SERVICE:
> case VCHIQ_IOC_REMOVE_SERVICE: {
> - VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
> + VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
> struct user_service *user_service;
>
> service = find_service_for_instance(instance, handle);
> @@ -985,7 +985,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>
> case VCHIQ_IOC_USE_SERVICE:
> case VCHIQ_IOC_RELEASE_SERVICE: {
> - VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
> + VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
>
> service = find_service_for_instance(instance, handle);
> if (service) {
> @@ -1042,7 +1042,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> struct vchiq_queue_bulk_transfer args;
> struct bulk_waiter_node *waiter = NULL;
>
> - VCHIQ_BULK_DIR_T dir =
> + enum vchiq_bulk_dir dir =
> (cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ?
> VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;
>
> @@ -1107,7 +1107,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> }
> kfree(waiter);
> } else {
> - const VCHIQ_BULK_MODE_T mode_waiting =
> + const enum vchiq_bulk_mode mode_waiting =
> VCHIQ_BULK_MODE_WAITING;
> waiter->pid = current->pid;
> mutex_lock(&instance->bulk_waiter_list_mutex);
> @@ -1368,7 +1368,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> } break;
>
> case VCHIQ_IOC_GET_CLIENT_ID: {
> - VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
> + VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
>
> ret = vchiq_get_client_id(handle);
> } break;
> @@ -1423,7 +1423,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> } break;
>
> case VCHIQ_IOC_CLOSE_DELIVERED: {
> - VCHIQ_SERVICE_HANDLE_T handle = (VCHIQ_SERVICE_HANDLE_T)arg;
> + VCHIQ_SERVICE_HANDLE_T handle = (unsigned int)arg;
>
> service = find_closed_service_for_instance(instance, handle);
> if (service) {
> @@ -1484,7 +1484,7 @@ struct vchiq_create_service32 {
> struct vchiq_service_params32 params;
> int is_open;
> int is_vchi;
> - unsigned int handle; /* OUT */
> + VCHIQ_SERVICE_HANDLE_T handle; /* OUT */
> };
>
> #define VCHIQ_IOC_CREATE_SERVICE32 \
> @@ -1544,7 +1544,7 @@ struct vchiq_element32 {
> };
>
> struct vchiq_queue_message32 {
> - unsigned int handle;
> + VCHIQ_SERVICE_HANDLE_T handle;
> unsigned int count;
> compat_uptr_t elements;
> };
> @@ -1607,11 +1607,11 @@ vchiq_compat_ioctl_queue_message(struct file *file,
> }
>
> struct vchiq_queue_bulk_transfer32 {
> - unsigned int handle;
> + VCHIQ_SERVICE_HANDLE_T handle;
> compat_uptr_t data;
> unsigned int size;
> compat_uptr_t userdata;
> - VCHIQ_BULK_MODE_T mode;
> + enum vchiq_bulk_mode mode;
> };
>
> #define VCHIQ_IOC_QUEUE_BULK_TRANSMIT32 \
> @@ -1824,7 +1824,7 @@ vchiq_compat_ioctl_await_completion(struct file *file,
> }
>
> struct vchiq_dequeue_message32 {
> - unsigned int handle;
> + VCHIQ_SERVICE_HANDLE_T handle;
> int blocking;
> unsigned int bufsize;
> compat_uptr_t buf;
> @@ -2270,7 +2270,7 @@ vchiq_videocore_wanted(struct vchiq_state *state)
> return 1;
> }
>
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> vchiq_keepalive_vchiq_callback(enum vchiq_reason reason,
> struct vchiq_header *header,
> VCHIQ_SERVICE_HANDLE_T service_user,
> @@ -2287,7 +2287,7 @@ vchiq_keepalive_thread_func(void *v)
> struct vchiq_state *state = (struct vchiq_state *)v;
> struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
>
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
> VCHIQ_INSTANCE_T instance;
> VCHIQ_SERVICE_HANDLE_T ka_handle;
>
> @@ -2361,7 +2361,7 @@ vchiq_keepalive_thread_func(void *v)
> return 0;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_arm_init_state(struct vchiq_state *state,
> struct vchiq_arm_state *arm_state)
> {
> @@ -2563,10 +2563,10 @@ unblock_resume(struct vchiq_arm_state *arm_state)
>
> /* Initiate suspend via slot handler. Should be called with the write lock
> * held */
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_arm_vcsuspend(struct vchiq_state *state)
> {
> - VCHIQ_STATUS_T status = VCHIQ_ERROR;
> + enum vchiq_status status = VCHIQ_ERROR;
> struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
>
> if (!arm_state)
> @@ -2684,12 +2684,12 @@ vchiq_check_resume(struct vchiq_state *state)
> return resume;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
> enum USE_TYPE_E use_type)
> {
> struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
> - VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
> + enum vchiq_status ret = VCHIQ_SUCCESS;
> char entity[16];
> int *entity_uc;
> int local_uc, local_entity_uc;
> @@ -2798,7 +2798,7 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
> }
>
> if (ret == VCHIQ_SUCCESS) {
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
> long ack_cnt = atomic_xchg(&arm_state->ka_use_ack_count, 0);
>
> while (ack_cnt && (status == VCHIQ_SUCCESS)) {
> @@ -2817,11 +2817,11 @@ vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
> return ret;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_release_internal(struct vchiq_state *state, struct vchiq_service *service)
> {
> struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
> - VCHIQ_STATUS_T ret = VCHIQ_SUCCESS;
> + enum vchiq_status ret = VCHIQ_SUCCESS;
> char entity[16];
> int *entity_uc;
>
> @@ -2898,13 +2898,13 @@ vchiq_on_remote_release(struct vchiq_state *state)
> complete(&arm_state->ka_evt);
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_use_service_internal(struct vchiq_service *service)
> {
> return vchiq_use_internal(service->state, service, USE_TYPE_SERVICE);
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_release_service_internal(struct vchiq_service *service)
> {
> return vchiq_release_internal(service->state, service);
> @@ -2969,10 +2969,10 @@ static void suspend_timer_callback(struct timer_list *t)
> vchiq_check_suspend(state);
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
> {
> - VCHIQ_STATUS_T ret = VCHIQ_ERROR;
> + enum vchiq_status ret = VCHIQ_ERROR;
> struct vchiq_service *service = find_service_by_handle(handle);
>
> if (service) {
> @@ -2983,10 +2983,10 @@ vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle)
> return ret;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle)
> {
> - VCHIQ_STATUS_T ret = VCHIQ_ERROR;
> + enum vchiq_status ret = VCHIQ_ERROR;
> struct vchiq_service *service = find_service_by_handle(handle);
>
> if (service) {
> @@ -3088,11 +3088,11 @@ vchiq_dump_service_use_state(struct vchiq_state *state)
> vchiq_dump_platform_use_state(state);
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_check_service(struct vchiq_service *service)
> {
> struct vchiq_arm_state *arm_state;
> - VCHIQ_STATUS_T ret = VCHIQ_ERROR;
> + enum vchiq_status ret = VCHIQ_ERROR;
>
> if (!service || !service->state)
> goto out;
> @@ -3128,8 +3128,8 @@ void vchiq_on_remote_use_active(struct vchiq_state *state)
> }
>
> void vchiq_platform_conn_state_changed(struct vchiq_state *state,
> - VCHIQ_CONNSTATE_T oldstate,
> - VCHIQ_CONNSTATE_T newstate)
> + enum vchiq_connstate oldstate,
> + enum vchiq_connstate newstate)
> {
> struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
> index b424323e9613..ebab08b567fa 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
> @@ -109,13 +109,13 @@ int vchiq_platform_init(struct platform_device *pdev,
> extern struct vchiq_state *
> vchiq_get_state(void);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_arm_vcsuspend(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_arm_vcresume(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_arm_init_state(struct vchiq_state *state,
> struct vchiq_arm_state *arm_state);
>
> @@ -124,16 +124,16 @@ vchiq_check_resume(struct vchiq_state *state);
>
> extern void
> vchiq_check_suspend(struct vchiq_state *state);
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_use_service(VCHIQ_SERVICE_HANDLE_T handle);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_release_service(VCHIQ_SERVICE_HANDLE_T handle);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_check_service(struct vchiq_service *service);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_platform_suspend(struct vchiq_state *state);
>
> extern int
> @@ -154,10 +154,10 @@ vchiq_platform_get_arm_state(struct vchiq_state *state);
> extern int
> vchiq_videocore_wanted(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_use_internal(struct vchiq_state *state, struct vchiq_service *service,
> enum USE_TYPE_E use_type);
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_release_internal(struct vchiq_state *state,
> struct vchiq_service *service);
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> index e1898cfa5e91..6e4ad0929ba3 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
> @@ -59,7 +59,7 @@ DEFINE_SPINLOCK(bulk_waiter_spinlock);
> static DEFINE_SPINLOCK(quota_spinlock);
>
> struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES];
> -static unsigned int handle_seq;
> +static VCHIQ_SERVICE_HANDLE_T handle_seq;
>
> static const char *const srvstate_names[] = {
> "FREE",
> @@ -354,11 +354,11 @@ mark_service_closing(struct vchiq_service *service)
> mark_service_closing_internal(service, 0);
> }
>
> -static inline VCHIQ_STATUS_T
> +static inline enum vchiq_status
> make_service_callback(struct vchiq_service *service, enum vchiq_reason reason,
> struct vchiq_header *header, void *bulk_userdata)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> vchiq_log_trace(vchiq_core_log_level, "%d: callback:%d (%s, %pK, %pK)",
> service->state->id, service->localport, reason_names[reason],
> @@ -375,9 +375,9 @@ make_service_callback(struct vchiq_service *service, enum vchiq_reason reason,
> }
>
> inline void
> -vchiq_set_conn_state(struct vchiq_state *state, VCHIQ_CONNSTATE_T newstate)
> +vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate)
> {
> - VCHIQ_CONNSTATE_T oldstate = state->conn_state;
> + enum vchiq_connstate oldstate = state->conn_state;
>
> vchiq_log_info(vchiq_core_log_level, "%d: %s->%s", state->id,
> conn_state_names[oldstate],
> @@ -779,7 +779,7 @@ copy_message_data(
> }
>
> /* Called by the slot handler and application threads */
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> queue_message(struct vchiq_state *state, struct vchiq_service *service,
> int msgid,
> ssize_t (*copy_callback)(void *context, void *dest,
> @@ -1027,7 +1027,7 @@ queue_message(struct vchiq_state *state, struct vchiq_service *service,
> }
>
> /* Called by the slot handler and application threads */
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> queue_message_sync(struct vchiq_state *state, struct vchiq_service *service,
> int msgid,
> ssize_t (*copy_callback)(void *context, void *dest,
> @@ -1178,11 +1178,11 @@ release_slot(struct vchiq_state *state, struct vchiq_slot_info *slot_info,
> }
>
> /* Called by the slot handler - don't hold the bulk mutex */
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> notify_bulks(struct vchiq_service *service, struct vchiq_bulk_queue *queue,
> int retry_poll)
> {
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
>
> vchiq_log_trace(vchiq_core_log_level,
> "%d: nb:%d %cx - p=%x rn=%x r=%x",
> @@ -2078,7 +2078,7 @@ init_bulk_queue(struct vchiq_bulk_queue *queue)
> }
>
> inline const char *
> -get_conn_state_name(VCHIQ_CONNSTATE_T conn_state)
> +get_conn_state_name(enum vchiq_connstate conn_state)
> {
> return conn_state_names[conn_state];
> }
> @@ -2123,12 +2123,12 @@ vchiq_init_slots(void *mem_base, int mem_size)
> return slot_zero;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)
> {
> struct vchiq_shared_state *local;
> struct vchiq_shared_state *remote;
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
> char threadname[16];
> int i;
>
> @@ -2281,7 +2281,7 @@ struct vchiq_service *
> vchiq_add_service_internal(struct vchiq_state *state,
> const struct vchiq_service_params *params,
> int srvstate, VCHIQ_INSTANCE_T instance,
> - VCHIQ_USERDATA_TERM_T userdata_term)
> + void (*userdata_term)(void *userdata))
> {
> struct vchiq_service *service;
> struct vchiq_service **pservice = NULL;
> @@ -2409,7 +2409,7 @@ vchiq_add_service_internal(struct vchiq_state *state,
> return service;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_open_service_internal(struct vchiq_service *service, int client_id)
> {
> struct vchiq_open_payload payload = {
> @@ -2418,7 +2418,7 @@ vchiq_open_service_internal(struct vchiq_service *service, int client_id)
> service->version,
> service->version_min
> };
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
>
> service->client_id = client_id;
> vchiq_use_service_internal(service);
> @@ -2516,7 +2516,7 @@ release_service_messages(struct vchiq_service *service)
> static int
> do_abort_bulks(struct vchiq_service *service)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> /* Abort any outstanding bulk transfers */
> if (mutex_lock_killable(&service->bulk_mutex))
> @@ -2532,10 +2532,10 @@ do_abort_bulks(struct vchiq_service *service)
> return (status == VCHIQ_SUCCESS);
> }
>
> -static VCHIQ_STATUS_T
> +static enum vchiq_status
> close_service_complete(struct vchiq_service *service, int failstate)
> {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
> int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID);
> int newstate;
>
> @@ -2594,11 +2594,11 @@ close_service_complete(struct vchiq_service *service, int failstate)
> }
>
> /* Called by the slot handler */
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_close_service_internal(struct vchiq_service *service, int close_recvd)
> {
> struct vchiq_state *state = service->state;
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
> int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID);
>
> vchiq_log_info(vchiq_core_log_level, "%d: csi:%d,%d (%s)",
> @@ -2774,7 +2774,7 @@ vchiq_free_service_internal(struct vchiq_service *service)
> unlock_service(service);
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
> {
> struct vchiq_service *service;
> @@ -2810,7 +2810,7 @@ vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
> return VCHIQ_SUCCESS;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
> {
> struct vchiq_service *service;
> @@ -2827,12 +2827,12 @@ vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance)
> return VCHIQ_SUCCESS;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
> {
> /* Unregister the service */
> struct vchiq_service *service = find_service_by_handle(handle);
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
>
> if (!service)
> return VCHIQ_ERROR;
> @@ -2886,12 +2886,12 @@ vchiq_close_service(VCHIQ_SERVICE_HANDLE_T handle)
> return status;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
> {
> /* Unregister the service */
> struct vchiq_service *service = find_service_by_handle(handle);
> - VCHIQ_STATUS_T status = VCHIQ_SUCCESS;
> + enum vchiq_status status = VCHIQ_SUCCESS;
>
> if (!service)
> return VCHIQ_ERROR;
> @@ -2952,10 +2952,10 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
> * When called in blocking mode, the userdata field points to a bulk_waiter
> * structure.
> */
> -VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
> +enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
> void *offset, int size, void *userdata,
> - VCHIQ_BULK_MODE_T mode,
> - VCHIQ_BULK_DIR_T dir)
> + enum vchiq_bulk_mode mode,
> + enum vchiq_bulk_dir dir)
> {
> struct vchiq_service *service = find_service_by_handle(handle);
> struct vchiq_bulk_queue *queue;
> @@ -2965,7 +2965,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
> const char dir_char = (dir == VCHIQ_BULK_TRANSMIT) ? 't' : 'r';
> const int dir_msgtype = (dir == VCHIQ_BULK_TRANSMIT) ?
> VCHIQ_MSG_BULK_TX : VCHIQ_MSG_BULK_RX;
> - VCHIQ_STATUS_T status = VCHIQ_ERROR;
> + enum vchiq_status status = VCHIQ_ERROR;
> int payload[2];
>
> if (!service || service->srvstate != VCHIQ_SRVSTATE_OPEN ||
> @@ -3100,7 +3100,7 @@ VCHIQ_STATUS_T vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
> return status;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
> ssize_t (*copy_callback)(void *context, void *dest,
> size_t offset, size_t maxsize),
> @@ -3108,7 +3108,7 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
> size_t size)
> {
> struct vchiq_service *service = find_service_by_handle(handle);
> - VCHIQ_STATUS_T status = VCHIQ_ERROR;
> + enum vchiq_status status = VCHIQ_ERROR;
>
> if (!service ||
> (vchiq_check_service(service) != VCHIQ_SUCCESS))
> @@ -3192,10 +3192,10 @@ release_message_sync(struct vchiq_state *state, struct vchiq_header *header)
> remote_event_signal(&state->remote->sync_release);
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle, short *peer_version)
> {
> - VCHIQ_STATUS_T status = VCHIQ_ERROR;
> + enum vchiq_status status = VCHIQ_ERROR;
> struct vchiq_service *service = find_service_by_handle(handle);
>
> if (!service ||
> @@ -3221,12 +3221,12 @@ void vchiq_get_config(struct vchiq_config *config)
> config->version_min = VCHIQ_VERSION_MIN;
> }
>
> -VCHIQ_STATUS_T
> +enum vchiq_status
> vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T handle,
> - VCHIQ_SERVICE_OPTION_T option, int value)
> + enum vchiq_service_option option, int value)
> {
> struct vchiq_service *service = find_service_by_handle(handle);
> - VCHIQ_STATUS_T status = VCHIQ_ERROR;
> + enum vchiq_status status = VCHIQ_ERROR;
>
> if (service) {
> switch (option) {
> @@ -3524,9 +3524,9 @@ vchiq_loud_error_footer(void)
> "================");
> }
>
> -VCHIQ_STATUS_T vchiq_send_remote_use(struct vchiq_state *state)
> +enum vchiq_status vchiq_send_remote_use(struct vchiq_state *state)
> {
> - VCHIQ_STATUS_T status = VCHIQ_RETRY;
> + enum vchiq_status status = VCHIQ_RETRY;
>
> if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
> status = queue_message(state, NULL,
> @@ -3535,9 +3535,9 @@ VCHIQ_STATUS_T vchiq_send_remote_use(struct vchiq_state *state)
> return status;
> }
>
> -VCHIQ_STATUS_T vchiq_send_remote_use_active(struct vchiq_state *state)
> +enum vchiq_status vchiq_send_remote_use_active(struct vchiq_state *state)
> {
> - VCHIQ_STATUS_T status = VCHIQ_RETRY;
> + enum vchiq_status status = VCHIQ_RETRY;
>
> if (state->conn_state != VCHIQ_CONNSTATE_DISCONNECTED)
> status = queue_message(state, NULL,
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> index 75104986201b..d33d6bd96617 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
> @@ -169,7 +169,7 @@ enum {
>
> #endif /* VCHIQ_ENABLE_DEBUG */
>
> -typedef enum {
> +enum vchiq_connstate {
> VCHIQ_CONNSTATE_DISCONNECTED,
> VCHIQ_CONNSTATE_CONNECTING,
> VCHIQ_CONNSTATE_CONNECTED,
> @@ -179,7 +179,7 @@ typedef enum {
> VCHIQ_CONNSTATE_RESUMING,
> VCHIQ_CONNSTATE_PAUSE_TIMEOUT,
> VCHIQ_CONNSTATE_RESUME_TIMEOUT
> -} VCHIQ_CONNSTATE_T;
> +};
>
> enum {
> VCHIQ_SRVSTATE_FREE,
> @@ -202,10 +202,10 @@ enum {
> VCHIQ_POLL_COUNT
> };
>
> -typedef enum {
> +enum vchiq_bulk_dir {
> VCHIQ_BULK_TRANSMIT,
> VCHIQ_BULK_RECEIVE
> -} VCHIQ_BULK_DIR_T;
> +};
>
> typedef void (*VCHIQ_USERDATA_TERM_T)(void *userdata);
>
> @@ -367,7 +367,7 @@ struct vchiq_slot_zero {
> struct vchiq_state {
> int id;
> int initialised;
> - VCHIQ_CONNSTATE_T conn_state;
> + enum vchiq_connstate conn_state;
> short version_common;
>
> struct vchiq_shared_state *local;
> @@ -467,7 +467,7 @@ struct vchiq_state {
> struct vchiq_service *services[VCHIQ_MAX_SERVICES];
> struct vchiq_service_quota service_quotas[VCHIQ_MAX_SERVICES];
> struct vchiq_slot_info slot_info[VCHIQ_MAX_SLOTS];
> -
> +
> VCHIQ_PLATFORM_STATE_T platform_state;
> };
>
> @@ -486,15 +486,15 @@ extern int vchiq_sync_log_level;
> extern struct vchiq_state *vchiq_states[VCHIQ_MAX_STATES];
>
> extern const char *
> -get_conn_state_name(VCHIQ_CONNSTATE_T conn_state);
> +get_conn_state_name(enum vchiq_connstate conn_state);
>
> extern struct vchiq_slot_zero *
> vchiq_init_slots(void *mem_base, int mem_size);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_connect_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance);
>
> extern struct vchiq_service *
> @@ -503,10 +503,10 @@ vchiq_add_service_internal(struct vchiq_state *state,
> int srvstate, VCHIQ_INSTANCE_T instance,
> VCHIQ_USERDATA_TERM_T userdata_term);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_open_service_internal(struct vchiq_service *service, int client_id);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_close_service_internal(struct vchiq_service *service, int close_recvd);
>
> extern void
> @@ -515,16 +515,16 @@ vchiq_terminate_service_internal(struct vchiq_service *service);
> extern void
> vchiq_free_service_internal(struct vchiq_service *service);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_shutdown_internal(struct vchiq_state *state, VCHIQ_INSTANCE_T instance);
>
> extern void
> remote_event_pollall(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *offset, int size,
> - void *userdata, VCHIQ_BULK_MODE_T mode,
> - VCHIQ_BULK_DIR_T dir);
> + void *userdata, enum vchiq_bulk_mode mode,
> + enum vchiq_bulk_dir dir);
>
> extern void
> vchiq_dump_state(void *dump_context, struct vchiq_state *state);
> @@ -580,7 +580,7 @@ unlock_service(struct vchiq_service *service);
> /* The following functions are called from vchiq_core, and external
> ** implementations must be provided. */
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_prepare_bulk_data(struct vchiq_bulk *bulk, void *offset, int size,
> int dir);
>
> @@ -596,7 +596,7 @@ vchiq_platform_check_suspend(struct vchiq_state *state);
> extern void
> vchiq_platform_paused(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_platform_resume(struct vchiq_state *state);
>
> extern void
> @@ -615,10 +615,10 @@ extern void
> vchiq_dump_platform_service_state(void *dump_context,
> struct vchiq_service *service);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_use_service_internal(struct vchiq_service *service);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_release_service_internal(struct vchiq_service *service);
>
> extern void
> @@ -627,31 +627,31 @@ vchiq_on_remote_use(struct vchiq_state *state);
> extern void
> vchiq_on_remote_release(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_platform_init_state(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_check_service(struct vchiq_service *service);
>
> extern void
> vchiq_on_remote_use_active(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_send_remote_use(struct vchiq_state *state);
>
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status
> vchiq_send_remote_use_active(struct vchiq_state *state);
>
> extern void
> vchiq_platform_conn_state_changed(struct vchiq_state *state,
> - VCHIQ_CONNSTATE_T oldstate,
> - VCHIQ_CONNSTATE_T newstate);
> + enum vchiq_connstate oldstate,
> + enum vchiq_connstate newstate);
>
> extern void
> vchiq_platform_handle_timeout(struct vchiq_state *state);
>
> extern void
> -vchiq_set_conn_state(struct vchiq_state *state, VCHIQ_CONNSTATE_T newstate);
> +vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate);
>
> extern void
> vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> index f911612a6a54..f506858987b7 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> @@ -25,26 +25,26 @@ enum vchiq_reason {
> VCHIQ_BULK_RECEIVE_ABORTED /* service, -, bulk_userdata */
> };
>
> -typedef enum {
> +enum vchiq_status {
> VCHIQ_ERROR = -1,
> VCHIQ_SUCCESS = 0,
> VCHIQ_RETRY = 1
> -} VCHIQ_STATUS_T;
> +};
>
> -typedef enum {
> +enum vchiq_bulk_mode {
> VCHIQ_BULK_MODE_CALLBACK,
> VCHIQ_BULK_MODE_BLOCKING,
> VCHIQ_BULK_MODE_NOCALLBACK,
> VCHIQ_BULK_MODE_WAITING /* Reserved for internal use */
> -} VCHIQ_BULK_MODE_T;
> +};
>
> -typedef enum {
> +enum vchiq_service_option {
> VCHIQ_SERVICE_OPTION_AUTOCLOSE,
> VCHIQ_SERVICE_OPTION_SLOT_QUOTA,
> VCHIQ_SERVICE_OPTION_MESSAGE_QUOTA,
> VCHIQ_SERVICE_OPTION_SYNCHRONOUS,
> VCHIQ_SERVICE_OPTION_TRACE
> -} VCHIQ_SERVICE_OPTION_T;
> +};
>
> struct vchiq_header {
> /* The message identifier - opaque to applications. */
> @@ -63,9 +63,10 @@ struct vchiq_element {
>
> typedef unsigned int VCHIQ_SERVICE_HANDLE_T;
>
> -typedef VCHIQ_STATUS_T (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
> - struct vchiq_header *,
> - VCHIQ_SERVICE_HANDLE_T, void *);
> +typedef enum vchiq_status (*VCHIQ_CALLBACK_T)(enum vchiq_reason,
> + struct vchiq_header *,
> + VCHIQ_SERVICE_HANDLE_T, void *);
> +
>
> struct vchiq_service_base {
> int fourcc;
> @@ -95,20 +96,20 @@ struct vchiq_config {
> typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
> typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
>
> -extern VCHIQ_STATUS_T vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
> -extern VCHIQ_STATUS_T vchiq_shutdown(VCHIQ_INSTANCE_T instance);
> -extern VCHIQ_STATUS_T vchiq_connect(VCHIQ_INSTANCE_T instance);
> -extern VCHIQ_STATUS_T vchiq_add_service(VCHIQ_INSTANCE_T instance,
> +extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
> +extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
> +extern enum vchiq_status vchiq_connect(VCHIQ_INSTANCE_T instance);
> +extern enum vchiq_status vchiq_add_service(VCHIQ_INSTANCE_T instance,
> const struct vchiq_service_params *params,
> VCHIQ_SERVICE_HANDLE_T *pservice);
> -extern VCHIQ_STATUS_T vchiq_open_service(VCHIQ_INSTANCE_T instance,
> +extern enum vchiq_status vchiq_open_service(VCHIQ_INSTANCE_T instance,
> const struct vchiq_service_params *params,
> VCHIQ_SERVICE_HANDLE_T *pservice);
> -extern VCHIQ_STATUS_T vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);
> -extern VCHIQ_STATUS_T vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);
> -extern VCHIQ_STATUS_T vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
> -extern VCHIQ_STATUS_T vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
> -extern VCHIQ_STATUS_T
> +extern enum vchiq_status vchiq_close_service(VCHIQ_SERVICE_HANDLE_T service);
> +extern enum vchiq_status vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T service);
> +extern enum vchiq_status vchiq_use_service(VCHIQ_SERVICE_HANDLE_T service);
> +extern enum vchiq_status vchiq_release_service(VCHIQ_SERVICE_HANDLE_T service);
> +extern enum vchiq_status
> vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
> ssize_t (*copy_callback)(void *context, void *dest,
> size_t offset, size_t maxsize),
> @@ -116,33 +117,33 @@ vchiq_queue_message(VCHIQ_SERVICE_HANDLE_T handle,
> size_t size);
> extern void vchiq_release_message(VCHIQ_SERVICE_HANDLE_T service,
> struct vchiq_header *header);
> -extern VCHIQ_STATUS_T vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
> +extern enum vchiq_status vchiq_bulk_transmit(VCHIQ_SERVICE_HANDLE_T service,
> const void *data, unsigned int size, void *userdata,
> - VCHIQ_BULK_MODE_T mode);
> -extern VCHIQ_STATUS_T vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
> + enum vchiq_bulk_mode mode);
> +extern enum vchiq_status vchiq_bulk_receive(VCHIQ_SERVICE_HANDLE_T service,
> void *data, unsigned int size, void *userdata,
> - VCHIQ_BULK_MODE_T mode);
> -extern VCHIQ_STATUS_T vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service,
> + enum vchiq_bulk_mode mode);
> +extern enum vchiq_status vchiq_bulk_transmit_handle(VCHIQ_SERVICE_HANDLE_T service,
> const void *offset, unsigned int size,
> - void *userdata, VCHIQ_BULK_MODE_T mode);
> -extern VCHIQ_STATUS_T vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
> + void *userdata, enum vchiq_bulk_mode mode);
> +extern enum vchiq_status vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
> void *offset, unsigned int size, void *userdata,
> - VCHIQ_BULK_MODE_T mode);
> + enum vchiq_bulk_mode mode);
> extern int vchiq_get_client_id(VCHIQ_SERVICE_HANDLE_T service);
> extern void *vchiq_get_service_userdata(VCHIQ_SERVICE_HANDLE_T service);
> extern int vchiq_get_service_fourcc(VCHIQ_SERVICE_HANDLE_T service);
> extern void vchiq_get_config(struct vchiq_config *config);
> -extern VCHIQ_STATUS_T vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,
> - VCHIQ_SERVICE_OPTION_T option, int value);
> +extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service,
> + enum vchiq_service_option option, int value);
>
> -extern VCHIQ_STATUS_T vchiq_remote_use(VCHIQ_INSTANCE_T instance,
> - VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
> -extern VCHIQ_STATUS_T vchiq_remote_release(VCHIQ_INSTANCE_T instance);
> +extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
> + VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
> +extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
>
> -extern VCHIQ_STATUS_T vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
> +extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
> void *ptr, size_t num_bytes);
>
> -extern VCHIQ_STATUS_T vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle,
> +extern enum vchiq_status vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle,
> short *peer_version);
>
> #endif /* VCHIQ_IF_H */
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> index c2343a1a3a6a..202889b3774f 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
> @@ -28,7 +28,7 @@ struct vchiq_queue_bulk_transfer {
> void *data;
> unsigned int size;
> void *userdata;
> - VCHIQ_BULK_MODE_T mode;
> + enum vchiq_bulk_mode mode;
> };
>
> struct vchiq_completion_data {
> @@ -60,7 +60,7 @@ struct vchiq_get_config {
>
> struct vchiq_set_service_option {
> unsigned int handle;
> - VCHIQ_SERVICE_OPTION_T option;
> + enum vchiq_service_option option;
> int value;
> };
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> index 781c2916c5b8..e247ed1d3037 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> @@ -104,7 +104,7 @@ int32_t vchi_msg_queue(struct vchi_service_handle *handle,
> void *context, uint32_t data_size)
> {
> struct shim_service *service = (struct shim_service *)handle;
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> while (1) {
> status = vchiq_queue_message(service->handle,
> @@ -200,8 +200,8 @@ int32_t vchi_bulk_queue_receive(struct vchi_service_handle *handle, void *data_d
> void *bulk_handle)
> {
> struct shim_service *service = (struct shim_service *)handle;
> - VCHIQ_BULK_MODE_T mode;
> - VCHIQ_STATUS_T status;
> + enum vchiq_bulk_mode mode;
> + enum vchiq_status status;
>
> switch ((int)flags) {
> case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
> @@ -260,8 +260,8 @@ int32_t vchi_bulk_queue_transmit(struct vchi_service_handle *handle,
> void *bulk_handle)
> {
> struct shim_service *service = (struct shim_service *)handle;
> - VCHIQ_BULK_MODE_T mode;
> - VCHIQ_STATUS_T status;
> + enum vchiq_bulk_mode mode;
> + enum vchiq_status status;
>
> switch ((int)flags) {
> case VCHI_FLAGS_CALLBACK_WHEN_OP_COMPLETE
> @@ -363,7 +363,7 @@ int32_t vchi_held_msg_release(struct vchi_held_msg *message)
> * to a pointer.
> */
>
> - vchiq_release_message((VCHIQ_SERVICE_HANDLE_T)(long)message->service,
> + vchiq_release_message((unsigned int)(long)message->service,
> (struct vchiq_header *)message->message);
>
> return 0;
> @@ -438,7 +438,7 @@ EXPORT_SYMBOL(vchi_msg_hold);
> int32_t vchi_initialise(struct vchi_instance_handle **instance_handle)
> {
> VCHIQ_INSTANCE_T instance;
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> status = vchiq_initialise(&instance);
>
> @@ -500,7 +500,7 @@ EXPORT_SYMBOL(vchi_disconnect);
> *
> ***********************************************************/
>
> -static VCHIQ_STATUS_T shim_callback(enum vchiq_reason reason,
> +static enum vchiq_status shim_callback(enum vchiq_reason reason,
> struct vchiq_header *header,
> VCHIQ_SERVICE_HANDLE_T handle,
> void *bulk_user)
> @@ -601,7 +601,7 @@ int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,
>
> if (service) {
> struct vchiq_service_params params;
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> memset(¶ms, 0, sizeof(params));
> params.fourcc = setup->service_id;
> @@ -629,7 +629,7 @@ int32_t vchi_service_close(const struct vchi_service_handle *handle)
> struct shim_service *service = (struct shim_service *)handle;
>
> if (service) {
> - VCHIQ_STATUS_T status = vchiq_close_service(service->handle);
> + enum vchiq_status status = vchiq_close_service(service->handle);
> if (status == VCHIQ_SUCCESS)
> service_free(service);
>
> @@ -645,7 +645,7 @@ int32_t vchi_service_destroy(const struct vchi_service_handle *handle)
> struct shim_service *service = (struct shim_service *)handle;
>
> if (service) {
> - VCHIQ_STATUS_T status = vchiq_remove_service(service->handle);
> + enum vchiq_status status = vchiq_remove_service(service->handle);
>
> if (status == VCHIQ_SUCCESS) {
> service_free(service);
> @@ -664,7 +664,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle,
> {
> int32_t ret = -1;
> struct shim_service *service = (struct shim_service *)handle;
> - VCHIQ_SERVICE_OPTION_T vchiq_option;
> + enum vchiq_service_option vchiq_option;
>
> switch (option) {
> case VCHI_SERVICE_OPTION_TRACE:
> @@ -678,7 +678,7 @@ int32_t vchi_service_set_option(const struct vchi_service_handle *handle,
> break;
> }
> if (service) {
> - VCHIQ_STATUS_T status =
> + enum vchiq_status status =
> vchiq_set_service_option(service->handle,
> vchiq_option,
> value);
> @@ -696,7 +696,7 @@ int32_t vchi_get_peer_version(const struct vchi_service_handle *handle,
> struct shim_service *service = (struct shim_service *)handle;
>
> if (service) {
> - VCHIQ_STATUS_T status;
> + enum vchiq_status status;
>
> status = vchiq_get_peer_version(service->handle, peer_version);
> ret = vchiq_status_to_vchi(status);
> --
> 2.17.1
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/82557895f9b9a777fc168019c56a4bf16c1966f0.1572755439.git.jamal.k.shareef%40gmail.com.
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 07/10] staging: vc04_services: Renames remote use callback
2019-11-03 7:45 ` [Outreachy kernel] " Julia Lawall
@ 2019-11-03 8:17 ` Stefan Wahren
2019-11-03 8:40 ` Julia Lawall
0 siblings, 1 reply; 19+ messages in thread
From: Stefan Wahren @ 2019-11-03 8:17 UTC (permalink / raw)
To: Julia Lawall, Jamal Shareef; +Cc: outreachy-kernel, eric, gregkh
Hi Julia,
Am 03.11.19 um 08:45 schrieb Julia Lawall:
>
> On Sat, 2 Nov 2019, Jamal Shareef wrote:
>
>> Renames remote use callback function pointer to match kernel style.
>>
>> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
>> ---
>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
>> index 6f3d3b00066d..869ca218c515 100644
>> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
>> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
>> @@ -93,7 +93,7 @@ struct vchiq_config {
>> };
>>
>> typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
>> -typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
>> +typedef void (*vchiq_remote_callback)(void *cb_arg);
>>
>> extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
>> extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
>> @@ -136,7 +136,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service
>> enum vchiq_service_option option, int value);
>>
>> extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
>> - VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
>> + vchiq_remote_callback callback, void *cb_arg);
>> extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
>>
>> extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
>
> Are any of these definitions actually useful? It is suspicious to change
> a prototype without changing the corresponding definition, but grep
> suggests that there is none (and no use either). And likewise no
> definition or use of the other two functions that we see here.
on the Raspberry Pi the roles of vc04_services are the following ones:
Linux (on the ARM cores) implements the client side as an open source
driver (this one) and the VC4 closed source firmware (on the VPU)
implements the server side. Both sides share a common code base. So it's
very likely that there are interface functions which are only
implemented on the server side.
Regards
Stefan
>
> julia
>
>> --
>> 2.17.1
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 07/10] staging: vc04_services: Renames remote use callback
2019-11-03 8:17 ` Stefan Wahren
@ 2019-11-03 8:40 ` Julia Lawall
2019-11-03 13:04 ` Stefan Wahren
0 siblings, 1 reply; 19+ messages in thread
From: Julia Lawall @ 2019-11-03 8:40 UTC (permalink / raw)
To: Stefan Wahren; +Cc: Jamal Shareef, outreachy-kernel, eric, gregkh
On Sun, 3 Nov 2019, Stefan Wahren wrote:
> Hi Julia,
>
> Am 03.11.19 um 08:45 schrieb Julia Lawall:
> >
> > On Sat, 2 Nov 2019, Jamal Shareef wrote:
> >
> >> Renames remote use callback function pointer to match kernel style.
> >>
> >> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
> >> ---
> >> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> >> index 6f3d3b00066d..869ca218c515 100644
> >> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> >> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
> >> @@ -93,7 +93,7 @@ struct vchiq_config {
> >> };
> >>
> >> typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
> >> -typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
> >> +typedef void (*vchiq_remote_callback)(void *cb_arg);
> >>
> >> extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
> >> extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
> >> @@ -136,7 +136,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service
> >> enum vchiq_service_option option, int value);
> >>
> >> extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
> >> - VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
> >> + vchiq_remote_callback callback, void *cb_arg);
> >> extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
> >>
> >> extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
> >
> > Are any of these definitions actually useful? It is suspicious to change
> > a prototype without changing the corresponding definition, but grep
> > suggests that there is none (and no use either). And likewise no
> > definition or use of the other two functions that we see here.
>
> on the Raspberry Pi the roles of vc04_services are the following ones:
> Linux (on the ARM cores) implements the client side as an open source
> driver (this one) and the VC4 closed source firmware (on the VPU)
> implements the server side. Both sides share a common code base. So it's
> very likely that there are interface functions which are only
> implemented on the server side.
Thanks for the explanation. Should they be dropped? Normally, the kernel
doesn't like code that is not reachable by any kernel code. But perhaps
for function prototypes it doesn't matter, since they are not executable.
julia
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef
2019-11-03 4:36 ` [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef Jamal Shareef
@ 2019-11-03 12:12 ` Greg KH
2019-11-03 21:41 ` Jamal Shareef
0 siblings, 1 reply; 19+ messages in thread
From: Greg KH @ 2019-11-03 12:12 UTC (permalink / raw)
To: Jamal Shareef; +Cc: outreachy-kernel, eric, wahrenst
On Sat, Nov 02, 2019 at 09:36:58PM -0700, Jamal Shareef wrote:
> Removes opaque vchi instance struct typedefs. Issue found by
> checkpatch.
What do you mean here by "opaque"?
>
> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
> ---
> .../bcm2835-audio/bcm2835-vchiq.c | 2 +-
> .../vc04_services/bcm2835-audio/bcm2835.h | 2 +-
> .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
> .../vc04_services/interface/vchi/vchi.h | 12 +++---
> .../interface/vchi/vchi_common.h | 2 +-
> .../interface/vchiq_arm/vchiq_shim.c | 43 +++++++++----------
> 6 files changed, 31 insertions(+), 32 deletions(-)
>
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> index 84ece768854f..2022ff2388dc 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> @@ -122,7 +122,7 @@ static void audio_vchi_callback(void *param,
> }
>
> static int
> -vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance,
> +vc_vchi_audio_init(struct vchi_instance_handle *vchi_instance,
> struct bcm2835_audio_instance *instance)
> {
> struct service_creation params = {
> diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
> index ed0feb34b6c8..d2fe8d36ab7d 100644
> --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
> +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
> @@ -44,7 +44,7 @@ enum snd_bcm2835_ctrl {
> };
>
> struct bcm2835_vchi_ctx {
> - VCHI_INSTANCE_T vchi_instance;
> + struct vchi_instance_handle *vchi_instance;
> };
>
> /* definition of the chip-specific record */
> diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
> index 06b7be7d8872..0f4db2f24944 100644
> --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
> +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
> @@ -1814,7 +1814,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
> {
> int status;
> struct vchiq_mmal_instance *instance;
> - static VCHI_INSTANCE_T vchi_instance;
> + static struct vchi_instance_handle *vchi_instance;
> struct service_creation params = {
> .version = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
> .service_id = VC_MMAL_SERVER_NAME,
> diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
> index 75b1ab4919e3..5c8842114607 100644
> --- a/drivers/staging/vc04_services/interface/vchi/vchi.h
> +++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
> @@ -50,7 +50,7 @@ struct service_creation {
> };
>
> // Opaque handle for a VCHI instance
> -typedef struct opaque_vchi_instance_handle_t *VCHI_INSTANCE_T;
> +struct vchi_instance_handle;
>
> // Opaque handle for a server or client
> typedef struct opaque_vchi_service_handle_t *VCHI_SERVICE_HANDLE_T;
> @@ -65,20 +65,20 @@ extern "C" {
> #endif
>
> // Routine used to initialise the vchi on both local + remote connections
> -extern int32_t vchi_initialise(VCHI_INSTANCE_T *instance_handle);
> +extern int32_t vchi_initialise(struct vchi_instance_handle **instance_handle);
>
> extern int32_t vchi_exit(void);
>
> -extern int32_t vchi_connect(VCHI_INSTANCE_T instance_handle);
> +extern int32_t vchi_connect(struct vchi_instance_handle *instance_handle);
>
> //When this is called, ensure that all services have no data pending.
> //Bulk transfers can remain 'queued'
> -extern int32_t vchi_disconnect(VCHI_INSTANCE_T 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 uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);
> +extern uint32_t vchi_current_time(struct vchi_instance_handle *instance_handle);
>
> /******************************************************************************
> * Global service API
> @@ -87,7 +87,7 @@ extern uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);
> extern int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle);
>
> // Routine to open a named service
> -extern int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
> +extern int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,
> struct service_creation *setup,
> VCHI_SERVICE_HANDLE_T *handle);
>
> diff --git a/drivers/staging/vc04_services/interface/vchi/vchi_common.h b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
> index c99735fc0308..fba37559aa83 100644
> --- a/drivers/staging/vc04_services/interface/vchi/vchi_common.h
> +++ b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
> @@ -86,7 +86,7 @@ enum vchi_service_option {
> };
>
> //Callback used by all services / bulk transfers
> -typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
> + typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
Why the extra space?
> enum vchi_callback_reason reason,
> void *handle); //for transmitting msg's only
>
> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> index 704afd470c88..a2434a68fc2f 100644
> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> @@ -23,7 +23,7 @@ struct shim_service {
> /***********************************************************
> * Name: vchi_msg_peek
> *
> - * Arguments: const VCHI_SERVICE_HANDLE_T handle,
> + * Arguments: VCHI_SERVICE_HANDLE_T handle,
Did you change the const?
> * void **data,
> * uint32_t *msg_size,
>
> @@ -63,7 +63,7 @@ EXPORT_SYMBOL(vchi_msg_peek);
> /***********************************************************
> * Name: vchi_msg_remove
> *
> - * Arguments: const VCHI_SERVICE_HANDLE_T handle,
> + * Arguments: VCHI_SERVICE_HANDLE_T handle,
Huh? What does this change mean?
> *
> * Description: Routine to remove a message (after it has been read with
> * vchi_msg_peek)
> @@ -100,10 +100,9 @@ EXPORT_SYMBOL(vchi_msg_remove);
> ***********************************************************/
> static
> int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
> - ssize_t (*copy_callback)(void *context, void *dest,
> - size_t offset, size_t maxsize),
> - void *context,
> - uint32_t data_size)
> + ssize_t (*copy_callback)(void *context, void *dest,
> + size_t offset, size_t maxsize),
> + void *context, uint32_t data_size)
> {
> struct shim_service *service = (struct shim_service *)handle;
> VCHIQ_STATUS_T status;
> @@ -169,8 +168,7 @@ vchi_queue_user_message_callback(void *context,
> }
>
> int
> -vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle,
> - void __user *data,
> +vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle, void __user *data,
> unsigned int size)
> {
> struct vchi_queue_user_message_context copycontext = {
> @@ -187,7 +185,7 @@ EXPORT_SYMBOL(vchi_queue_user_message);
> /***********************************************************
> * Name: vchi_bulk_queue_receive
> *
> - * Arguments: VCHI_BULK_HANDLE_T handle,
> + * Arguments: VCHI_SERVICE_HANDLE_T handle,
Huh???
> * void *data_dst,
> * const uint32_t data_size,
> * enum vchi_flags flags
> @@ -245,7 +243,7 @@ EXPORT_SYMBOL(vchi_bulk_queue_receive);
> /***********************************************************
> * Name: vchi_bulk_queue_transmit
> *
> - * Arguments: VCHI_BULK_HANDLE_T handle,
> + * Arguments: VCHI_SERVICE_HANDLE_T handle,
Did you change this???
This series is "rough". Please take a day off, step back and try doing
all of this "from scratch", doing only one thing per patch.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [Outreachy kernel] [PATCH v5 07/10] staging: vc04_services: Renames remote use callback
2019-11-03 8:40 ` Julia Lawall
@ 2019-11-03 13:04 ` Stefan Wahren
0 siblings, 0 replies; 19+ messages in thread
From: Stefan Wahren @ 2019-11-03 13:04 UTC (permalink / raw)
To: Julia Lawall; +Cc: Jamal Shareef, outreachy-kernel, eric, gregkh
Am 03.11.19 um 09:40 schrieb Julia Lawall:
>
> On Sun, 3 Nov 2019, Stefan Wahren wrote:
>
>> Hi Julia,
>>
>> Am 03.11.19 um 08:45 schrieb Julia Lawall:
>>> On Sat, 2 Nov 2019, Jamal Shareef wrote:
>>>
>>>> Renames remote use callback function pointer to match kernel style.
>>>>
>>>> Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
>>>> ---
>>>> drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h | 4 ++--
>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
>>>> index 6f3d3b00066d..869ca218c515 100644
>>>> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
>>>> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
>>>> @@ -93,7 +93,7 @@ struct vchiq_config {
>>>> };
>>>>
>>>> typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
>>>> -typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
>>>> +typedef void (*vchiq_remote_callback)(void *cb_arg);
>>>>
>>>> extern enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *pinstance);
>>>> extern enum vchiq_status vchiq_shutdown(VCHIQ_INSTANCE_T instance);
>>>> @@ -136,7 +136,7 @@ extern enum vchiq_status vchiq_set_service_option(VCHIQ_SERVICE_HANDLE_T service
>>>> enum vchiq_service_option option, int value);
>>>>
>>>> extern enum vchiq_status vchiq_remote_use(VCHIQ_INSTANCE_T instance,
>>>> - VCHIQ_REMOTE_USE_CALLBACK_T callback, void *cb_arg);
>>>> + vchiq_remote_callback callback, void *cb_arg);
>>>> extern enum vchiq_status vchiq_remote_release(VCHIQ_INSTANCE_T instance);
>>>>
>>>> extern enum vchiq_status vchiq_dump_phys_mem(VCHIQ_SERVICE_HANDLE_T service,
>>> Are any of these definitions actually useful? It is suspicious to change
>>> a prototype without changing the corresponding definition, but grep
>>> suggests that there is none (and no use either). And likewise no
>>> definition or use of the other two functions that we see here.
>> on the Raspberry Pi the roles of vc04_services are the following ones:
>> Linux (on the ARM cores) implements the client side as an open source
>> driver (this one) and the VC4 closed source firmware (on the VPU)
>> implements the server side. Both sides share a common code base. So it's
>> very likely that there are interface functions which are only
>> implemented on the server side.
> Thanks for the explanation. Should they be dropped? Normally, the kernel
> doesn't like code that is not reachable by any kernel code. But perhaps
> for function prototypes it doesn't matter, since they are not executable.
I doublechecked the downstream tree which has more users of the
vc04_services. But there aren't any users of the last three functions.
So feel free to remove them.
Stefan
>
> julia
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef
2019-11-03 12:12 ` Greg KH
@ 2019-11-03 21:41 ` Jamal Shareef
0 siblings, 0 replies; 19+ messages in thread
From: Jamal Shareef @ 2019-11-03 21:41 UTC (permalink / raw)
To: Greg KH; +Cc: outreachy-kernel, eric, wahrenst
On Sun, Nov 03, 2019 at 01:12:53PM +0100, Greg KH wrote:
> On Sat, Nov 02, 2019 at 09:36:58PM -0700, Jamal Shareef wrote:
> > Removes opaque vchi instance struct typedefs. Issue found by
> > checkpatch.
>
> What do you mean here by "opaque"?
>
Can reword this. The struct is never defined as far as I am aware so I
assumed it was another declaration of an opaque struct but this is not
necessarily the case
> >
> > Signed-off-by: Jamal Shareef <jamal.k.shareef@gmail.com>
> > ---
> > .../bcm2835-audio/bcm2835-vchiq.c | 2 +-
> > .../vc04_services/bcm2835-audio/bcm2835.h | 2 +-
> > .../vc04_services/bcm2835-camera/mmal-vchiq.c | 2 +-
> > .../vc04_services/interface/vchi/vchi.h | 12 +++---
> > .../interface/vchi/vchi_common.h | 2 +-
> > .../interface/vchiq_arm/vchiq_shim.c | 43 +++++++++----------
> > 6 files changed, 31 insertions(+), 32 deletions(-)
> >
> > diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> > index 84ece768854f..2022ff2388dc 100644
> > --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> > +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
> > @@ -122,7 +122,7 @@ static void audio_vchi_callback(void *param,
> > }
> >
> > static int
> > -vc_vchi_audio_init(VCHI_INSTANCE_T vchi_instance,
> > +vc_vchi_audio_init(struct vchi_instance_handle *vchi_instance,
> > struct bcm2835_audio_instance *instance)
> > {
> > struct service_creation params = {
> > diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
> > index ed0feb34b6c8..d2fe8d36ab7d 100644
> > --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
> > +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h
> > @@ -44,7 +44,7 @@ enum snd_bcm2835_ctrl {
> > };
> >
> > struct bcm2835_vchi_ctx {
> > - VCHI_INSTANCE_T vchi_instance;
> > + struct vchi_instance_handle *vchi_instance;
> > };
> >
> > /* definition of the chip-specific record */
> > diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
> > index 06b7be7d8872..0f4db2f24944 100644
> > --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
> > +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c
> > @@ -1814,7 +1814,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
> > {
> > int status;
> > struct vchiq_mmal_instance *instance;
> > - static VCHI_INSTANCE_T vchi_instance;
> > + static struct vchi_instance_handle *vchi_instance;
> > struct service_creation params = {
> > .version = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
> > .service_id = VC_MMAL_SERVER_NAME,
> > diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
> > index 75b1ab4919e3..5c8842114607 100644
> > --- a/drivers/staging/vc04_services/interface/vchi/vchi.h
> > +++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
> > @@ -50,7 +50,7 @@ struct service_creation {
> > };
> >
> > // Opaque handle for a VCHI instance
> > -typedef struct opaque_vchi_instance_handle_t *VCHI_INSTANCE_T;
> > +struct vchi_instance_handle;
> >
> > // Opaque handle for a server or client
> > typedef struct opaque_vchi_service_handle_t *VCHI_SERVICE_HANDLE_T;
> > @@ -65,20 +65,20 @@ extern "C" {
> > #endif
> >
> > // Routine used to initialise the vchi on both local + remote connections
> > -extern int32_t vchi_initialise(VCHI_INSTANCE_T *instance_handle);
> > +extern int32_t vchi_initialise(struct vchi_instance_handle **instance_handle);
> >
> > extern int32_t vchi_exit(void);
> >
> > -extern int32_t vchi_connect(VCHI_INSTANCE_T instance_handle);
> > +extern int32_t vchi_connect(struct vchi_instance_handle *instance_handle);
> >
> > //When this is called, ensure that all services have no data pending.
> > //Bulk transfers can remain 'queued'
> > -extern int32_t vchi_disconnect(VCHI_INSTANCE_T 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 uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);
> > +extern uint32_t vchi_current_time(struct vchi_instance_handle *instance_handle);
> >
> > /******************************************************************************
> > * Global service API
> > @@ -87,7 +87,7 @@ extern uint32_t vchi_current_time(VCHI_INSTANCE_T instance_handle);
> > extern int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle);
> >
> > // Routine to open a named service
> > -extern int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
> > +extern int32_t vchi_service_open(struct vchi_instance_handle *instance_handle,
> > struct service_creation *setup,
> > VCHI_SERVICE_HANDLE_T *handle);
> >
> > diff --git a/drivers/staging/vc04_services/interface/vchi/vchi_common.h b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
> > index c99735fc0308..fba37559aa83 100644
> > --- a/drivers/staging/vc04_services/interface/vchi/vchi_common.h
> > +++ b/drivers/staging/vc04_services/interface/vchi/vchi_common.h
> > @@ -86,7 +86,7 @@ enum vchi_service_option {
> > };
> >
> > //Callback used by all services / bulk transfers
> > -typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
> > + typedef void (*VCHI_CALLBACK_T)(void *callback_param, //my service local param
>
> Why the extra space?
>
> > enum vchi_callback_reason reason,
> > void *handle); //for transmitting msg's only
> >
> > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> > index 704afd470c88..a2434a68fc2f 100644
> > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
> > @@ -23,7 +23,7 @@ struct shim_service {
> > /***********************************************************
> > * Name: vchi_msg_peek
> > *
> > - * Arguments: const VCHI_SERVICE_HANDLE_T handle,
> > + * Arguments: VCHI_SERVICE_HANDLE_T handle,
>
> Did you change the const?
This is a leftover from the next patch. It was changed to match the
actual working code below which is not a const.
>
> > * void **data,
> > * uint32_t *msg_size,
> >
> > @@ -63,7 +63,7 @@ EXPORT_SYMBOL(vchi_msg_peek);
> > /***********************************************************
> > * Name: vchi_msg_remove
> > *
> > - * Arguments: const VCHI_SERVICE_HANDLE_T handle,
> > + * Arguments: VCHI_SERVICE_HANDLE_T handle,
>
> Huh? What does this change mean?
>
Same thing here, it does not belong in this patch but these function
descriptions were changed to match the working code below it, which is
not a const.
>
> > *
> > * Description: Routine to remove a message (after it has been read with
> > * vchi_msg_peek)
> > @@ -100,10 +100,9 @@ EXPORT_SYMBOL(vchi_msg_remove);
> > ***********************************************************/
> > static
> > int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
> > - ssize_t (*copy_callback)(void *context, void *dest,
> > - size_t offset, size_t maxsize),
> > - void *context,
> > - uint32_t data_size)
> > + ssize_t (*copy_callback)(void *context, void *dest,
> > + size_t offset, size_t maxsize),
> > + void *context, uint32_t data_size)
> > {
> > struct shim_service *service = (struct shim_service *)handle;
> > VCHIQ_STATUS_T status;
> > @@ -169,8 +168,7 @@ vchi_queue_user_message_callback(void *context,
> > }
> >
> > int
> > -vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle,
> > - void __user *data,
> > +vchi_queue_user_message(VCHI_SERVICE_HANDLE_T handle, void __user *data,
> > unsigned int size)
> > {
> > struct vchi_queue_user_message_context copycontext = {
> > @@ -187,7 +185,7 @@ EXPORT_SYMBOL(vchi_queue_user_message);
> > /***********************************************************
> > * Name: vchi_bulk_queue_receive
> > *
> > - * Arguments: VCHI_BULK_HANDLE_T handle,
> > + * Arguments: VCHI_SERVICE_HANDLE_T handle,
>
> Huh???
This description did not match the working code below it so it was
changed. This change was supposed to be a part of the next patch, or
possibly in an entirely new patch.
>
> > * void *data_dst,
> > * const uint32_t data_size,
> > * enum vchi_flags flags
> > @@ -245,7 +243,7 @@ EXPORT_SYMBOL(vchi_bulk_queue_receive);
> > /***********************************************************
> > * Name: vchi_bulk_queue_transmit
> > *
> > - * Arguments: VCHI_BULK_HANDLE_T handle,
> > + * Arguments: VCHI_SERVICE_HANDLE_T handle,
>
> Did you change this???
Same as above
>
> This series is "rough". Please take a day off, step back and try doing
> all of this "from scratch", doing only one thing per patch.
>
I will take some time to reassess and take in all the comments. Thank
you.
Jamal
> thanks,
>
> greg k-h
^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2019-11-03 21:41 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-03 4:36 [PATCH v5 00/10] staging: vc04_services: Remove typedefs Jamal Shareef
2019-11-03 4:36 ` [PATCH v5 01/10] staging: vc04_services: Remove instance struct typedef Jamal Shareef
2019-11-03 12:12 ` Greg KH
2019-11-03 21:41 ` Jamal Shareef
2019-11-03 4:36 ` [PATCH v5 02/10] staging: vc04_services: remove service " Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 03/10] staging: vc04_services: Rename function pointer typedef Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 04/10] staging: vc04_services: Remove vchiq_arm enum typedefs Jamal Shareef
2019-11-03 8:03 ` [Outreachy kernel] " Julia Lawall
2019-11-03 4:37 ` [PATCH v5 05/10] staging: vc04_services: Rename userdata callback Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 06/10] staging: vc04_services: Renames vchiq callback Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 07/10] staging: vc04_services: Renames remote use callback Jamal Shareef
2019-11-03 7:45 ` [Outreachy kernel] " Julia Lawall
2019-11-03 8:17 ` Stefan Wahren
2019-11-03 8:40 ` Julia Lawall
2019-11-03 13:04 ` Stefan Wahren
2019-11-03 4:37 ` [PATCH v5 08/10] staging: vc04_services: Remove int typedef Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 09/10] staging: vc04_services: Remove vchiq instance typedefs Jamal Shareef
2019-11-03 4:37 ` [PATCH v5 10/10] staging: vc04_services: Removes platform struct typedef Jamal Shareef
2019-11-03 7:14 ` [Outreachy kernel] " Julia Lawall
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.