Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca5f2b4c authored by Borislav Petkov's avatar Borislav Petkov Committed by Rafael J. Wysocki
Browse files

PM / sleep: Make pm_prepare_console() return void 



Nothing is using its return value so change it to return void.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 67830911

include/linux/suspend.h

+2 −3
Original line number Diff line number Diff line
@@ -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)

kernel/power/console.c

+4 −4
Original line number Diff line number Diff line
@@ -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)