Commit 0e37a23e authored by Finn Thain's avatar Finn Thain Committed by Geert Uytterhoeven
Browse files

m68k/mac: More printk modernization 



Log message fragments used to be printed on one line but now get split up.
Fix this. Also, suppress log spam that merely prints known pointer values.

Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 0b07194b

arch/m68k/mac/baboon.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ void __init baboon_init(void) 
	baboon = (struct baboon *) BABOON_BASE;

	baboon_present = 1;



	printk("Baboon detected at %p\n", baboon);

	pr_debug("Baboon detected at %p\n", baboon);

}



/*

arch/m68k/mac/iop.c

+2 −2
Original line number Diff line number Diff line
@@ -273,10 +273,10 @@ void __init iop_init(void) 
	int i;



	if (iop_scc_present) {

		pr_info("IOP: detected SCC IOP at %p\n", iop_base[IOP_NUM_SCC]);

		pr_debug("SCC IOP detected at %p\n", iop_base[IOP_NUM_SCC]);

	}

	if (iop_ism_present) {

		pr_info("IOP: detected ISM IOP at %p\n", iop_base[IOP_NUM_ISM]);

		pr_debug("ISM IOP detected at %p\n", iop_base[IOP_NUM_ISM]);

		iop_start(iop_base[IOP_NUM_ISM]);

		iop_alive(iop_base[IOP_NUM_ISM]); /* clears the alive flag */

	}

arch/m68k/mac/psc.c

+2 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void psc_debug_dump(void) 
		return;



	for (i = 0x30 ; i < 0x70 ; i += 0x10) {

		printk("PSC #%d:  IFR = 0x%02X IER = 0x%02X\n",

		printk(KERN_DEBUG "PSC #%d:  IFR = 0x%02X IER = 0x%02X\n",

			i >> 4,

			(int) psc_read_byte(pIFRbase + i),

			(int) psc_read_byte(pIERbase + i));
@@ -59,14 +59,12 @@ static __init void psc_dma_die_die_die(void) 
{

	int i;



	printk("Killing all PSC DMA channels...");

	for (i = 0 ; i < 9 ; i++) {

		psc_write_word(PSC_CTL_BASE + (i << 4), 0x8800);

		psc_write_word(PSC_CTL_BASE + (i << 4), 0x1000);

		psc_write_word(PSC_CMD_BASE + (i << 5), 0x1100);

		psc_write_word(PSC_CMD_BASE + (i << 5) + 0x10, 0x1100);

	}

	printk("done!\n");

}



/*
@@ -92,7 +90,7 @@ void __init psc_init(void) 


	psc = (void *) PSC_BASE;



	printk("PSC detected at %p\n", psc);

	pr_debug("PSC detected at %p\n", psc);



	psc_dma_die_die_die();

arch/m68k/mac/via.c

+5 −13
Original line number Diff line number Diff line
@@ -121,18 +121,21 @@ void via_debug_dump(void); 


void __init via_init(void)

{

	via1 = (void *)VIA1_BASE;

	pr_debug("VIA1 detected at %p\n", via1);



	switch(macintosh_config->via_type) {



		/* IIci, IIsi, IIvx, IIvi (P6xx), LC series */



		case MAC_VIA_IICI:

			via1 = (void *) VIA1_BASE;

			if (macintosh_config->ident == MAC_MODEL_IIFX) {

				via2 = NULL;

				rbv_present = 0;

				oss_present = 1;

			} else {

				via2 = (void *) RBV_BASE;

				pr_debug("VIA2 (RBV) detected at %p\n", via2);

				rbv_present = 1;

				oss_present = 0;

			}
@@ -154,8 +157,8 @@ void __init via_init(void) 


		case MAC_VIA_QUADRA:

		case MAC_VIA_II:

			via1 = (void *) VIA1_BASE;

			via2 = (void *) VIA2_BASE;

			pr_debug("VIA2 detected at %p\n", via2);

			rbv_present = 0;

			oss_present = 0;

			rbv_clear = 0x00;
@@ -168,17 +171,6 @@ void __init via_init(void) 
			panic("UNKNOWN VIA TYPE");

	}



	printk(KERN_INFO "VIA1 at %p is a 6522 or clone\n", via1);



	printk(KERN_INFO "VIA2 at %p is ", via2);

	if (rbv_present) {

		printk("an RBV\n");

	} else if (oss_present) {

		printk("an OSS\n");

	} else {

		printk("a 6522 or clone\n");

	}



#ifdef DEBUG_VIA

	via_debug_dump();

#endif