PM: console: fix minor style issues and improve readability
Subsystems (2)
PATCH 1/3 PM: console: fix minor style issues and improve readability
--- kernel/power/console.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/power/console.c +3 -2
@@ -16,6 +16,7 @@#define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1)static int orig_fgconsole, orig_kmsg; +/* Tracking whether we switched VT during suspend or not */ static bool vt_switch_done;static DEFINE_MUTEX (vt_switch_mutex);
@@ -62,7 +63,7 @@ int pm_vt_switch_required(struct device *dev, bool required)if (!entry) { ret = -ENOMEM ; goto out; - } + } entry->required = required; entry->dev = dev;
@@ -144,11 +145,11 @@ void pm_prepare_console(void) vt_switch_done = true; orig_kmsg =vt_kmsg_redirect (SUSPEND_CONSOLE ); -return ; }void pm_restore_console (void ) { +/*No switch is needed & none was done*/ if (!pm_vt_switch () && !vt_switch_done)return ;
Signature · 1 line
2.43.0
PATCH 2/3 PM: hibernate: fix minor style inconsistencies
--- kernel/power/hibernate.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/power/hibernate.c +3 -2
@@ -837,8 +837,9 @@ int hibernate(void) goto Thaw; error =hibernation_snapshot (hibernation_mode ==HIBERNATION_PLATFORM ); +/* Skip writing image if error or test mode */ if (error || freezer_test_done) - goto Free_bitmaps; + goto Free_bitmaps;if (in_suspend) {unsigned int flags =0 ;
@@ -848,7 +849,7 @@ int hibernate(void)if (nocompress) { flags |=SF_NOCOMPRESS_MODE ; }else { - flags |=SF_CRC32_MODE ; + flags |=SF_CRC32_MODE ;/* * By default, LZO compression is enabled. Use SF_COMPRESSION_ALG_LZ4
Signature · 1 line
2.43.0
PATCH 3/3 PM: wakelock: fix spacing and improve readability
In reply to Mohit Joshi--- kernel/power/wakelock.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/power/wakelock.c +4 -3
@@ -214,13 +214,15 @@ int pm_wake_lock(const char *buf)if (!capable (CAP_BLOCK_SUSPEND ))return -EPERM ; +/* Extract wakelock name (until space or end) */ while (*str && !isspace (*str)) - str++; + str++; len = str - buf;if (!len)return -EINVAL ; +/* Check for optional timeout value */ if (*str && *str !='\n' ) {/* Find out if there's a valid timeout string appended. */ ret =kstrtou64 (skip_spaces (str),10 , &timeout_ns);
@@ -245,7 +247,6 @@ int pm_wake_lock(const char *buf) }wakelocks_lru_most_recent (wl); - out:mutex_unlock (&wakelocks_lock);return ret;
@@ -264,7 +265,7 @@ int pm_wake_unlock(const char *buf)if (!len)return -EINVAL ; -if (buf[len-1 ] =='\n' ) +if (buf[len -1 ] =='\n' ) len--;if (!len)
Signature · 1 line
2.43.0