hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

m68k/mvme16x: Modernize printing of kernel messages 

Convert from printk() to pr_*().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Geert Uytterhoeven 2016-12-06 17:10:23 +01:00
parent 0c29d757f3
commit 3c8bc6b7d9
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/m68k/mvme16x/config.c
View File

@ -72,7 +72,7 @@ int __init mvme16x_parse_bootinfo(const struct bi_record *bi)
void mvme16x_reset(void) void mvme16x_reset(void)
{ {
printk ("\r\n\nCalled mvme16x_reset\r\n" pr_info("\r\n\nCalled mvme16x_reset\r\n"
"\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r"); "\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r\r");
/* The string of returns is to delay the reset until the whole /* The string of returns is to delay the reset until the whole
* message is output. Assert reset bit in GCSR */ * message is output. Assert reset bit in GCSR */
@ -289,7 +289,7 @@ void __init config_mvme16x(void)
if (strncmp("BDID", p->bdid, 4)) if (strncmp("BDID", p->bdid, 4))
{ {
printk ("\n\nBug call .BRD_ID returned garbage - giving up\n\n"); pr_crit("Bug call .BRD_ID returned garbage - giving up\n");
while (1) while (1)
; ;
} }
@ -298,7 +298,7 @@ void __init config_mvme16x(void)
vme_brdtype = brdno; vme_brdtype = brdno;
mvme16x_get_model(id); mvme16x_get_model(id);
printk ("\nBRD_ID: %s BUG %x.%x %02x/%02x/%02x\n", id, p->rev>>4, pr_info("BRD_ID: %s BUG %x.%x %02x/%02x/%02x\n", id, p->rev >> 4,
p->rev & 0xf, p->yr, p->mth, p->day); p->rev & 0xf, p->yr, p->mth, p->day);
if (brdno == 0x0162 || brdno == 0x172) if (brdno == 0x0162 || brdno == 0x172)
{ {
@ -306,16 +306,16 @@ void __init config_mvme16x(void)
mvme16x_config = rev | MVME16x_CONFIG_GOT_SCCA; mvme16x_config = rev | MVME16x_CONFIG_GOT_SCCA;
printk ("MVME%x Hardware status:\n", brdno); pr_info("MVME%x Hardware status:\n", brdno);
printk (" CPU Type 68%s040\n", pr_info(" CPU Type 68%s040\n",
rev & MVME16x_CONFIG_GOT_FPU ? "" : "LC"); rev & MVME16x_CONFIG_GOT_FPU ? "" : "LC");
printk (" CPU clock %dMHz\n", pr_info(" CPU clock %dMHz\n",
rev & MVME16x_CONFIG_SPEED_32 ? 32 : 25); rev & MVME16x_CONFIG_SPEED_32 ? 32 : 25);
printk (" VMEchip2 %spresent\n", pr_info(" VMEchip2 %spresent\n",
rev & MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : ""); rev & MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : "");
printk (" SCSI interface %spresent\n", pr_info(" SCSI interface %spresent\n",
rev & MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : ""); rev & MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : "");
printk (" Ethernet interface %spresent\n", pr_info(" Ethernet interface %spresent\n",
rev & MVME16x_CONFIG_NO_ETHERNET ? "NOT " : ""); rev & MVME16x_CONFIG_NO_ETHERNET ? "NOT " : "");
} }
else else

2
arch/m68k/mvme16x/rtc.c
View File

@ -158,7 +158,7 @@ static int __init rtc_MK48T08_init(void)
if (!MACH_IS_MVME16x) if (!MACH_IS_MVME16x)
return -ENODEV; return -ENODEV;
printk(KERN_INFO "MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION); pr_info("MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);
return misc_register(&rtc_dev); return misc_register(&rtc_dev);
} }
device_initcall(rtc_MK48T08_init); device_initcall(rtc_MK48T08_init);