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

staging: vc04_services: Remove VCHIQ_QUEUE_BULK_TRANSFER_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 e8968525

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

+3 −3
Original line number Diff line number Diff line
@@ -1069,7 +1069,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


	case VCHIQ_IOC_QUEUE_BULK_TRANSMIT:

	case VCHIQ_IOC_QUEUE_BULK_RECEIVE: {

		VCHIQ_QUEUE_BULK_TRANSFER_T args;

		struct vchiq_queue_bulk_transfer args;

		struct bulk_waiter_node *waiter = NULL;



		VCHIQ_BULK_DIR_T dir =
@@ -1149,7 +1149,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
				waiter, current->pid);



			if (copy_to_user((void __user *)

				&(((VCHIQ_QUEUE_BULK_TRANSFER_T __user *)

				&(((struct vchiq_queue_bulk_transfer __user *)

					arg)->mode),

				(const void *)&mode_waiting,

				sizeof(mode_waiting)) != 0)
@@ -1660,7 +1660,7 @@ vchiq_compat_ioctl_queue_bulk(struct file *file, 
			      unsigned int cmd,

			      unsigned long arg)

{

	VCHIQ_QUEUE_BULK_TRANSFER_T __user *args;

	struct vchiq_queue_bulk_transfer __user *args;

	struct vchiq_queue_bulk_transfer32 args32;

	struct vchiq_queue_bulk_transfer32 *ptrargs32 =

		(struct vchiq_queue_bulk_transfer32 *)arg;

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

+4 −4
Original line number Diff line number Diff line
@@ -53,13 +53,13 @@ typedef struct { 
	const struct vchiq_element __user *elements;

} VCHIQ_QUEUE_MESSAGE_T;



typedef struct {

struct vchiq_queue_bulk_transfer {

	unsigned int handle;

	void *data;

	unsigned int size;

	void *userdata;

	VCHIQ_BULK_MODE_T mode;

} VCHIQ_QUEUE_BULK_TRANSFER_T;

};



struct vchiq_completion_data {

	VCHIQ_REASON_T reason;
@@ -107,9 +107,9 @@ struct vchiq_dump_mem { 
#define VCHIQ_IOC_QUEUE_MESSAGE \

	_IOW(VCHIQ_IOC_MAGIC,  4, VCHIQ_QUEUE_MESSAGE_T)

#define VCHIQ_IOC_QUEUE_BULK_TRANSMIT \

	_IOWR(VCHIQ_IOC_MAGIC, 5, VCHIQ_QUEUE_BULK_TRANSFER_T)

	_IOWR(VCHIQ_IOC_MAGIC, 5, struct vchiq_queue_bulk_transfer)

#define VCHIQ_IOC_QUEUE_BULK_RECEIVE \

	_IOWR(VCHIQ_IOC_MAGIC, 6, VCHIQ_QUEUE_BULK_TRANSFER_T)

	_IOWR(VCHIQ_IOC_MAGIC, 6, struct vchiq_queue_bulk_transfer)

#define VCHIQ_IOC_AWAIT_COMPLETION \

	_IOWR(VCHIQ_IOC_MAGIC, 7, struct vchiq_await_completion)

#define VCHIQ_IOC_DEQUEUE_MESSAGE \