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

staging: vc04_services: Remove VCHIQ_AWAIT_COMPLETION_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 e376ef35

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

+4 −4
Original line number Diff line number Diff line
@@ -1158,7 +1158,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
	} break;



	case VCHIQ_IOC_AWAIT_COMPLETION: {

		VCHIQ_AWAIT_COMPLETION_T args;

		struct vchiq_await_completion args;



		DEBUG_TRACE(AWAIT_COMPLETION_LINE);

		if (!instance->connected) {
@@ -1301,8 +1301,8 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


			if (msgbufcount != args.msgbufcount) {

				if (copy_to_user((void __user *)

					&((VCHIQ_AWAIT_COMPLETION_T *)arg)->

						msgbufcount,

					&((struct vchiq_await_completion *)arg)

						->msgbufcount,

					&msgbufcount,

					sizeof(msgbufcount)) != 0) {

					ret = -EFAULT;
@@ -1725,7 +1725,7 @@ vchiq_compat_ioctl_await_completion(struct file *file, 
				    unsigned int cmd,

				    unsigned long arg)

{

	VCHIQ_AWAIT_COMPLETION_T __user *args;

	struct vchiq_await_completion __user *args;

	VCHIQ_COMPLETION_DATA_T __user *completion;

	VCHIQ_COMPLETION_DATA_T completiontemp;

	struct vchiq_await_completion32 args32;

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

+3 −3
Original line number Diff line number Diff line
@@ -68,13 +68,13 @@ typedef struct { 
	void *bulk_userdata;

} VCHIQ_COMPLETION_DATA_T;



typedef struct {

struct vchiq_await_completion {

	unsigned int count;

	VCHIQ_COMPLETION_DATA_T *buf;

	unsigned int msgbufsize;

	unsigned int msgbufcount; /* IN/OUT */

	void **msgbufs;

} VCHIQ_AWAIT_COMPLETION_T;

};



typedef struct {

	unsigned int handle;
@@ -111,7 +111,7 @@ typedef struct { 
#define VCHIQ_IOC_QUEUE_BULK_RECEIVE \

	_IOWR(VCHIQ_IOC_MAGIC, 6, VCHIQ_QUEUE_BULK_TRANSFER_T)

#define VCHIQ_IOC_AWAIT_COMPLETION \

	_IOWR(VCHIQ_IOC_MAGIC, 7, VCHIQ_AWAIT_COMPLETION_T)

	_IOWR(VCHIQ_IOC_MAGIC, 7, struct vchiq_await_completion)

#define VCHIQ_IOC_DEQUEUE_MESSAGE \

	_IOWR(VCHIQ_IOC_MAGIC, 8, VCHIQ_DEQUEUE_MESSAGE_T)

#define VCHIQ_IOC_GET_CLIENT_ID        _IO(VCHIQ_IOC_MAGIC,   9)