Skip to content

L
linux
Commit a050fe5c authored by Harsha Sharma's avatar Harsha Sharma Committed by Greg Kroah-Hartman
Browse files
Options

staging: vc04_services: Remove typedef struct 

Remove typedef from struct as linux-kernel coding style tends to
avoid using typedefs

Done using following coccinelle semantic patch

@r1@
type T;
@@

typedef struct { ... } T;

@script:python c1@
T2;
T << r1.T;
@@
if T[-2:] =="_t" or T[-2:] == "_T":
        coccinelle.T2 = T[:-2];
else:
        coccinelle.T2 = T;

print T, coccinelle.T2

@r2@
type r1.T;
identifier c1.T2;
@@
-typedef
struct
+ T2
{ ... }
-T
;

@r3@
type r1.T;
identifier c1.T2;
@@
-T
+struct T2
Signed-off-by: default avatarHarsha Sharma <harshasharmaiitr@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ee0dd523
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 22 deletions
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
View file @ a050fe5c
...@@ -41,14 +41,14 @@ ...@@ -41,14 +41,14 @@
#define vchiq_status_to_vchi(status) ((int32_t)status) #define vchiq_status_to_vchi(status) ((int32_t)status)
typedef struct { struct shim_service {
VCHIQ_SERVICE_HANDLE_T handle; VCHIQ_SERVICE_HANDLE_T handle;
VCHIU_QUEUE_T queue; VCHIU_QUEUE_T queue;
VCHI_CALLBACK_T callback; VCHI_CALLBACK_T callback;
void *callback_param; void *callback_param;
} SHIM_SERVICE_T; };
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
* return pointer to the mphi message driver function table * return pointer to the mphi message driver function table
...@@ -99,7 +99,7 @@ int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle, ...@@ -99,7 +99,7 @@ int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle,
uint32_t *msg_size, uint32_t *msg_size,
VCHI_FLAGS_T flags) VCHI_FLAGS_T flags)
{ {
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_HEADER_T *header; VCHIQ_HEADER_T *header;
WARN_ON((flags != VCHI_FLAGS_NONE) && WARN_ON((flags != VCHI_FLAGS_NONE) &&
...@@ -131,7 +131,7 @@ EXPORT_SYMBOL(vchi_msg_peek); ...@@ -131,7 +131,7 @@ EXPORT_SYMBOL(vchi_msg_peek);
***********************************************************/ ***********************************************************/
int32_t vchi_msg_remove(VCHI_SERVICE_HANDLE_T handle) int32_t vchi_msg_remove(VCHI_SERVICE_HANDLE_T handle)
{ {
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_HEADER_T *header; VCHIQ_HEADER_T *header;
header = vchiu_queue_pop(&service->queue); header = vchiu_queue_pop(&service->queue);
...@@ -163,7 +163,7 @@ int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle, ...@@ -163,7 +163,7 @@ int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle,
void *context, void *context,
uint32_t data_size) uint32_t data_size)
{ {
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_STATUS_T status; VCHIQ_STATUS_T status;
while (1) { while (1) {
...@@ -262,7 +262,7 @@ int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle, ...@@ -262,7 +262,7 @@ int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle,
VCHI_FLAGS_T flags, VCHI_FLAGS_T flags,
void *bulk_handle) void *bulk_handle)
{ {
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_BULK_MODE_T mode; VCHIQ_BULK_MODE_T mode;
VCHIQ_STATUS_T status; VCHIQ_STATUS_T status;
...@@ -322,7 +322,7 @@ int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle, ...@@ -322,7 +322,7 @@ int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,
VCHI_FLAGS_T flags, VCHI_FLAGS_T flags,
void *bulk_handle) void *bulk_handle)
{ {
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_BULK_MODE_T mode; VCHIQ_BULK_MODE_T mode;
VCHIQ_STATUS_T status; VCHIQ_STATUS_T status;
...@@ -384,7 +384,7 @@ int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle, ...@@ -384,7 +384,7 @@ int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle,
uint32_t *actual_msg_size, uint32_t *actual_msg_size,
VCHI_FLAGS_T flags) VCHI_FLAGS_T flags)
{ {
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_HEADER_T *header; VCHIQ_HEADER_T *header;
WARN_ON((flags != VCHI_FLAGS_NONE) && WARN_ON((flags != VCHI_FLAGS_NONE) &&
...@@ -458,7 +458,7 @@ int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle, ...@@ -458,7 +458,7 @@ int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle,
VCHI_FLAGS_T flags, VCHI_FLAGS_T flags,
VCHI_HELD_MSG_T *message_handle) VCHI_HELD_MSG_T *message_handle)
{ {
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_HEADER_T *header; VCHIQ_HEADER_T *header;
WARN_ON((flags != VCHI_FLAGS_NONE) && WARN_ON((flags != VCHI_FLAGS_NONE) &&
...@@ -579,8 +579,8 @@ EXPORT_SYMBOL(vchi_disconnect); ...@@ -579,8 +579,8 @@ EXPORT_SYMBOL(vchi_disconnect);
static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason, static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,
VCHIQ_HEADER_T *header, VCHIQ_SERVICE_HANDLE_T handle, void *bulk_user) VCHIQ_HEADER_T *header, VCHIQ_SERVICE_HANDLE_T handle, void *bulk_user)
{ {
SHIM_SERVICE_T *service = struct shim_service *service =
(SHIM_SERVICE_T *)VCHIQ_GET_SERVICE_USERDATA(handle); (struct shim_service *)VCHIQ_GET_SERVICE_USERDATA(handle);
if (!service->callback) if (!service->callback)
goto release; goto release;
...@@ -637,10 +637,10 @@ static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason, ...@@ -637,10 +637,10 @@ static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,
return VCHIQ_SUCCESS; return VCHIQ_SUCCESS;
} }
static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance, static struct shim_service *service_alloc(VCHIQ_INSTANCE_T instance,
SERVICE_CREATION_T *setup) SERVICE_CREATION_T *setup)
{ {
SHIM_SERVICE_T *service = kzalloc(sizeof(SHIM_SERVICE_T), GFP_KERNEL); struct shim_service *service = kzalloc(sizeof(struct shim_service), GFP_KERNEL);
(void)instance; (void)instance;
...@@ -657,7 +657,7 @@ static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance, ...@@ -657,7 +657,7 @@ static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance,
return service; return service;
} }
static void service_free(SHIM_SERVICE_T *service) static void service_free(struct shim_service *service)
{ {
if (service) { if (service) {
vchiu_queue_delete(&service->queue); vchiu_queue_delete(&service->queue);
...@@ -670,7 +670,7 @@ int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle, ...@@ -670,7 +670,7 @@ int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
VCHI_SERVICE_HANDLE_T *handle) VCHI_SERVICE_HANDLE_T *handle)
{ {
VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle; VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
SHIM_SERVICE_T *service = service_alloc(instance, setup); struct shim_service *service = service_alloc(instance, setup);
*handle = (VCHI_SERVICE_HANDLE_T)service; *handle = (VCHI_SERVICE_HANDLE_T)service;
...@@ -703,7 +703,7 @@ int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle, ...@@ -703,7 +703,7 @@ int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle,
VCHI_SERVICE_HANDLE_T *handle) VCHI_SERVICE_HANDLE_T *handle)
{ {
VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle; VCHIQ_INSTANCE_T instance = (VCHIQ_INSTANCE_T)instance_handle;
SHIM_SERVICE_T *service = service_alloc(instance, setup); struct shim_service *service = service_alloc(instance, setup);
*handle = (VCHI_SERVICE_HANDLE_T)service; *handle = (VCHI_SERVICE_HANDLE_T)service;
...@@ -733,7 +733,7 @@ EXPORT_SYMBOL(vchi_service_create); ...@@ -733,7 +733,7 @@ EXPORT_SYMBOL(vchi_service_create);
int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle) int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle)
{ {
int32_t ret = -1; int32_t ret = -1;
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
if (service) { if (service) {
VCHIQ_STATUS_T status = vchiq_close_service(service->handle); VCHIQ_STATUS_T status = vchiq_close_service(service->handle);
...@@ -751,7 +751,7 @@ EXPORT_SYMBOL(vchi_service_close); ...@@ -751,7 +751,7 @@ EXPORT_SYMBOL(vchi_service_close);
int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle) int32_t vchi_service_destroy(const VCHI_SERVICE_HANDLE_T handle)
{ {
int32_t ret = -1; int32_t ret = -1;
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
if (service) { if (service) {
VCHIQ_STATUS_T status = vchiq_remove_service(service->handle); VCHIQ_STATUS_T status = vchiq_remove_service(service->handle);
...@@ -772,7 +772,7 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle, ...@@ -772,7 +772,7 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,
int value) int value)
{ {
int32_t ret = -1; int32_t ret = -1;
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
VCHIQ_SERVICE_OPTION_T vchiq_option; VCHIQ_SERVICE_OPTION_T vchiq_option;
switch (option) { switch (option) {
...@@ -801,7 +801,7 @@ EXPORT_SYMBOL(vchi_service_set_option); ...@@ -801,7 +801,7 @@ 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; int32_t ret = -1;
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
if (service) if (service)
{ {
...@@ -828,7 +828,7 @@ int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle) ...@@ -828,7 +828,7 @@ int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle)
{ {
int32_t ret = -1; int32_t ret = -1;
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
if (service) if (service)
ret = vchiq_status_to_vchi(vchiq_use_service(service->handle)); ret = vchiq_status_to_vchi(vchiq_use_service(service->handle));
return ret; return ret;
...@@ -849,7 +849,7 @@ int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle) ...@@ -849,7 +849,7 @@ int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle)
{ {
int32_t ret = -1; int32_t ret = -1;
SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; struct shim_service *service = (struct shim_service *)handle;
if (service) if (service)
ret = vchiq_status_to_vchi( ret = vchiq_status_to_vchi(
vchiq_release_service(service->handle)); vchiq_release_service(service->handle));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7