staging: vc04_services: Drop enum vchiq_status remnants

Drop all references to enum vchiq_status as they are no longer in
use.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Link: https://lore.kernel.org/r/20221223122404.170585-7-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 2ca4461..66965da 100644 (file)
--- a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
+++ b/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h
@@ -17,10 +17,6 @@ enum vchiq_reason {
        VCHIQ_BULK_RECEIVE_ABORTED    /* service, -, bulk_userdata */
 };
 
-enum vchiq_status {
-       VCHIQ_RETRY   = 1
-};
-
 enum vchiq_bulk_mode {
        VCHIQ_BULK_MODE_CALLBACK,
        VCHIQ_BULK_MODE_BLOCKING,

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 5cfad84..22de23f 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -751,7 +751,7 @@ static int vchiq_is_connected(struct vchiq_instance *instance)
 
 int vchiq_connect(struct vchiq_instance *instance)
 {
-       enum vchiq_status status;
+       int status;
        struct vchiq_state *state = instance->state;
 
        if (mutex_lock_killable(&state->mutex)) {
@@ -778,7 +778,7 @@ vchiq_add_service(struct vchiq_instance *instance,
                  const struct vchiq_service_params_kernel *params,
                  unsigned int *phandle)
 {
-       enum vchiq_status status;
+       int status;
        struct vchiq_state *state = instance->state;
        struct vchiq_service *service = NULL;
        int srvstate;
@@ -839,7 +839,7 @@ int
 vchiq_bulk_transmit(struct vchiq_instance *instance, unsigned int handle, const void *data,
                    unsigned int size, void *userdata, enum vchiq_bulk_mode mode)
 {
-       enum vchiq_status status;
+       int status;
 
        while (1) {
                switch (mode) {
@@ -877,7 +877,7 @@ int vchiq_bulk_receive(struct vchiq_instance *instance, unsigned int handle,
                       void *data, unsigned int size, void *userdata,
                       enum vchiq_bulk_mode mode)
 {
-       enum vchiq_status status;
+       int status;
 
        while (1) {
                switch (mode) {
@@ -915,7 +915,7 @@ vchiq_blocking_bulk_transfer(struct vchiq_instance *instance, unsigned int handl
                             unsigned int size, enum vchiq_bulk_dir dir)
 {
        struct vchiq_service *service;
-       enum vchiq_status status;
+       int status;
        struct bulk_waiter_node *waiter = NULL, *iter;
 
        service = find_service_by_handle(instance, handle);
@@ -1103,7 +1103,7 @@ service_callback(struct vchiq_instance *instance, enum vchiq_reason reason,
                         */
                        if ((user_service->message_available_pos -
                                instance->completion_remove) < 0) {
-                               enum vchiq_status status;
+                               int status;
 
                                vchiq_log_info(vchiq_arm_log_level,
                                               "Inserting extra MESSAGE_AVAILABLE");
@@ -1330,7 +1330,7 @@ vchiq_keepalive_thread_func(void *v)
        struct vchiq_state *state = (struct vchiq_state *)v;
        struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
 
-       enum vchiq_status status;
+       int status;
        struct vchiq_instance *instance;
        unsigned int ka_handle;
        int ret;

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 7d0d576..5968943 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -2601,7 +2601,7 @@ release_service_messages(struct vchiq_service *service)
 static int
 do_abort_bulks(struct vchiq_service *service)
 {
-       enum vchiq_status status;
+       int status;
 
        /* Abort any outstanding bulk transfers */
        if (mutex_lock_killable(&service->bulk_mutex))
@@ -2621,7 +2621,7 @@ do_abort_bulks(struct vchiq_service *service)
 static int
 close_service_complete(struct vchiq_service *service, int failstate)
 {
-       enum vchiq_status status;
+       int status;
        int is_server = (service->public_fourcc != VCHIQ_FOURCC_INVALID);
        int newstate;
 
@@ -3222,7 +3222,7 @@ error_exit:
 int vchiq_queue_kernel_message(struct vchiq_instance *instance, unsigned int handle, void *data,
                               unsigned int size)
 {
-       enum vchiq_status status;
+       int status;
 
        while (1) {
                status = vchiq_queue_message(instance, handle, memcpy_copy_callback,