| Message ID | 20200131103836.14312-11-nsaenzjulienne@suse.de (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 913e4e05a432e8b70fa8186f5aa308afc5776583 |
| Headers | show |
| Series | staging: vc04_services: suspend/resume cleanup | expand |
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 a7f72dba2e20..c18c6ca0b6c0 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 @@ -257,11 +257,6 @@ int vchiq_dump_platform_state(void *dump_context) return vchiq_dump(dump_context, buf, len + 1); } -void -vchiq_platform_handle_timeout(struct vchiq_state *state) -{ - (void)state; -} /* * Local functions */ 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 ef8340ab8a52..f135d55b29e5 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -1911,11 +1911,6 @@ slot_handler_func(void *v) "message"); } break; - - case VCHIQ_CONNSTATE_PAUSE_TIMEOUT: - case VCHIQ_CONNSTATE_RESUME_TIMEOUT: - vchiq_platform_handle_timeout(state); - break; default: break; } 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 535a67cc68ed..11037a499408 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -638,9 +638,6 @@ vchiq_platform_conn_state_changed(struct vchiq_state *state, enum vchiq_connstate oldstate, enum vchiq_connstate newstate); -extern void -vchiq_platform_handle_timeout(struct vchiq_state *state); - extern void vchiq_set_conn_state(struct vchiq_state *state, enum vchiq_connstate newstate);
The function does nothing. Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> --- .../vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 5 ----- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 5 ----- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 3 --- 3 files changed, 13 deletions(-)