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

Commit f296401b authored by Fabian Frederick's avatar Fabian Frederick Committed by Geert Uytterhoeven
Browse files

m68k/amiga: Convert printk(foo to pr_foo() 



-no level printk converted to pr_warn/pr_info
-fixed a small identation problem

This is untested

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 486df8bc

arch/m68k/amiga/amisound.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void __init amiga_init_sound(void) 


	snd_data = amiga_chip_alloc_res(sizeof(sine_data), &beep_res);

	if (!snd_data) {

		printk (KERN_CRIT "amiga init_sound: failed to allocate chipmem\n");

		pr_crit("amiga init_sound: failed to allocate chipmem\n");

		return;

	}

	memcpy (snd_data, sine_data, sizeof(sine_data));

arch/m68k/amiga/config.c

+10 −10
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ int __init amiga_parse_bootinfo(const struct bi_record *record) 
			dev->boardaddr = be32_to_cpu(cd->cd_BoardAddr);

			dev->boardsize = be32_to_cpu(cd->cd_BoardSize);

		} else

			printk("amiga_parse_bootinfo: too many AutoConfig devices\n");

			pr_warn("amiga_parse_bootinfo: too many AutoConfig devices\n");

#endif /* CONFIG_ZORRO */

		break;
@@ -209,9 +209,9 @@ static void __init amiga_identify(void) 


	memset(&amiga_hw_present, 0, sizeof(amiga_hw_present));



	printk("Amiga hardware found: ");

	pr_info("Amiga hardware found: ");

	if (amiga_model >= AMI_500 && amiga_model <= AMI_DRACO) {

		printk("[%s] ", amiga_models[amiga_model-AMI_500]);

		pr_cont("[%s] ", amiga_models[amiga_model-AMI_500]);

		strcat(amiga_model_name, amiga_models[amiga_model-AMI_500]);

	}
@@ -322,7 +322,7 @@ static void __init amiga_identify(void) 


#define AMIGAHW_ANNOUNCE(name, str)		\

	if (AMIGAHW_PRESENT(name))		\

		printk(str)

		pr_cont(str)



	AMIGAHW_ANNOUNCE(AMI_VIDEO, "VIDEO ");

	AMIGAHW_ANNOUNCE(AMI_BLITTER, "BLITTER ");
@@ -354,8 +354,8 @@ static void __init amiga_identify(void) 
	AMIGAHW_ANNOUNCE(MAGIC_REKICK, "MAGIC_REKICK ");

	AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA ");

	if (AMIGAHW_PRESENT(ZORRO))

		printk("ZORRO%s ", AMIGAHW_PRESENT(ZORRO3) ? "3" : "");

	printk("\n");

		pr_cont("ZORRO%s ", AMIGAHW_PRESENT(ZORRO3) ? "3" : "");

	pr_cont("\n");



#undef AMIGAHW_ANNOUNCE

}
@@ -424,7 +424,7 @@ void __init config_amiga(void) 
			if (m68k_memory[i].addr < 16*1024*1024) {

				if (i == 0) {

					/* don't cut off the branch we're sitting on */

					printk("Warning: kernel runs in Zorro II memory\n");

					pr_warn("Warning: kernel runs in Zorro II memory\n");

					continue;

				}

				disabled_z2mem += m68k_memory[i].size;
@@ -435,7 +435,7 @@ void __init config_amiga(void) 
			}

		}

		if (disabled_z2mem)

		printk("%dK of Zorro II memory will not be used as system memory\n",

			pr_info("%dK of Zorro II memory will not be used as system memory\n",

				disabled_z2mem>>10);

	}
@@ -475,7 +475,7 @@ static void __init amiga_sched_init(irq_handler_t timer_routine) 
	jiffy_ticks = DIV_ROUND_CLOSEST(amiga_eclock, HZ);



	if (request_resource(&mb_resources._ciab, &sched_res))

		printk("Cannot allocate ciab.ta{lo,hi}\n");

		pr_warn("Cannot allocate ciab.ta{lo,hi}\n");

	ciab.cra &= 0xC0;   /* turn off timer A, continuous mode, from Eclk */

	ciab.talo = jiffy_ticks % 256;

	ciab.tahi = jiffy_ticks / 256;