staging: vc04_services: Replace VCHIQ_BULK_DIR_T enum typedef with enum vchiq_bulk_dir (d2684ce8) · Commits · 戴 / test

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ vchiq_static_assert(ARRAY_SIZE(ioctl_names) ==

		static enum vchiq_status
		vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
		unsigned int size, VCHIQ_BULK_DIR_T dir);
		unsigned int size, enum vchiq_bulk_dir dir);

		#define VCHIQ_INIT_RETRIES 10
		enum vchiq_status vchiq_initialise(VCHIQ_INSTANCE_T *instance_out)
		@@ -431,7 +431,7 @@ EXPORT_SYMBOL(vchiq_bulk_receive);

		static enum vchiq_status
		vchiq_blocking_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *data,
		unsigned int size, VCHIQ_BULK_DIR_T dir)
		unsigned int size, enum vchiq_bulk_dir dir)
		{
		VCHIQ_INSTANCE_T instance;
		struct vchiq_service *service;
		@@ -1042,7 +1042,7 @@ vchiq_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
		struct vchiq_queue_bulk_transfer args;
		struct bulk_waiter_node *waiter = NULL;

		VCHIQ_BULK_DIR_T dir =
		enum vchiq_bulk_dir dir =
		(cmd == VCHIQ_IOC_QUEUE_BULK_TRANSMIT) ?
		VCHIQ_BULK_TRANSMIT : VCHIQ_BULK_RECEIVE;

+1 −1

Original line number	Diff line number	Diff line
		@@ -2955,7 +2955,7 @@ vchiq_remove_service(VCHIQ_SERVICE_HANDLE_T handle)
		enum vchiq_status vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle,
		void offset, int size, void userdata,
		enum vchiq_bulk_mode mode,
		VCHIQ_BULK_DIR_T dir)
		enum vchiq_bulk_dir dir)
		{
		struct vchiq_service *service = find_service_by_handle(handle);
		struct vchiq_bulk_queue *queue;

+3 −3

Original line number	Diff line number	Diff line
		@@ -202,10 +202,10 @@ enum {
		VCHIQ_POLL_COUNT
		};

		typedef enum {
		enum vchiq_bulk_dir {
		VCHIQ_BULK_TRANSMIT,
		VCHIQ_BULK_RECEIVE
		} VCHIQ_BULK_DIR_T;
		};

		typedef void (VCHIQ_USERDATA_TERM_T)(void userdata);

		@@ -524,7 +524,7 @@ remote_event_pollall(struct vchiq_state *state);
		extern enum vchiq_status
		vchiq_bulk_transfer(VCHIQ_SERVICE_HANDLE_T handle, void *offset, int size,
		void *userdata, enum vchiq_bulk_mode mode,
		VCHIQ_BULK_DIR_T dir);
		enum vchiq_bulk_dir dir);

		extern void
		vchiq_dump_state(void dump_context, struct vchiq_state state);