Skip to content

Commit

Permalink
s390/sclp: remove unused sclp_early_printk_forced
Browse files Browse the repository at this point in the history
This reverts commit 55a5542 ("s390/hibernate: fix error handling when
suspend cpu != resume cpu"). It added sclp_early_printk_force() which
is no longer used since commit 3942162 ("s390: remove broken
hibernate / power management support"). No hibernate - no problem.

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
  • Loading branch information
Vasily Gorbik committed Sep 21, 2020
1 parent 14ab622 commit 5596c4c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 11 deletions.
3 changes: 1 addition & 2 deletions arch/s390/include/asm/sclp.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_detect(void);
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, unsigned int force);
void __sclp_early_printk(const char *s, unsigned int len);

int sclp_early_get_memsize(unsigned long *mem);
int sclp_early_get_hsa_size(unsigned long *hsa_size);
Expand Down
2 changes: 1 addition & 1 deletion arch/s390/kernel/early_printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

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 = {
Expand Down
11 changes: 3 additions & 8 deletions drivers/s390/char/sclp_early_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 /
* 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;

if (!force && sclp_init_state != sclp_init_state_uninitialized)
if (sclp_init_state != sclp_init_state_uninitialized)
return;
if (sclp_early_setup(0, &have_linemode, &have_vt220) != 0)
return;
Expand All @@ -231,12 +231,7 @@ void __sclp_early_printk(const char *str, unsigned int len, unsigned int force)

void sclp_early_printk(const char *str)
{
__sclp_early_printk(str, strlen(str), 0);
}

void sclp_early_printk_force(const char *str)
{
__sclp_early_printk(str, strlen(str), 1);
__sclp_early_printk(str, strlen(str));
}

int __init sclp_early_read_info(void)
Expand Down

0 comments on commit 5596c4c

Please sign in to comment.