staging: vc04_services: Remove VCHIQ_CONFIG_T typedef

Typedefing structs is not encouraged in the kernel.

Signed-off-by: Dominic Braun <inf.braun@fau.de>
Signed-off-by: Tobias Büttner <tobias.buettner@fau.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 3b5a816ffb12f41b8c44fde5c3cd6ce5f98bcadd..ffc39014eabfdc27f411731b147fbfe137bfb922 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -1408,7 +1408,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 
        case VCHIQ_IOC_GET_CONFIG: {
                VCHIQ_GET_CONFIG_T args;
-               VCHIQ_CONFIG_T config;
+               struct vchiq_config config;
 
                if (copy_from_user(&args, (const void __user *)arg,
                        sizeof(args)) != 0) {

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 10785ab3ec1ec7cc208e61049ac3a7c82834cf71..a0ca2d154db3d6d613d9eeb395349a701800792d 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -3271,7 +3271,7 @@ vchiq_get_peer_version(VCHIQ_SERVICE_HANDLE_T handle, short *peer_version)
        return status;
 }
 
-void vchiq_get_config(VCHIQ_CONFIG_T *config)
+void vchiq_get_config(struct vchiq_config *config)
 {
        config->max_msg_size           = VCHIQ_MAX_MSG_SIZE;
        config->bulk_threshold         = VCHIQ_MAX_MSG_SIZE;

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 0cdaebee902dae8a48e46a1239b545e7b8115c5b..0014715e0aca909b89b63c66920b31f860039480 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_if.h
@@ -110,7 +110,7 @@ typedef struct vchiq_service_params_struct {
        short version_min;   /* Update for incompatible changes */
 } VCHIQ_SERVICE_PARAMS_T;
 
-typedef struct vchiq_config_struct {
+struct vchiq_config {
        unsigned int max_msg_size;
        unsigned int bulk_threshold; /* The message size above which it
                                        is better to use a bulk transfer
@@ -119,7 +119,7 @@ typedef struct vchiq_config_struct {
        unsigned int max_services;
        short version;      /* The version of VCHIQ */
        short version_min;  /* The minimum compatible version of VCHIQ */
-} VCHIQ_CONFIG_T;
+};
 
 typedef struct vchiq_instance_struct *VCHIQ_INSTANCE_T;
 typedef void (*VCHIQ_REMOTE_USE_CALLBACK_T)(void *cb_arg);
@@ -162,7 +162,7 @@ extern VCHIQ_STATUS_T vchiq_bulk_receive_handle(VCHIQ_SERVICE_HANDLE_T service,
 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(VCHIQ_CONFIG_T *config);
+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);
 

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 251c82b9ea22a2f6511a2b2582688cf1f760cf57..7c16f82392a4c8c32fca2a61d0a6ac9d7c2ef33e 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -85,7 +85,7 @@ typedef struct {
 
 typedef struct {
        unsigned int config_size;
-       VCHIQ_CONFIG_T __user *pconfig;
+       struct vchiq_config __user *pconfig;
 } VCHIQ_GET_CONFIG_T;
 
 typedef struct {