[RFC 28/50] staging: vchi: Expose struct vchi_service

From: Nicolas Saenz Julienne
Date: Wed May 27 2020 - 07:57:05 EST


This will make further changes easier. The struct will ultimately
disappear.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@xxxxxxx>
---
drivers/staging/vc04_services/interface/vchi/vchi.h | 10 +++++++---
.../vc04_services/interface/vchiq_arm/vchiq_shim.c | 7 -------
2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index 9a74ca4e1062..789acb7999d1 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -29,6 +29,13 @@ struct vchi_held_msg {
void *message;
};

+struct vchi_service {
+ unsigned int handle;
+
+ vchi_callback callback;
+ void *callback_param;
+};
+
// structure used to provide the information needed to open a server or a client
struct service_creation {
struct vchi_version version;
@@ -40,9 +47,6 @@ struct service_creation {
// Opaque handle for a VCHIQ instance
struct vchiq_instance;

-// Opaque handle for a server or client
-struct vchi_service;
-
/******************************************************************************
* Global funcs - implementation is specific to which side you are on
* (local / remote)
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
index 9728667adbd9..843ee978928f 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -10,13 +10,6 @@
#include "vchiq.h"
#include "vchiq_core.h"

-struct vchi_service {
- unsigned int handle;
-
- vchi_callback callback;
- void *callback_param;
-};
-
int vchi_queue_kernel_message(struct vchi_service *service, void *data,
unsigned int size)
{
--
2.26.2