Typedefing structs is not encouraged in the kernel.

The removal of typedefs was requested in interface/vchi/TODO in commit
7626e002225a4c1b9455689b1f22909dfeff43ca.

Signed-off-by: Dominic Braun <inf.br...@fau.de>
Signed-off-by: Tobias Büttner <tobias.buett...@fau.de>
---
 .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 +++---
 .../vc04_services/interface/vchiq_arm/vchiq_core.c        | 2 +-
 .../vc04_services/interface/vchiq_arm/vchiq_core.h        | 2 +-
 .../staging/vc04_services/interface/vchiq_arm/vchiq_if.h  | 8 ++++----
 .../vc04_services/interface/vchiq_arm/vchiq_ioctl.h       | 2 +-
 .../vc04_services/interface/vchiq_arm/vchiq_shim.c        | 2 +-
 6 files changed, 11 insertions(+), 11 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 f493322826b3..8df4e1a33fd5 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -330,7 +330,7 @@ EXPORT_SYMBOL(vchiq_connect);
 
 VCHIQ_STATUS_T vchiq_add_service(
        VCHIQ_INSTANCE_T              instance,
-       const VCHIQ_SERVICE_PARAMS_T *params,
+       const struct vchiq_service_params_struct *params,
        VCHIQ_SERVICE_HANDLE_T       *phandle)
 {
        VCHIQ_STATUS_T status;
@@ -369,7 +369,7 @@ EXPORT_SYMBOL(vchiq_add_service);
 
 VCHIQ_STATUS_T vchiq_open_service(
        VCHIQ_INSTANCE_T              instance,
-       const VCHIQ_SERVICE_PARAMS_T *params,
+       const struct vchiq_service_params_struct *params,
        VCHIQ_SERVICE_HANDLE_T       *phandle)
 {
        VCHIQ_STATUS_T   status = VCHIQ_ERROR;
@@ -2338,7 +2338,7 @@ vchiq_keepalive_thread_func(void *v)
        VCHIQ_INSTANCE_T instance;
        VCHIQ_SERVICE_HANDLE_T ka_handle;
 
-       VCHIQ_SERVICE_PARAMS_T params = {
+       struct vchiq_service_params_struct params = {
                .fourcc      = VCHIQ_MAKE_FOURCC('K', 'E', 'E', 'P'),
                .callback    = vchiq_keepalive_vchiq_callback,
                .version     = KEEPALIVE_VER,
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 e4b706635e4b..b22f1ec44f62 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -2321,7 +2321,7 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T 
*slot_zero)
 /* Called from application thread when a client or server service is created. 
*/
 VCHIQ_SERVICE_T *
 vchiq_add_service_internal(VCHIQ_STATE_T *state,
-       const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,
+       const struct vchiq_service_params_struct *params, int srvstate,
        VCHIQ_INSTANCE_T instance, VCHIQ_USERDATA_TERM_T userdata_term)
 {
        VCHIQ_SERVICE_T *service;
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 f4f4d3677ba9..8ee881faf179 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -531,7 +531,7 @@ vchiq_connect_internal(VCHIQ_STATE_T *state, 
VCHIQ_INSTANCE_T instance);
 
 extern VCHIQ_SERVICE_T *
 vchiq_add_service_internal(VCHIQ_STATE_T *state,
-       const VCHIQ_SERVICE_PARAMS_T *params, int srvstate,
+       const struct vchiq_service_params_struct *params, int srvstate,
        VCHIQ_INSTANCE_T instance, VCHIQ_USERDATA_TERM_T userdata_term);
 
 extern VCHIQ_STATUS_T
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 458c36d599aa..7cec5eab9518 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -104,13 +104,13 @@ struct vchiq_service_base_struct {
        void *userdata;
 };
 
-typedef struct vchiq_service_params_struct {
+struct vchiq_service_params_struct {
        int fourcc;
        VCHIQ_CALLBACK_T callback;
        void *userdata;
        short version;       /* Increment for non-trivial changes */
        short version_min;   /* Update for incompatible changes */
-} VCHIQ_SERVICE_PARAMS_T;
+};
 
 struct vchiq_config_struct {
        unsigned int max_msg_size;
@@ -130,10 +130,10 @@ 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,
-       const VCHIQ_SERVICE_PARAMS_T *params,
+       const struct vchiq_service_params_struct *params,
        VCHIQ_SERVICE_HANDLE_T *pservice);
 extern VCHIQ_STATUS_T vchiq_open_service(VCHIQ_INSTANCE_T instance,
-       const VCHIQ_SERVICE_PARAMS_T *params,
+       const struct vchiq_service_params_struct *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);
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 bc47e9161dc4..dc4653e08af9 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -41,7 +41,7 @@
 #define VCHIQ_INVALID_HANDLE (~0)
 
 struct vchiq_create_service_struct {
-       VCHIQ_SERVICE_PARAMS_T params;
+       struct vchiq_service_params_struct params;
        int is_open;
        int is_vchi;
        unsigned int handle;       /* OUT */
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 1a2a96cd60ff..350d9fd2d944 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -639,7 +639,7 @@ int32_t vchi_service_open(VCHI_INSTANCE_T instance_handle,
        *handle = (VCHI_SERVICE_HANDLE_T)service;
 
        if (service) {
-               VCHIQ_SERVICE_PARAMS_T params;
+               struct vchiq_service_params_struct params;
                VCHIQ_STATUS_T status;
 
                memset(&params, 0, sizeof(params));
-- 
2.17.1

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to