[PATCH 19/22] staging: vc04_services: Get rid of vc_suspend_state in struct vchiq_arm_state

[Nicolas Saenz Julienne]

It's never used.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulie...@suse.de>
---
 .../vc04_services/interface/vchiq_arm/vchiq_arm.c     | 11 ++---------
 .../vc04_services/interface/vchiq_arm/vchiq_arm.h     |  1 -
 2 files changed, 2 insertions(+), 10 deletions(-)

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 577ecfefce3c..049512589375 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -2619,7 +2619,6 @@ vchiq_dump_service_use_state(struct vchiq_state *state)
        int only_nonzero = 0;
        static const char *nz = "<-- preventing suspend";
 
-       enum vc_suspend_status vc_suspend_state;
        enum vc_resume_status  vc_resume_state;
        int peer_count;
        int vc_use_count;
@@ -2634,7 +2633,6 @@ vchiq_dump_service_use_state(struct vchiq_state *state)
                return;
 
        read_lock_bh(&arm_state->susp_res_lock);
-       vc_suspend_state = arm_state->vc_suspend_state;
        vc_resume_state  = arm_state->vc_resume_state;
        peer_count = arm_state->peer_use_count;
        vc_use_count = arm_state->videocore_use_count;
@@ -2664,9 +2662,6 @@ vchiq_dump_service_use_state(struct vchiq_state *state)
 
        read_unlock_bh(&arm_state->susp_res_lock);
 
-       vchiq_log_warning(vchiq_susp_log_level,
-               "-- Videcore suspend state: %s --",
-               suspend_state_names[vc_suspend_state + VC_SUSPEND_NUM_OFFSET]);
        vchiq_log_warning(vchiq_susp_log_level,
                "-- Videcore resume state: %s --",
                resume_state_names[vc_resume_state + VC_RESUME_NUM_OFFSET]);
@@ -2713,12 +2708,10 @@ vchiq_check_service(struct vchiq_service *service)
        if (ret == VCHIQ_ERROR) {
                vchiq_log_error(vchiq_susp_log_level,
                        "%s ERROR - %c%c%c%c:%d service count %d, "
-                       "state count %d, videocore suspend state %s", __func__,
+                       "state count %d", __func__,
                        VCHIQ_FOURCC_AS_4CHARS(service->base.fourcc),
                        service->client_id, service->service_use_count,
-                       arm_state->videocore_use_count,
-                       suspend_state_names[arm_state->vc_suspend_state +
-                                               VC_SUSPEND_NUM_OFFSET]);
+                       arm_state->videocore_use_count);
        }
 out:
        return ret;
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h 
b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
index e2f7fa865694..780c352a5d64 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h
@@ -34,7 +34,6 @@ struct vchiq_arm_state {
        struct completion vc_resume_complete;
 
        rwlock_t susp_res_lock;
-       enum vc_suspend_status vc_suspend_state;
        enum vc_resume_status vc_resume_state;
 
        struct vchiq_state *state;
-- 
2.25.0

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel