Commit 5596c4c1 authored by Vasily Gorbik's avatar Vasily Gorbik

s390/sclp: remove unused sclp_early_printk_forced

This reverts commit 55a5542a ("s390/hibernate: fix error handling when
suspend cpu != resume cpu"). It added sclp_early_printk_force() which
is no longer used since commit 39421627 ("s390: remove broken
hibernate / power management support"). No hibernate - no problem.
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 14ab6224
...@@ -114,8 +114,7 @@ int sclp_early_get_core_info(struct sclp_core_info *info); ...@@ -114,8 +114,7 @@ int sclp_early_get_core_info(struct sclp_core_info *info);
void sclp_early_get_ipl_info(struct sclp_ipl_info *info); void sclp_early_get_ipl_info(struct sclp_ipl_info *info);
void sclp_early_detect(void); void sclp_early_detect(void);
void sclp_early_printk(const char *s); void sclp_early_printk(const char *s);
void sclp_early_printk_force(const char *s); void __sclp_early_printk(const char *s, unsigned int len);
void __sclp_early_printk(const char *s, unsigned int len, unsigned int force);
int sclp_early_get_memsize(unsigned long *mem); int sclp_early_get_memsize(unsigned long *mem);
int sclp_early_get_hsa_size(unsigned long *hsa_size); int sclp_early_get_hsa_size(unsigned long *hsa_size);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
static void sclp_early_write(struct console *con, const char *s, unsigned int len) static void sclp_early_write(struct console *con, const char *s, unsigned int len)
{ {
__sclp_early_printk(s, len, 0); __sclp_early_printk(s, len);
} }
static struct console sclp_early_console = { static struct console sclp_early_console = {
......
...@@ -214,11 +214,11 @@ static int sclp_early_setup(int disable, int *have_linemode, int *have_vt220) ...@@ -214,11 +214,11 @@ static int sclp_early_setup(int disable, int *have_linemode, int *have_vt220)
* Output one or more lines of text on the SCLP console (VT220 and / * Output one or more lines of text on the SCLP console (VT220 and /
* or line-mode). * or line-mode).
*/ */
void __sclp_early_printk(const char *str, unsigned int len, unsigned int force) void __sclp_early_printk(const char *str, unsigned int len)
{ {
int have_linemode, have_vt220; int have_linemode, have_vt220;
if (!force && sclp_init_state != sclp_init_state_uninitialized) if (sclp_init_state != sclp_init_state_uninitialized)
return; return;
if (sclp_early_setup(0, &have_linemode, &have_vt220) != 0) if (sclp_early_setup(0, &have_linemode, &have_vt220) != 0)
return; return;
...@@ -231,12 +231,7 @@ void __sclp_early_printk(const char *str, unsigned int len, unsigned int force) ...@@ -231,12 +231,7 @@ void __sclp_early_printk(const char *str, unsigned int len, unsigned int force)
void sclp_early_printk(const char *str) void sclp_early_printk(const char *str)
{ {
__sclp_early_printk(str, strlen(str), 0); __sclp_early_printk(str, strlen(str));
}
void sclp_early_printk_force(const char *str)
{
__sclp_early_printk(str, strlen(str), 1);
} }
int __init sclp_early_read_info(void) int __init sclp_early_read_info(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment