From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: gregkh@linuxfoundation.org
Cc: kernel-list@raspberrypi.com, laurent.pinchart@ideasonboard.com,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org,
Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Subject: [PATCH v2 30/47] staging: vchi: Use struct vchiq_service_params
Date: Mon, 29 Jun 2020 17:09:28 +0200 [thread overview]
Message-ID: <20200629150945.10720-31-nsaenzjulienne@suse.de> (raw)
In-Reply-To: <20200629150945.10720-1-nsaenzjulienne@suse.de>
For initialization, vchi has its own params structure, which is then
translated to vchiq's params structure. They are essentially the same,
so lets directly use vchiq's.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
.../bcm2835-audio/bcm2835-vchiq.c | 9 +++++----
.../vc04_services/interface/vchi/vchi.h | 19 +------------------
.../interface/vchiq_arm/vchiq_shim.c | 12 ++----------
.../vc04_services/vchiq-mmal/mmal-vchiq.c | 11 ++++++-----
4 files changed, 14 insertions(+), 37 deletions(-)
diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
index 71750ef891dd..c1537a41a2fe 100644
--- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
+++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
@@ -122,11 +122,12 @@ static int
vc_vchi_audio_init(struct vchiq_instance *vchiq_instance,
struct bcm2835_audio_instance *instance)
{
- struct service_creation params = {
- .version = VCHI_VERSION_EX(VC_AUDIOSERV_VER, VC_AUDIOSERV_MIN_VER),
- .service_id = VC_AUDIO_SERVER_NAME,
+ struct vchiq_service_params params = {
+ .version = VC_AUDIOSERV_VER,
+ .version_min = VC_AUDIOSERV_MIN_VER,
+ .fourcc = VC_AUDIO_SERVER_NAME,
.callback = audio_vchi_callback,
- .callback_param = instance,
+ .userdata = instance,
};
int status;
diff --git a/drivers/staging/vc04_services/interface/vchi/vchi.h b/drivers/staging/vc04_services/interface/vchi/vchi.h
index cb66ea1ffad2..4afa6e9f57c4 100644
--- a/drivers/staging/vc04_services/interface/vchi/vchi.h
+++ b/drivers/staging/vc04_services/interface/vchi/vchi.h
@@ -8,12 +8,6 @@
* Global defs
*****************************************************************************/
-struct vchi_version {
- uint32_t version;
- uint32_t version_min;
-};
-#define VCHI_VERSION_EX(v_, m_) { v_, m_ }
-
// Macros to manipulate 'FOURCC' values
#define MAKE_FOURCC(x) ((int32_t)((x[0] << 24) | (x[1] << 16) | (x[2] << 8) | x[3]))
@@ -31,17 +25,6 @@ struct vchi_service {
unsigned int handle;
};
-// structure used to provide the information needed to open a server or a client
-struct service_creation {
- struct vchi_version version;
- int32_t service_id;
- enum vchiq_status (*callback)(enum vchiq_reason reason,
- struct vchiq_header *header,
- unsigned int handle,
- void *bulk_userdata);
- void *callback_param;
-};
-
// Opaque handle for a VCHIQ instance
struct vchiq_instance;
@@ -64,7 +47,7 @@ extern int32_t vchi_disconnect(struct vchiq_instance *instance);
*****************************************************************************/
// Routine to open a named service
extern int32_t vchi_service_open(struct vchiq_instance *instance,
- struct service_creation *setup,
+ struct vchiq_service_params *setup,
struct vchi_service **service);
extern int32_t vchi_get_peer_version(struct vchi_service *service,
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 fb9fd5fec42c..30083927b33d 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_shim.c
@@ -265,23 +265,15 @@ static void service_free(struct vchi_service *service)
}
int32_t vchi_service_open(struct vchiq_instance *instance,
- struct service_creation *setup,
+ struct vchiq_service_params *params,
struct vchi_service **service)
{
*service = service_alloc();
if (*service) {
- struct vchiq_service_params params;
enum vchiq_status status;
- memset(¶ms, 0, sizeof(params));
- params.fourcc = setup->service_id;
- params.callback = setup->callback;
- params.userdata = setup->callback_param;
- params.version = setup->version.version;
- params.version_min = setup->version.version_min;
-
- status = vchiq_open_service(instance, ¶ms,
+ status = vchiq_open_service(instance, params,
&((*service)->handle));
if (status != VCHIQ_SUCCESS) {
service_free(*service);
diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
index 2abf0f6664f9..4788bb645dc5 100644
--- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
+++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c
@@ -1860,11 +1860,12 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
int status;
struct vchiq_mmal_instance *instance;
static struct vchiq_instance *vchiq_instance;
- struct service_creation params = {
- .version = VCHI_VERSION_EX(VC_MMAL_VER, VC_MMAL_MIN_VER),
- .service_id = VC_MMAL_SERVER_NAME,
+ struct vchiq_service_params params = {
+ .version = VC_MMAL_VER,
+ .version_min = VC_MMAL_MIN_VER,
+ .fourcc = VC_MMAL_SERVER_NAME,
.callback = service_callback,
- .callback_param = NULL,
+ .userdata = NULL,
};
/* compile time checks to ensure structure size as they are
@@ -1906,7 +1907,7 @@ int vchiq_mmal_init(struct vchiq_mmal_instance **out_instance)
mutex_init(&instance->context_map_lock);
idr_init_base(&instance->context_map, 1);
- params.callback_param = instance;
+ params.userdata = instance;
instance->bulk_wq = alloc_ordered_workqueue("mmal-vchiq",
WQ_MEM_RECLAIM);
--
2.27.0
next prev parent reply other threads:[~2020-06-29 20:35 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-29 15:08 [PATCH v2 00/47] staging: vchiq: Getting rid of the vchi/vchiq split Nicolas Saenz Julienne
2020-06-29 15:08 ` [PATCH v2 01/47] staging: mmal-vchiq: Make timeout a defined parameter Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 02/47] staging: mmal-vchiq: Make a mmal_buf struct for passing parameters Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 03/47] staging: mmal-vchiq: Fixup vchiq-mmal include ordering Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 04/47] staging: mmal-vchiq: Fix client_component for 64 bit kernel Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 05/47] staging: mmal-vchiq: Always return the param size from param_get Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 06/47] staging: mmal-vchiq: If the VPU returns an error, don't negate it Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 07/47] staging: mmal-vchiq: Fix formatting errors in mmal_parameters.h Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 08/47] staging: vchiq_arm: Add a matching unregister call Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 09/47] staging: vchi: Get rid of all useless callback reasons Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 10/47] staging: vchi: Get rid of vchi_msg_peek() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 11/47] staging: vchi: Get rid of struct vchi_instance_handle Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 12/47] staging: vchi: Unify struct shim_service and struct vchi_service_handle Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 13/47] staging: vc04_services: bcm2835-audio: Use vchi_msg_hold() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 14/47] staging: vchi: Get rid of vchi_msg_dequeue() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 15/47] staging: vchi_common: Get rid of all unused definitions Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 16/47] staging: vchi: Get rid of unnecessary defines Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 17/47] staging: vc04_services: Get rid of vchi_cfg.h Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 18/47] staging: vchi: Get rid of flags argument in vchi_msg_hold() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 19/47] staging: vchi: Use enum vchiq_bulk_mode instead of vchi's transmission flags Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 20/47] staging: vchi: Use vchiq's enum vchiq_reason Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 21/47] staging: vchi: Get rid of effect less expression Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 22/47] staging: vchiq: Introduce vchiq_validate_params() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 23/47] staging: vchiq: Move message queue into struct vchiq_service Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 24/47] staging: vchiq: Get rid of vchiq_util.h Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 25/47] staging: vchi: Expose struct vchi_service Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 26/47] staging: vchiq: Export vchiq_get_service_userdata() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 27/47] staging: vchiq: Export vchiq_msg_queue_push Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 28/47] staging: vchi: Get rid of vchiq_shim's message callback Nicolas Saenz Julienne
2020-08-28 14:31 ` Jacopo Mondi
2020-08-31 18:46 ` Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 29/47] staging: vchiq: Don't use a typedef for vchiq_callback Nicolas Saenz Julienne
2020-06-29 15:09 ` Nicolas Saenz Julienne [this message]
2020-06-29 15:09 ` [PATCH v2 31/47] staging: vchi: Get rid of struct vchi_service Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 32/47] staging: vchiq: Pass vchiq's message when holding a message Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 33/47] staging: vchi: Rework vchi_msg_hold() to match vchiq_msg_hold() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 34/47] staging: vchiq: Unify fourcc definition mechanisms Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 35/47] staging: vchi: Get rid of struct vchiq_instance forward declaration Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 36/47] staging: vchi: Don't include vchiq_core.h Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 37/47] staging: vchiq: Get rid of unnecessary definitions in vchiq_if.h Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 38/47] staging: vchiq: Make vchiq_add_service() local Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 39/47] staging: vchiq: Move definitions only used by core into core header Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 40/47] staging: vchi: Get rid of vchi_bulk_queue_receive() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 41/47] staging: vchi: Get rid of vchi_bulk_queue_transmit() Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 42/47] staging: vchi: Move vchi_queue_kernel_message() into vchiq Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 43/47] staging: vchiq: Get rid of vchi Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 44/47] staging: vchiq: Move conditional barrier definition into vchiq_core.h Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 45/47] staging: vchiq: Use vchiq.h as the main header file for services Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 46/47] staging: vchiq: Move defines into core header Nicolas Saenz Julienne
2020-06-29 15:09 ` [PATCH v2 47/47] staging: vchiq: Move vchiq.h into include directory Nicolas Saenz Julienne
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200629150945.10720-31-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-list@raspberrypi.com \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).