staging: vc04_services: Remove VCHIQ_CREATE_SERVICE_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 ffc39014eabfdc27f411731b147fbfe137bfb922..1bb298fd4be7dfc77fbd723e48c8e572ccaac6d6 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -896,7 +896,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                break;
 
        case VCHIQ_IOC_CREATE_SERVICE: {
-               VCHIQ_CREATE_SERVICE_T args;
+               struct vchiq_create_service args;
                struct user_service *user_service = NULL;
                void *userdata;
                int srvstate;
@@ -964,7 +964,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                        }
 
                        if (copy_to_user((void __user *)
-                               &(((VCHIQ_CREATE_SERVICE_T __user *)
+                               &(((struct vchiq_create_service __user *)
                                        arg)->handle),
                                (const void *)&service->handle,
                                sizeof(service->handle)) != 0) {
@@ -1530,7 +1530,7 @@ vchiq_compat_ioctl_create_service(
        unsigned int cmd,
        unsigned long arg)
 {
-       VCHIQ_CREATE_SERVICE_T __user *args;
+       struct vchiq_create_service __user *args;
        struct vchiq_create_service32 __user *ptrargs32 =
                (struct vchiq_create_service32 __user *)arg;
        struct vchiq_create_service32 args32;

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 7c16f82392a4c8c32fca2a61d0a6ac9d7c2ef33e..89592ae90b8cd8922b4759f0746e0fbf1ab78e85 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -40,12 +40,12 @@
 #define VCHIQ_IOC_MAGIC 0xc4
 #define VCHIQ_INVALID_HANDLE (~0)
 
-typedef struct {
+struct vchiq_create_service {
        VCHIQ_SERVICE_PARAMS_T params;
        int is_open;
        int is_vchi;
        unsigned int handle;       /* OUT */
-} VCHIQ_CREATE_SERVICE_T;
+};
 
 typedef struct {
        unsigned int handle;
@@ -102,7 +102,7 @@ typedef struct {
 #define VCHIQ_IOC_CONNECT              _IO(VCHIQ_IOC_MAGIC,   0)
 #define VCHIQ_IOC_SHUTDOWN             _IO(VCHIQ_IOC_MAGIC,   1)
 #define VCHIQ_IOC_CREATE_SERVICE \
-       _IOWR(VCHIQ_IOC_MAGIC, 2, VCHIQ_CREATE_SERVICE_T)
+       _IOWR(VCHIQ_IOC_MAGIC, 2, struct vchiq_create_service)
 #define VCHIQ_IOC_REMOVE_SERVICE       _IO(VCHIQ_IOC_MAGIC,   3)
 #define VCHIQ_IOC_QUEUE_MESSAGE \
        _IOW(VCHIQ_IOC_MAGIC,  4, VCHIQ_QUEUE_MESSAGE_T)