Skip to content

Commit

Permalink
PM / sleep: Make pm_prepare_console() return void
Browse files Browse the repository at this point in the history
Nothing is using its return value so change it to return void.

No functionality change.

Signed-off-by: Borislav Petkov <bp@suse.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Borislav Petkov authored and Rafael J. Wysocki committed Jun 14, 2016
1 parent 6783091 commit ca5f2b4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions include/linux/suspend.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,11 @@ static inline void pm_set_vt_switch(int do_switch)
#endif

#ifdef CONFIG_VT_CONSOLE_SLEEP
extern int pm_prepare_console(void);
extern void pm_prepare_console(void);
extern void pm_restore_console(void);
#else
static inline int pm_prepare_console(void)
static inline void pm_prepare_console(void)
{
return 0;
}

static inline void pm_restore_console(void)
Expand Down
8 changes: 4 additions & 4 deletions kernel/power/console.c
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,17 @@ static bool pm_vt_switch(void)
return ret;
}

int pm_prepare_console(void)
void pm_prepare_console(void)
{
if (!pm_vt_switch())
return 0;
return;

orig_fgconsole = vt_move_to_console(SUSPEND_CONSOLE, 1);
if (orig_fgconsole < 0)
return 1;
return;

orig_kmsg = vt_kmsg_redirect(SUSPEND_CONSOLE);
return 0;
return;
}

void pm_restore_console(void)
Expand Down

0 comments on commit ca5f2b4

Please sign in to comment.