staging: vc04_services: Simplify (no)callback bulk transfer code paths

The (no)callback mode bulk transfer tends to open-code every function
parameter needed to initiate the bulk transfer. Instead of doing that,
simply pass a populated struct vchiq_bulk down the function chain.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Link: https://lore.kernel.org/r/20241017133629.216672-5-umang.jain@ideasonboard.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 90b5ce5ee4297c3c65241060611bb6a648155ea2..c2e7c2bd507136ab7e6c626698c7e189e3a88c80 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -497,9 +497,14 @@ vchiq_bulk_transmit(struct vchiq_instance *instance, unsigned int handle, const
        switch (mode) {
        case VCHIQ_BULK_MODE_NOCALLBACK:
        case VCHIQ_BULK_MODE_CALLBACK:
-               ret = vchiq_bulk_xfer_callback(instance, handle, (void *)data,
-                                              NULL, size, mode, userdata,
-                                              VCHIQ_BULK_TRANSMIT);
+
+               bulk_params.offset = (void *)data;
+               bulk_params.mode = mode;
+               bulk_params.size = size;
+               bulk_params.userdata = userdata;
+               bulk_params.dir = VCHIQ_BULK_TRANSMIT;
+
+               ret = vchiq_bulk_xfer_callback(instance, handle, &bulk_params);
                break;
        case VCHIQ_BULK_MODE_BLOCKING:
                bulk_params.offset = (void *)data;
@@ -527,8 +532,14 @@ int vchiq_bulk_receive(struct vchiq_instance *instance, unsigned int handle,
        switch (mode) {
        case VCHIQ_BULK_MODE_NOCALLBACK:
        case VCHIQ_BULK_MODE_CALLBACK:
-               ret = vchiq_bulk_xfer_callback(instance, handle, (void *)data, NULL,
-                                              size, mode, userdata, VCHIQ_BULK_RECEIVE);
+
+               bulk_params.offset = (void *)data;
+               bulk_params.mode = mode;
+               bulk_params.size = size;
+               bulk_params.userdata = userdata;
+               bulk_params.dir = VCHIQ_BULK_RECEIVE;
+
+               ret = vchiq_bulk_xfer_callback(instance, handle, &bulk_params);
                break;
        case VCHIQ_BULK_MODE_BLOCKING:
                bulk_params.offset = (void *)data;

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 6c52827868d58ccd70ae03d7f2be7b923057bdbd..bb46aa20bdb4413e03603b2d88300fe70ba594e3 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -3502,9 +3502,7 @@ error_exit:
 
 int
 vchiq_bulk_xfer_callback(struct vchiq_instance *instance, unsigned int handle,
-                        void *offset, void __user *uoffset, int size,
-                        enum vchiq_bulk_mode mode, void *userdata,
-                        enum vchiq_bulk_dir dir)
+                        struct vchiq_bulk *bulk_params)
 {
        struct vchiq_service *service = find_service_by_handle(instance, handle);
        int status = -EINVAL;
@@ -3512,21 +3510,22 @@ vchiq_bulk_xfer_callback(struct vchiq_instance *instance, unsigned int handle,
        if (!service)
                return -EINVAL;
 
-       if (mode != VCHIQ_BULK_MODE_CALLBACK &&
-           mode != VCHIQ_BULK_MODE_NOCALLBACK)
+       if (bulk_params->mode != VCHIQ_BULK_MODE_CALLBACK &&
+           bulk_params->mode != VCHIQ_BULK_MODE_NOCALLBACK)
                goto error_exit;
 
        if (service->srvstate != VCHIQ_SRVSTATE_OPEN)
                goto error_exit;
 
-       if (!offset && !uoffset)
+       if (!bulk_params->offset && !bulk_params->uoffset)
                goto error_exit;
 
        if (vchiq_check_service(service))
                goto error_exit;
 
-       status = vchiq_bulk_xfer_queue_msg_killable(service, offset, uoffset,
-                                                   size, userdata, mode, dir);
+       status = vchiq_bulk_xfer_queue_msg_killable(service, bulk_params->offset, bulk_params->uoffset,
+                                                   bulk_params->size, bulk_params->userdata,
+                                                   bulk_params->mode, bulk_params->dir);
 
 error_exit:
        vchiq_service_put(service);

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
index 82d27788b10bc7a32f59465ef3ac464ed7367016..186b1395d3a222f46b6d5ccb5a4880a4b628b834 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -505,9 +505,7 @@ vchiq_bulk_xfer_blocking(struct vchiq_instance *instance, unsigned int handle,
 
 extern int
 vchiq_bulk_xfer_callback(struct vchiq_instance *instance, unsigned int handle,
-                        void *offset, void __user *uoffset, int size,
-                        enum vchiq_bulk_mode mode, void *userdata,
-                        enum vchiq_bulk_dir dir);
+                        struct vchiq_bulk *bulk);
 
 extern void
 vchiq_dump_state(struct seq_file *f, struct vchiq_state *state);

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
index 8043974f889395718124f9eb10f1ecdb32242350..f56057e17963ae8af833a987aeb4af9938183bef 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
@@ -335,12 +335,14 @@ static int vchiq_irq_queue_bulk_tx_rx(struct vchiq_instance *instance,
 
                status = vchiq_bulk_xfer_waiting(instance, args->handle, userdata);
        } else {
-               userdata = args->userdata;
-
-               status = vchiq_bulk_xfer_callback(instance, args->handle, NULL,
-                                                 args->data, args->size,
-                                                 args->mode, userdata, dir);
+               bulk_params.uoffset = args->data;
+               bulk_params.mode = args->mode;
+               bulk_params.size = args->size;
+               bulk_params.dir = dir;
+               bulk_params.userdata = args->userdata;
 
+               status = vchiq_bulk_xfer_callback(instance, args->handle,
+                                                 &bulk_params);
        }
 
        if (!waiter) {