From 0e26621250627a62f2aabc511a1686f962dd8b24 Mon Sep 17 00:00:00 2001 From: Nicolas Saenz Julienne Date: Fri, 31 Jan 2020 11:38:23 +0100 Subject: [PATCH] staging: vc04_services: Get rid of vchiq_platform_paused/resumed() vchiq_platform_paused() and vchiq_platform_resumed() do nothing. Signed-off-by: Nicolas Saenz Julienne Link: https://lore.kernel.org/r/20200131103836.14312-8-nsaenzjulienne@suse.de Signed-off-by: Greg Kroah-Hartman --- .../vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 10 ---------- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 3 --- .../vc04_services/interface/vchiq_arm/vchiq_core.h | 6 ------ 3 files changed, 19 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index 1ffb2aea947c..5f59145f251b 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c @@ -269,16 +269,6 @@ vchiq_platform_resume(struct vchiq_state *state) return VCHIQ_SUCCESS; } -void -vchiq_platform_paused(struct vchiq_state *state) -{ -} - -void -vchiq_platform_resumed(struct vchiq_state *state) -{ -} - int vchiq_platform_videocore_wanted(struct vchiq_state *state) { 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 76351078affb..71342826ed33 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -1798,7 +1798,6 @@ parse_rx_slots(struct vchiq_state *state) } /* At this point slot_mutex is held */ vchiq_set_conn_state(state, VCHIQ_CONNSTATE_PAUSED); - vchiq_platform_paused(state); break; case VCHIQ_MSG_RESUME: vchiq_log_trace(vchiq_core_log_level, @@ -1807,7 +1806,6 @@ parse_rx_slots(struct vchiq_state *state) /* Release the slot mutex */ mutex_unlock(&state->slot_mutex); vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED); - vchiq_platform_resumed(state); break; case VCHIQ_MSG_REMOTE_USE: @@ -1908,7 +1906,6 @@ slot_handler_func(void *v) != VCHIQ_RETRY) { vchiq_set_conn_state(state, VCHIQ_CONNSTATE_CONNECTED); - vchiq_platform_resumed(state); } else { /* This should really be impossible, ** since the PAUSE should have flushed 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 c31f953a9986..72c88fe5feb1 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -593,15 +593,9 @@ remote_event_signal(struct remote_event *event); void vchiq_platform_check_suspend(struct vchiq_state *state); -extern void -vchiq_platform_paused(struct vchiq_state *state); - extern enum vchiq_status vchiq_platform_resume(struct vchiq_state *state); -extern void -vchiq_platform_resumed(struct vchiq_state *state); - extern int vchiq_dump(void *dump_context, const char *str, int len); -- 2.30.2