staging: vchiq_core: Drop non-functional struct members

There are some struct members, which don't have a real
function. So it's safe to drop them.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20240621131958.98208-4-wahrenst@gmx.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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 df3af821f218782f965cfa7c9cb636f283fdc45e..51cfc366519b84f6b3724e3ec8505e0f448380db 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -2163,14 +2163,12 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, s
        mutex_init(&state->slot_mutex);
        mutex_init(&state->recycle_mutex);
        mutex_init(&state->sync_mutex);
-       mutex_init(&state->bulk_transfer_mutex);
 
        spin_lock_init(&state->msg_queue_spinlock);
        spin_lock_init(&state->bulk_waiter_spinlock);
        spin_lock_init(&state->quota_spinlock);
 
        init_completion(&state->slot_available_event);
-       init_completion(&state->slot_remove_event);
        init_completion(&state->data_quota_event);
 
        state->slot_queue_available = 0;

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 8af209e34fb2c18c1623b2b8d9b13787530bdcfc..be20abcfad75c544596e52048d8bad3dd0e0a52d 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h
@@ -347,8 +347,6 @@ struct vchiq_state {
 
        struct mutex sync_mutex;
 
-       struct mutex bulk_transfer_mutex;
-
        spinlock_t msg_queue_spinlock;
 
        spinlock_t bulk_waiter_spinlock;
@@ -393,8 +391,6 @@ struct vchiq_state {
        /* Signalled when a free slot becomes available. */
        struct completion slot_available_event;
 
-       struct completion slot_remove_event;
-
        /* Signalled when a free data slot becomes available. */
        struct completion data_quota_event;