staging: vchiq: Rename vchiq_completion_data 'bulk_userdata'

In a previous commit, struct vchiq_bulk 'userdata' got renamed to
'cb_data' since it is the data pointer passed in
VCHIQ_BULK_CALLBACK_MODE's callback. Since struct vchiq_completion_data*
structs also has 'bulk_userdata' for completion records, rename
'bulk_userdata' member to 'cb_data' for these structs as well.

This brings consistency and clarity for the struct members. No
functional change in this patch.

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

diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
index 6c40d8c1dde60723ddeb451733648b811d39be16..9a6ab006bed25772a99e715b3aeb048acdf68922 100644 (file)
--- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
+++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
@@ -64,7 +64,7 @@ struct vchiq_completion_data_kernel {
        enum vchiq_reason reason;
        struct vchiq_header *header;
        void *service_userdata;
-       void *bulk_userdata;
+       void *cb_data;
 };
 
 struct vchiq_service_params_kernel {
@@ -73,7 +73,7 @@ struct vchiq_service_params_kernel {
                        enum vchiq_reason reason,
                        struct vchiq_header *header,
                        unsigned int handle,
-                       void *bulk_userdata);
+                       void *cb_data);
        void *userdata;
        short version;       /* Increment for non-trivial changes */
        short version_min;   /* Update for incompatible changes */

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 c06a57ea9cf55a4d79fb77fc33ff95c6e1e81499..bcfd4ccc8373bb9f52fc40e85064ff4fc599a853 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -662,7 +662,7 @@ add_completion(struct vchiq_instance *instance, enum vchiq_reason reason,
        completion->reason = reason;
        /* N.B. service_userdata is updated while processing AWAIT_COMPLETION */
        completion->service_userdata = user_service->service;
-       completion->bulk_userdata = bulk_userdata;
+       completion->cb_data = bulk_userdata;
 
        if (reason == VCHIQ_SERVICE_CLOSED) {
                /*

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 c99cd36a269617afebd236586011afc02a048b80..fcdf97391fb6d4688d7904d16d3990631e916684 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c
@@ -414,7 +414,7 @@ struct vchiq_completion_data32 {
        enum vchiq_reason reason;
        compat_uptr_t header;
        compat_uptr_t service_userdata;
-       compat_uptr_t bulk_userdata;
+       compat_uptr_t cb_data;
 };
 
 static int vchiq_put_completion(struct vchiq_completion_data __user *buf,
@@ -428,7 +428,7 @@ static int vchiq_put_completion(struct vchiq_completion_data __user *buf,
                        .reason           = completion->reason,
                        .header           = ptr_to_compat(completion->header),
                        .service_userdata = ptr_to_compat(completion->service_userdata),
-                       .bulk_userdata    = ptr_to_compat(completion->bulk_userdata),
+                       .cb_data          = ptr_to_compat(completion->cb_userdata),
                };
                if (copy_to_user(&buf32[index], &tmp, sizeof(tmp)))
                        return -EFAULT;
@@ -550,10 +550,10 @@ static int vchiq_ioc_await_completion(struct vchiq_instance *instance,
                        vchiq_service_put(service);
 
                /*
-                * FIXME: address space mismatch, does bulk_userdata
+                * FIXME: address space mismatch, does cb_data
                 * actually point to user or kernel memory?
                 */
-               user_completion.bulk_userdata = completion->bulk_userdata;
+               user_completion.cb_userdata = completion->cb_data;
 
                if (vchiq_put_completion(args->buf, &user_completion, ret)) {
                        if (ret == 0)

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
index 17550831f86cb9b1fdd7231875593aa2bcd47833..afb71a83cfe7035e5dd61003fa99fd514ca18047 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h
@@ -47,7 +47,7 @@ struct vchiq_completion_data {
        enum vchiq_reason reason;
        struct vchiq_header __user *header;
        void __user *service_userdata;
-       void __user *bulk_userdata;
+       void __user *cb_userdata;
 };
 
 struct vchiq_await_completion {