Commit 56294328 authored by Dominic Braun's avatar Dominic Braun Committed by Greg Kroah-Hartman
Browse files

staging: vc04_services: Remove VCHIQ_CREATE_SERVICE_T typedef 



Typedefing structs is not encouraged in the kernel.

Signed-off-by: default avatarDominic Braun <inf.braun@fau.de>
Signed-off-by: default avatarTobias Büttner <tobias.buettner@fau.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8b867447

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h

+3 −3
Original line number Diff line number Diff line
@@ -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)