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

Commit 6074a139 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k/setup: Use pr_*() and __func__ instead of plain printk() 



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

arch/m68k/kernel/setup_mm.c

+10 −9
Original line number Original line Diff line number Diff line
@@ -161,7 +161,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) 
				m68k_memory[m68k_num_memory].size = data[1];

				m68k_memory[m68k_num_memory].size = data[1];

				m68k_num_memory++;

				m68k_num_memory++;

			} else

			} else

				printk("m68k_parse_bootinfo: too many memory chunks\n");

				pr_warn("%s: too many memory chunks\n",

					__func__);

			break;

			break;





		case BI_RAMDISK:

		case BI_RAMDISK:
@@ -197,7 +198,7 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) 
				unknown = 1;

				unknown = 1;

		}

		}

		if (unknown)

		if (unknown)

			printk("m68k_parse_bootinfo: unknown tag 0x%04x ignored\n",

			pr_warn("%s: unknown tag 0x%04x ignored\n", __func__,

				   record->tag);

				   record->tag);

		record = (struct bi_record *)((unsigned long)record +

		record = (struct bi_record *)((unsigned long)record +

					      record->size);

					      record->size);
@@ -206,8 +207,8 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) 
	m68k_realnum_memory = m68k_num_memory;

	m68k_realnum_memory = m68k_num_memory;

#ifdef CONFIG_SINGLE_MEMORY_CHUNK

#ifdef CONFIG_SINGLE_MEMORY_CHUNK

	if (m68k_num_memory > 1) {

	if (m68k_num_memory > 1) {

		printk("Ignoring last %i chunks of physical memory\n",

		pr_warn("%s: ignoring last %i chunks of physical memory\n",

		       (m68k_num_memory - 1));

			__func__, (m68k_num_memory - 1));

		m68k_num_memory = 1;

		m68k_num_memory = 1;

	}

	}

#endif

#endif
@@ -247,7 +248,7 @@ void __init setup_arch(char **cmdline_p) 
		asm (".chip 68060; movec %%pcr,%0; .chip 68k"

		asm (".chip 68060; movec %%pcr,%0; .chip 68k"

		     : "=d" (pcr));

		     : "=d" (pcr));

		if (((pcr >> 8) & 0xff) <= 5) {

		if (((pcr >> 8) & 0xff) <= 5) {

			printk("Enabling workaround for errata I14\n");

			pr_warn("Enabling workaround for errata I14\n");

			asm (".chip 68060; movec %0,%%pcr; .chip 68k"

			asm (".chip 68060; movec %0,%%pcr; .chip 68k"

			     : : "d" (pcr | 0x20));

			     : : "d" (pcr | 0x20));

		}

		}
@@ -353,7 +354,7 @@ void __init setup_arch(char **cmdline_p) 
				     BOOTMEM_DEFAULT);

				     BOOTMEM_DEFAULT);

		initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr);

		initrd_start = (unsigned long)phys_to_virt(m68k_ramdisk.addr);

		initrd_end = initrd_start + m68k_ramdisk.size;

		initrd_end = initrd_start + m68k_ramdisk.size;

		printk("initrd: %08lx - %08lx\n", initrd_start, initrd_end);

		pr_info("initrd: %08lx - %08lx\n", initrd_start, initrd_end);

	}

	}

#endif

#endif
@@ -538,9 +539,9 @@ void check_bugs(void) 
{

{

#ifndef CONFIG_M68KFPU_EMU

#ifndef CONFIG_M68KFPU_EMU

	if (m68k_fputype == 0) {

	if (m68k_fputype == 0) {

		printk(KERN_EMERG "*** YOU DO NOT HAVE A FLOATING POINT UNIT, "

		pr_emerg("*** YOU DO NOT HAVE A FLOATING POINT UNIT, "

			"WHICH IS REQUIRED BY LINUX/M68K ***\n");

			"WHICH IS REQUIRED BY LINUX/M68K ***\n");

		printk(KERN_EMERG "Upgrade your hardware or join the FPU "

		pr_emerg("Upgrade your hardware or join the FPU "

			"emulation project\n");

			"emulation project\n");

		panic("no FPU");

		panic("no FPU");

	}

	}