[PATCH 15/33] staging: vc04_services: Remove VCHIQ_CREATE_SERVICE_T typedef

[Dominic Braun]

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 +++---
 .../staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h | 6 +++---
 2 files changed, 6 insertions(+), 6 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 eab0e20eea02..0067e383e264 100644
--- 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_struct args;
                struct user_service_struct *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_struct __user *)
                                        arg)->handle),
                                (const void *)&service->handle,
                                sizeof(service->handle)) != 0) {
@@ -1534,7 +1534,7 @@ vchiq_compat_ioctl_create_service(
        unsigned int cmd,
        unsigned long arg)
 {
-       VCHIQ_CREATE_SERVICE_T __user *args;
+       struct vchiq_create_service_struct __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 547be1ee84d8..eab17f03a0ba 100644
--- 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_struct {
        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_struct)
 #define VCHIQ_IOC_REMOVE_SERVICE       _IO(VCHIQ_IOC_MAGIC,   3)
 #define VCHIQ_IOC_QUEUE_MESSAGE \
        _IOW(VCHIQ_IOC_MAGIC,  4, VCHIQ_QUEUE_MESSAGE_T)
-- 
2.17.1

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