shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-05 09:17:44 +03:00
Code

sleep: drop unnecessary temporal vaiable and initialization

Browse Source 
(cherry picked from commit 2ed56afeb3)
This commit is contained in:
Yu Watanabe 2022-11-14 00:09:34 +09:00 committed by Zbigniew Jędrzejewski-Szmek
parent 792a1be91c
commit 1baf68d728
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sleep/sleep.c
View File

@ -275,7 +275,7 @@ static int custom_timer_suspend(const SleepConfig *sleep_config) {
_cleanup_hashmap_free_ Hashmap *last_capacity = NULL, *current_capacity = NULL;
_cleanup_close_ int tfd = -1;
struct itimerspec ts = {};
usec_t suspend_interval = sleep_config->hibernate_delay_usec, total_suspend_interval;
usec_t suspend_interval;
bool woken_by_timer;
tfd = timerfd_create(CLOCK_BOOTTIME_ALARM, TFD_NONBLOCK|TFD_CLOEXEC);
@ -287,11 +287,12 @@ static int custom_timer_suspend(const SleepConfig *sleep_config) {
if (r < 0)
return log_error_errno(r, "Error fetching battery capacity percentage: %m");
r = get_total_suspend_interval(last_capacity, &total_suspend_interval);
if (r < 0)
r = get_total_suspend_interval(last_capacity, &suspend_interval);
if (r < 0) {
log_debug_errno(r, "Failed to estimate suspend interval using previous discharge rate, ignoring: %m");
else
suspend_interval = total_suspend_interval;
/* In case of no battery or any errors, system suspend interval will be set to HibernateDelaySec=. */
suspend_interval = sleep_config->hibernate_delay_usec;
}
usec_t before_timestamp = now(CLOCK_BOOTTIME);