staging: vc04_services: Remove typedef struct
Subsystems (2)
PATCH v2 1/1 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
---
Changes in v2:
-Convert structure name to lowercase
.../vc04_services/interface/vchiq_arm/vchiq_shim.c | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-)
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +22 -22
@@ -41,14 +41,14 @@#define vchiq_status_to_vchi (status) ((int32_t)status) -typedef struct { +struct shim_service {VCHIQ_SERVICE_HANDLE_T handle;VCHIU_QUEUE_T queue;VCHI_CALLBACK_T callback;void *callback_param; -}SHIM_SERVICE_T ; +};/* ---------------------------------------------------------------------- * return pointer to the mphi message driver function table
@@ -99,7 +99,7 @@ int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle, uint32_t *msg_size, VCHI_FLAGS_T flags) { -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;VCHIQ_HEADER_T *header; WARN_ON((flags != VCHI_FLAGS_NONE) &&
@@ -131,7 +131,7 @@ int32_t vchi_msg_peek(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; header =vchiu_queue_pop (&service->queue);
@@ -163,7 +163,7 @@ int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle, void *context, uint32_t data_size) { -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;VCHIQ_STATUS_T status;while (1 ) {
@@ -262,7 +262,7 @@ int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle,VCHI_FLAGS_T flags, 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_STATUS_T status;
@@ -322,7 +322,7 @@ int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,VCHI_FLAGS_T flags, 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_STATUS_T status;
@@ -384,7 +384,7 @@ int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle, uint32_t *actual_msg_size, VCHI_FLAGS_T flags) { -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;VCHIQ_HEADER_T *header; WARN_ON((flags != VCHI_FLAGS_NONE) &&
@@ -458,7 +458,7 @@ int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle,VCHI_FLAGS_T flags, 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; WARN_ON((flags != VCHI_FLAGS_NONE) &&
@@ -579,8 +579,8 @@ int32_t vchi_disconnect(VCHI_INSTANCE_T instance_handle)static VCHIQ_STATUS_T shim_callback (VCHIQ_REASON_T reason,VCHIQ_HEADER_T *header,VCHIQ_SERVICE_HANDLE_T handle,void *bulk_user) { -SHIM_SERVICE_T *service = - (SHIM_SERVICE_T *)VCHIQ_GET_SERVICE_USERDATA (handle); +struct shim_service *service = + (struct shim_service *)VCHIQ_GET_SERVICE_USERDATA (handle);if (!service->callback) goto release;
@@ -637,10 +637,10 @@ static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,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) { -SHIM_SERVICE_T *service =kzalloc (sizeof (SHIM_SERVICE_T ),GFP_KERNEL ); +struct shim_service *service =kzalloc (sizeof (struct shim_service ),GFP_KERNEL ); (void )instance;
@@ -657,7 +657,7 @@ static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance,return service; } -static void service_free (SHIM_SERVICE_T *service) +static void service_free (struct shim_service *service) {if (service) {vchiu_queue_delete (&service->queue);
@@ -670,7 +670,7 @@ int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle, VCHI_SERVICE_HANDLE_T *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;
@@ -703,7 +703,7 @@ int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle, VCHI_SERVICE_HANDLE_T *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;
@@ -733,7 +733,7 @@ int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle,int32_t vchi_service_close (const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) {VCHIQ_STATUS_T status =vchiq_close_service (service->handle);
@@ -751,7 +751,7 @@ int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle)int32_t vchi_service_destroy (const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) {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, int value) {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;switch (option) {
@@ -801,7 +801,7 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,int32_t vchi_get_peer_version (const VCHI_SERVICE_HANDLE_T handle,short *peer_version) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) {
@@ -828,7 +828,7 @@ int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) ret =vchiq_status_to_vchi (vchiq_use_service (service->handle));return ret;
@@ -849,7 +849,7 @@ int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) ret =vchiq_status_to_vchi (vchiq_release_service (service->handle));
Signature · 1 line
1.9.1
Quoted 40 lines · Harsha Sharma
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;
@@(quoted diff) +1
-1-T +struct T2
Quoted 1 line
Signed-off-by Harsha Sharma <[email protected]>
Quoted 206 lines
---
Changes in v2:
-Convert structure name to lowercase.../vc04_services/interface/vchiq_arm/vchiq_shim.c | 44 +++++++++++----------- 1 file changed, 22 insertions(+), 22 deletions(-)drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c +22
-23@@ -41,14 +41,14 @@#define vchiq_status_to_vchi (status) ((int32_t)status) -typedef struct { +struct shim_service {VCHIQ_SERVICE_HANDLE_T handle;VCHIU_QUEUE_T queue;VCHI_CALLBACK_T callback;void *callback_param; -}SHIM_SERVICE_T ; +};/* ---------------------------------------------------------------------- * return pointer to the mphi message driver function table @@ -99,7 +99,7 @@ int32_t vchi_msg_peek(VCHI_SERVICE_HANDLE_T handle, uint32_t *msg_size, VCHI_FLAGS_T flags) { -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;VCHIQ_HEADER_T *header; WARN_ON((flags != VCHI_FLAGS_NONE) &&@@ -131,7 +131,7 @@ int32_t vchi_msg_peek(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; header =vchiu_queue_pop (&service->queue);@@ -163,7 +163,7 @@ int32_t vchi_msg_queue(VCHI_SERVICE_HANDLE_T handle, void *context, uint32_t data_size) { -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;VCHIQ_STATUS_T status;while (1 ) {@@ -262,7 +262,7 @@ int32_t vchi_bulk_queue_receive(VCHI_SERVICE_HANDLE_T handle,VCHI_FLAGS_T flags, 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_STATUS_T status;@@ -322,7 +322,7 @@ int32_t vchi_bulk_queue_transmit(VCHI_SERVICE_HANDLE_T handle,VCHI_FLAGS_T flags, 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_STATUS_T status;@@ -384,7 +384,7 @@ int32_t vchi_msg_dequeue(VCHI_SERVICE_HANDLE_T handle, uint32_t *actual_msg_size, VCHI_FLAGS_T flags) { -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;VCHIQ_HEADER_T *header; WARN_ON((flags != VCHI_FLAGS_NONE) &&@@ -458,7 +458,7 @@ int32_t vchi_msg_hold(VCHI_SERVICE_HANDLE_T handle,VCHI_FLAGS_T flags, 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; WARN_ON((flags != VCHI_FLAGS_NONE) &&@@ -579,8 +579,8 @@ int32_t vchi_disconnect(VCHI_INSTANCE_T instance_handle)static VCHIQ_STATUS_T shim_callback (VCHIQ_REASON_T reason,VCHIQ_HEADER_T *header,VCHIQ_SERVICE_HANDLE_T handle,void *bulk_user) { -SHIM_SERVICE_T *service = - (SHIM_SERVICE_T *)VCHIQ_GET_SERVICE_USERDATA (handle); +struct shim_service *service = + (struct shim_service *)VCHIQ_GET_SERVICE_USERDATA (handle);if (!service->callback) goto release;@@ -637,10 +637,10 @@ static VCHIQ_STATUS_T shim_callback(VCHIQ_REASON_T reason,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) { -SHIM_SERVICE_T *service =kzalloc (sizeof (SHIM_SERVICE_T ),GFP_KERNEL ); +struct shim_service *service =kzalloc (sizeof (struct shim_service ),GFP_KERNEL ); (void )instance;@@ -657,7 +657,7 @@ static SHIM_SERVICE_T *service_alloc(VCHIQ_INSTANCE_T instance,return service; } -static void service_free (SHIM_SERVICE_T *service) +static void service_free (struct shim_service *service) {if (service) {vchiu_queue_delete (&service->queue);@@ -670,7 +670,7 @@ int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle, VCHI_SERVICE_HANDLE_T *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;@@ -703,7 +703,7 @@ int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle, VCHI_SERVICE_HANDLE_T *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;@@ -733,7 +733,7 @@ int32_t vchi_service_create(VCHI_INSTANCE_T instance_handle,int32_t vchi_service_close (const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) {VCHIQ_STATUS_T status =vchiq_close_service (service->handle);@@ -751,7 +751,7 @@ int32_t vchi_service_close(const VCHI_SERVICE_HANDLE_T handle)int32_t vchi_service_destroy (const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) {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, int value) {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;switch (option) {@@ -801,7 +801,7 @@ int32_t vchi_service_set_option(const VCHI_SERVICE_HANDLE_T handle,int32_t vchi_get_peer_version (const VCHI_SERVICE_HANDLE_T handle,short *peer_version) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) {@@ -828,7 +828,7 @@ int32_t vchi_service_use(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) ret =vchiq_status_to_vchi (vchiq_use_service (service->handle));return ret;@@ -849,7 +849,7 @@ int32_t vchi_service_release(const VCHI_SERVICE_HANDLE_T handle) {int32_t ret =-1 ; -SHIM_SERVICE_T *service = (SHIM_SERVICE_T *)handle; +struct shim_service *service = (struct shim_service *)handle;if (service) ret =vchiq_status_to_vchi (vchiq_release_service (service->handle)); --1.9.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 [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/1506065823-22769-1-git-send-email-harshasharmaiitr%40gmail.com.
For more options, visit https://groups.google.com/d/optout.