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

Commit 3c8bc6b7 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/mvme16x: Modernize printing of kernel messages 



Convert from printk() to pr_*().

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 0c29d757

arch/m68k/mvme16x/config.c

+16 −16
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ int __init mvme16x_parse_bootinfo(const struct bi_record *bi) 


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");

	/* The string of returns is to delay the reset until the whole

	 * message is output.  Assert reset bit in GCSR */
@@ -289,7 +289,7 @@ void __init config_mvme16x(void) 


    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)

		;

    }
@@ -298,7 +298,7 @@ void __init config_mvme16x(void) 
	vme_brdtype = brdno;



    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);

    if (brdno == 0x0162 || brdno == 0x172)

    {
@@ -306,16 +306,16 @@ void __init config_mvme16x(void) 


	mvme16x_config = rev | MVME16x_CONFIG_GOT_SCCA;



	printk ("MVME%x Hardware status:\n", brdno);

	printk ("    CPU Type           68%s040\n",

	pr_info("MVME%x Hardware status:\n", brdno);

	pr_info("    CPU Type           68%s040\n",

		rev & MVME16x_CONFIG_GOT_FPU ? "" : "LC");

	printk ("    CPU clock          %dMHz\n",

	pr_info("    CPU clock          %dMHz\n",

		rev & MVME16x_CONFIG_SPEED_32 ? 32 : 25);

	printk ("    VMEchip2           %spresent\n",

	pr_info("    VMEchip2           %spresent\n",

		rev & MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : "");

	printk ("    SCSI interface     %spresent\n",

	pr_info("    SCSI interface     %spresent\n",

		rev & MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : "");

	printk ("    Ethernet interface %spresent\n",

	pr_info("    Ethernet interface %spresent\n",

		rev & MVME16x_CONFIG_NO_ETHERNET ? "NOT " : "");

    }

    else

arch/m68k/mvme16x/rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static int __init rtc_MK48T08_init(void) 
	if (!MACH_IS_MVME16x)

		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);

}

device_initcall(rtc_MK48T08_init);