Commit 76dbbe77 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

staging: vchiq: Move definitions only used by core into core header 



vchiq_if.h is used by service consumers and only the exported API should
be present. Move the rest of definitions, which were not exported by the
way, to vchiq_core.h where they belong.

Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-40-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9f10ddbd

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

+22 −0
Original line number Diff line number Diff line
@@ -486,6 +486,18 @@ struct bulk_waiter { 
	int actual;

};



struct vchiq_config {

	unsigned int max_msg_size;

	unsigned int bulk_threshold; /* The message size above which it

					is better to use a bulk transfer

					(<= max_msg_size) */

	unsigned int max_outstanding_bulks;

	unsigned int max_services;

	short version;      /* The version of VCHIQ */

	short version_min;  /* The minimum compatible version of VCHIQ */

};





extern spinlock_t bulk_waiter_spinlock;



extern int vchiq_core_log_level;
@@ -665,4 +677,14 @@ extern void 
vchiq_log_dump_mem(const char *label, uint32_t addr, const void *voidMem,

	size_t numBytes);



extern enum vchiq_status vchiq_remove_service(unsigned int service);



extern int vchiq_get_client_id(unsigned int service);



extern void vchiq_get_config(struct vchiq_config *config);



extern enum vchiq_status

vchiq_set_service_option(unsigned int service, enum vchiq_service_option option,

			 int value);



#endif

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

+0 −16
Original line number Diff line number Diff line
@@ -78,17 +78,6 @@ struct vchiq_service_params { 
	short version_min;   /* Update for incompatible changes */

};



struct vchiq_config {

	unsigned int max_msg_size;

	unsigned int bulk_threshold; /* The message size above which it

					is better to use a bulk transfer

					(<= max_msg_size) */

	unsigned int max_outstanding_bulks;

	unsigned int max_services;

	short version;      /* The version of VCHIQ */

	short version_min;  /* The minimum compatible version of VCHIQ */

};



struct vchiq_instance;



extern enum vchiq_status vchiq_initialise(struct vchiq_instance **pinstance);
@@ -98,7 +87,6 @@ extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance, 
	const struct vchiq_service_params *params,

	unsigned int *pservice);

extern enum vchiq_status vchiq_close_service(unsigned int service);

extern enum vchiq_status vchiq_remove_service(unsigned int service);

extern enum vchiq_status vchiq_use_service(unsigned int service);

extern enum vchiq_status vchiq_release_service(unsigned int service);

extern enum vchiq_status vchiq_queue_kernel_message(unsigned int handle,
@@ -112,11 +100,7 @@ extern enum vchiq_status vchiq_bulk_transmit(unsigned int service, 
extern enum vchiq_status vchiq_bulk_receive(unsigned int service,

	void *data, unsigned int size, void *userdata,

	enum vchiq_bulk_mode mode);

extern int   vchiq_get_client_id(unsigned int service);

extern void *vchiq_get_service_userdata(unsigned int service);

extern void vchiq_get_config(struct vchiq_config *config);

extern enum vchiq_status vchiq_set_service_option(unsigned int service,

	enum vchiq_service_option option, int value);

extern enum vchiq_status vchiq_get_peer_version(unsigned int handle,

      short *peer_version);

extern void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header);

CRA Git | Maintained and supported by SUSTech CRA and CCSE