Commit 88084848 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman

staging: vc04_services: Get rid of vchiq_platform_suspend/resume()

vchiq_platform_suspend() and vchiq_platform_resume() do nothing, get rid
of them.
Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200131103836.14312-9-nsaenzjulienne@suse.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0e266212
...@@ -257,18 +257,6 @@ int vchiq_dump_platform_state(void *dump_context) ...@@ -257,18 +257,6 @@ int vchiq_dump_platform_state(void *dump_context)
return vchiq_dump(dump_context, buf, len + 1); return vchiq_dump(dump_context, buf, len + 1);
} }
enum vchiq_status
vchiq_platform_suspend(struct vchiq_state *state)
{
return VCHIQ_ERROR;
}
enum vchiq_status
vchiq_platform_resume(struct vchiq_state *state)
{
return VCHIQ_SUCCESS;
}
int int
vchiq_platform_videocore_wanted(struct vchiq_state *state) vchiq_platform_videocore_wanted(struct vchiq_state *state)
{ {
......
...@@ -2572,7 +2572,6 @@ void ...@@ -2572,7 +2572,6 @@ void
vchiq_platform_check_suspend(struct vchiq_state *state) vchiq_platform_check_suspend(struct vchiq_state *state)
{ {
struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state); struct vchiq_arm_state *arm_state = vchiq_platform_get_arm_state(state);
int susp = 0;
if (!arm_state) if (!arm_state)
goto out; goto out;
...@@ -2581,15 +2580,10 @@ vchiq_platform_check_suspend(struct vchiq_state *state) ...@@ -2581,15 +2580,10 @@ vchiq_platform_check_suspend(struct vchiq_state *state)
write_lock_bh(&arm_state->susp_res_lock); write_lock_bh(&arm_state->susp_res_lock);
if (arm_state->vc_suspend_state == VC_SUSPEND_REQUESTED && if (arm_state->vc_suspend_state == VC_SUSPEND_REQUESTED &&
arm_state->vc_resume_state == VC_RESUME_RESUMED) { arm_state->vc_resume_state == VC_RESUME_RESUMED)
set_suspend_state(arm_state, VC_SUSPEND_IN_PROGRESS); set_suspend_state(arm_state, VC_SUSPEND_IN_PROGRESS);
susp = 1;
}
write_unlock_bh(&arm_state->susp_res_lock); write_unlock_bh(&arm_state->susp_res_lock);
if (susp)
vchiq_platform_suspend(state);
out: out:
vchiq_log_trace(vchiq_susp_log_level, "%s exit", __func__); vchiq_log_trace(vchiq_susp_log_level, "%s exit", __func__);
return; return;
......
...@@ -112,9 +112,6 @@ vchiq_release_service(unsigned int handle); ...@@ -112,9 +112,6 @@ vchiq_release_service(unsigned int handle);
extern enum vchiq_status extern enum vchiq_status
vchiq_check_service(struct vchiq_service *service); vchiq_check_service(struct vchiq_service *service);
extern enum vchiq_status
vchiq_platform_suspend(struct vchiq_state *state);
extern int extern int
vchiq_platform_videocore_wanted(struct vchiq_state *state); vchiq_platform_videocore_wanted(struct vchiq_state *state);
......
...@@ -1895,10 +1895,6 @@ slot_handler_func(void *v) ...@@ -1895,10 +1895,6 @@ slot_handler_func(void *v)
} }
break; break;
case VCHIQ_CONNSTATE_PAUSED:
vchiq_platform_resume(state);
break;
case VCHIQ_CONNSTATE_RESUMING: case VCHIQ_CONNSTATE_RESUMING:
if (queue_message(state, NULL, if (queue_message(state, NULL,
VCHIQ_MAKE_MSG(VCHIQ_MSG_RESUME, 0, 0), VCHIQ_MAKE_MSG(VCHIQ_MSG_RESUME, 0, 0),
......
...@@ -593,9 +593,6 @@ remote_event_signal(struct remote_event *event); ...@@ -593,9 +593,6 @@ remote_event_signal(struct remote_event *event);
void void
vchiq_platform_check_suspend(struct vchiq_state *state); vchiq_platform_check_suspend(struct vchiq_state *state);
extern enum vchiq_status
vchiq_platform_resume(struct vchiq_state *state);
extern int extern int
vchiq_dump(void *dump_context, const char *str, int len); vchiq_dump(void *dump_context, const char *str, int len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment