staging: vchiq: Don't use a typedef for vchiq_callback (47cc5b16) · Commits · 戴 / test

drivers/staging/vc04_services/interface/vchi/vchi.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,10 @@ struct vchi_service {
		struct service_creation {
		struct vchi_version version;
		int32_t service_id;
		vchiq_callback callback;
		enum vchiq_status (*callback)(enum vchiq_reason reason,
		struct vchiq_header *header,
		unsigned int handle,
		void *bulk_userdata);
		void *callback_param;
		};

+8 −6

Original line number	Diff line number	Diff line
		@@ -60,19 +60,21 @@ struct vchiq_element {
		unsigned int size;
		};

		typedef enum vchiq_status (*vchiq_callback)(enum vchiq_reason,
		struct vchiq_header *,
		unsigned int, void *);

		struct vchiq_service_base {
		int fourcc;
		vchiq_callback callback;
		enum vchiq_status (*callback)(enum vchiq_reason reason,
		struct vchiq_header *header,
		unsigned int handle,
		void *bulk_userdata);
		void *userdata;
		};

		struct vchiq_service_params {
		int fourcc;
		vchiq_callback callback;
		enum vchiq_status (*callback)(enum vchiq_reason reason,
		struct vchiq_header *header,
		unsigned int handle,
		void *bulk_userdata);
		void *userdata;
		short version; /* Increment for non-trivial changes */
		short version_min; /* Update for incompatible changes */