Commit f975b655 authored by Nathan Lynch's avatar Nathan Lynch Committed by Michael Ellerman
Browse files

powerpc/rtas: define pr_fmt and convert printk call sites 



Set pr_fmt to "rtas: " and convert the handful of printk() uses in
rtas.c, adjusting the messages to remove now-redundant "RTAS"
strings.

Note that rtas_restart(), rtas_power_off(), and rtas_halt() all
currently use printk() without specifying a log level. These have been
changed to use pr_emerg(), which matches the behavior of
rtas_os_term().

Signed-off-by: default avatarNathan Lynch <nathanl@linux.ibm.com>
Reviewed-by: default avatarAndrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20221118150751.469393-9-nathanl@linux.ibm.com
parent 9581f8a0

arch/powerpc/kernel/rtas.c

+10 −9
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
 * Copyright (C) 2001 IBM.

 */



#define pr_fmt(fmt)	"rtas: " fmt



#include <linux/capability.h>

#include <linux/delay.h>

#include <linux/export.h>
@@ -718,8 +720,7 @@ static int rtas_error_rc(int rtas_rc) 
			rc = -ENODEV;

			break;

		default:

			printk(KERN_ERR "%s: unexpected RTAS error %d\n",

					__func__, rtas_rc);

			pr_err("%s: unexpected error %d\n", __func__, rtas_rc);

			rc = -ERANGE;

			break;

	}
@@ -923,7 +924,7 @@ void __noreturn rtas_restart(char *cmd) 
{

	if (rtas_flash_term_hook)

		rtas_flash_term_hook(SYS_RESTART);

	printk("RTAS system-reboot returned %d\n",

	pr_emerg("system-reboot returned %d\n",

		 rtas_call(rtas_token("system-reboot"), 0, 1, NULL));

	for (;;);

}
@@ -933,7 +934,7 @@ void rtas_power_off(void) 
	if (rtas_flash_term_hook)

		rtas_flash_term_hook(SYS_POWER_OFF);

	/* allow power on only with power button press */

	printk("RTAS power-off returned %d\n",

	pr_emerg("power-off returned %d\n",

		 rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1));

	for (;;);

}
@@ -943,7 +944,7 @@ void __noreturn rtas_halt(void) 
	if (rtas_flash_term_hook)

		rtas_flash_term_hook(SYS_HALT);

	/* allow power on only with power button press */

	printk("RTAS power-off returned %d\n",

	pr_emerg("power-off returned %d\n",

		 rtas_call(rtas_token("power-off"), 2, 1, NULL, -1, -1));

	for (;;);

}
@@ -978,7 +979,7 @@ void rtas_os_term(char *str) 
	} while (rtas_busy_delay_time(status));



	if (status != 0)

		printk(KERN_EMERG "ibm,os-term call failed %d\n", status);

		pr_emerg("ibm,os-term call failed %d\n", status);

}



/**