michaelh/zephyr
1
0
Fork 0
Code Releases Activity

pm: Remove unnecessary goto

Browse source 
In pm_system_suspend there is a goto label that is supposed to be used
to do cleanup before exit the function but it is not doing anything
right now. Just remove it.

Signed-off-by: Flavio Ceolin <flavio.ceolin@intel.com>
This commit is contained in:
Flavio Ceolin 2022-05-05 20:46:47 -07:00 • committed by Marti Bolivar
commit 2b02843ca3
1 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
subsys/pm/pm.c
View file

@ -198,7 +198,6 @@ bool pm_state_force(uint8_t cpu, const struct pm_state_info *info)
bool pm_system_suspend(int32_t ticks) bool pm_system_suspend(int32_t ticks)
{ {
bool ret = true;
uint8_t id = _current_cpu->id; uint8_t id = _current_cpu->id;
SYS_PORT_TRACING_FUNC_ENTER(pm, system_suspend, ticks); SYS_PORT_TRACING_FUNC_ENTER(pm, system_suspend, ticks);
@ -216,9 +215,8 @@ bool pm_system_suspend(int32_t ticks)
LOG_DBG("No PM operations done."); LOG_DBG("No PM operations done.");
SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks, SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
z_cpus_pm_state[id].state); z_cpus_pm_state[id].state);
ret = false;
atomic_clear_bit(z_cpus_pm_state_forced, id); atomic_clear_bit(z_cpus_pm_state_forced, id);
goto end; return false;
} }
if (ticks != K_TICKS_FOREVER) { if (ticks != K_TICKS_FOREVER) {
@ -241,9 +239,8 @@ bool pm_system_suspend(int32_t ticks)
(void)atomic_add(&z_cpus_active, 1); (void)atomic_add(&z_cpus_active, 1);
SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks, SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
z_cpus_pm_state[id].state); z_cpus_pm_state[id].state);
ret = false;
atomic_clear_bit(z_cpus_pm_state_forced, id); atomic_clear_bit(z_cpus_pm_state_forced, id);
goto end; return false;
} }
} }
#endif #endif
@ -277,8 +274,7 @@ bool pm_system_suspend(int32_t ticks)
SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks, SYS_PORT_TRACING_FUNC_EXIT(pm, system_suspend, ticks,
z_cpus_pm_state[id].state); z_cpus_pm_state[id].state);
end: return true;
return ret;
} }
void pm_notifier_register(struct pm_notifier *notifier) void pm_notifier_register(struct pm_notifier *notifier)