microblaze: Fix coding style issues

Fix coding style issues reported by checkpatch.pl. Signed-off-by: Michal Simek <monstr@monstr.eu>

microblaze: Fix coding style issues
Fix coding style issues reported by checkpatch.pl. Signed-off-by: Michal Simek <monstr@monstr.eu>
Michal Simek · Michal Simek
1 parent 5b3084b582
Showing 32 changed files with 259 additions and 294 deletions Side-by-side Diff
arch/microblaze/include/asm/io.h
arch/microblaze/kernel/cpu/cache.c
arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c
arch/microblaze/kernel/cpu/cpuinfo.c
arch/microblaze/kernel/cpu/pvr.c
arch/microblaze/kernel/dma.c
arch/microblaze/kernel/early_printk.c
arch/microblaze/kernel/exceptions.c
arch/microblaze/kernel/ftrace.c
arch/microblaze/kernel/heartbeat.c
arch/microblaze/kernel/intc.c
arch/microblaze/kernel/kgdb.c
arch/microblaze/kernel/module.c
arch/microblaze/kernel/process.c
arch/microblaze/kernel/ptrace.c
arch/microblaze/kernel/setup.c
arch/microblaze/kernel/signal.c
arch/microblaze/kernel/sys_microblaze.c
arch/microblaze/kernel/traps.c
arch/microblaze/lib/ashldi3.c
@@ -150,7 +150,7 @@
 #define page_to_bus(page)	(page_to_phys(page))
 #define bus_to_virt(addr)	(phys_to_virt(addr))
  
-extern void iounmap(void *addr);
+extern void iounmap(void __iomem *addr);
 /*extern void *__ioremap(phys_addr_t address, unsigned long size,
 		unsigned long flags);*/
 extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
@@ -17,82 +17,70 @@
  
 static inline void __enable_icache_msr(void)
 {
-	__asm__ __volatile__ ("	msrset	r0, %0;		\
-				nop; "			\
+	__asm__ __volatile__ ("	 msrset	r0, %0;"	\
+				"nop;"			\
 			: : "i" (MSR_ICE) : "memory");
 }
  
 static inline void __disable_icache_msr(void)
 {
-	__asm__ __volatile__ ("	msrclr	r0, %0;		\
-				nop; "			\
+	__asm__ __volatile__ ("	 msrclr	r0, %0;"	\
+				"nop;"			\
 			: : "i" (MSR_ICE) : "memory");
 }
  
 static inline void __enable_dcache_msr(void)
 {
-	__asm__ __volatile__ ("	msrset	r0, %0;		\
-				nop; "			\
-				:			\
-				: "i" (MSR_DCE)		\
-				: "memory");
+	__asm__ __volatile__ ("	 msrset	r0, %0;"	\
+				"nop;"			\
+			: : "i" (MSR_DCE) : "memory");
 }
  
 static inline void __disable_dcache_msr(void)
 {
-	__asm__ __volatile__ ("	msrclr	r0, %0;		\
-				nop; "			\
-				:			\
-				: "i" (MSR_DCE)		\
-				: "memory");
+	__asm__ __volatile__ ("	 msrclr	r0, %0;"	\
+				"nop; "			\
+			: : "i" (MSR_DCE) : "memory");
 }
  
 static inline void __enable_icache_nomsr(void)
 {
-	__asm__ __volatile__ ("	mfs	r12, rmsr;	\
-				nop;			\
-				ori	r12, r12, %0;	\
-				mts	rmsr, r12;	\
-				nop; "			\
-				:			\
-				: "i" (MSR_ICE)		\
-				: "memory", "r12");
+	__asm__ __volatile__ ("	 mfs	r12, rmsr;"	\
+				"nop;"			\
+				"ori	r12, r12, %0;"	\
+				"mts	rmsr, r12;"	\
+				"nop;"			\
+			: : "i" (MSR_ICE) : "memory", "r12");
 }
  
 static inline void __disable_icache_nomsr(void)
 {
-	__asm__ __volatile__ ("	mfs	r12, rmsr;	\
-				nop;			\
-				andi	r12, r12, ~%0;	\
-				mts	rmsr, r12;	\
-				nop; "			\
-				:			\
-				: "i" (MSR_ICE)		\
-				: "memory", "r12");
+	__asm__ __volatile__ ("	 mfs	r12, rmsr;"	\
+				"nop;"			\
+				"andi	r12, r12, ~%0;"	\
+				"mts	rmsr, r12;"	\
+				"nop;"			\
+			: : "i" (MSR_ICE) : "memory", "r12");
 }
  
 static inline void __enable_dcache_nomsr(void)
 {
-	__asm__ __volatile__ ("	mfs	r12, rmsr;	\
-				nop;			\
-				ori	r12, r12, %0;	\
-				mts	rmsr, r12;	\
-				nop; "			\
-				:			\
-				: "i" (MSR_DCE)		\
-				: "memory", "r12");
+	__asm__ __volatile__ ("	 mfs	r12, rmsr;"	\
+				"nop;"			\
+				"ori	r12, r12, %0;"	\
+				"mts	rmsr, r12;"	\
+				"nop;"			\
+			: : "i" (MSR_DCE) : "memory", "r12");
 }
  
 static inline void __disable_dcache_nomsr(void)
 {
-	__asm__ __volatile__ ("	mfs	r12, rmsr;	\
-				nop;			\
-				andi	r12, r12, ~%0;	\
-				mts	rmsr, r12;	\
-				nop; "			\
-				:			\
-				: "i" (MSR_DCE)		\
-				: "memory", "r12");
+	__asm__ __volatile__ ("	 mfs	r12, rmsr;"	\
+				"nop;"			\
+				"andi	r12, r12, ~%0;"	\
+				"mts	rmsr, r12;"	\
+				"nop;"			\
+			: : "i" (MSR_DCE) : "memory", "r12");
 }
  
  
@@ -106,7 +94,7 @@
 	int align = ~(cache_line_length - 1);				\
 	end = min(start + cache_size, end);				\
 	start &= align;							\
-} while (0);
+} while (0)
  
 /*
  * Helper macro to loop over the specified cache_size/line_length and
  
@@ -118,12 +106,12 @@
 	int step = -line_length;					\
 	WARN_ON(step >= 0);						\
 									\
-	__asm__ __volatile__ (" 1:      " #op " %0, r0;			\
-					bgtid   %0, 1b;			\
-					addk    %0, %0, %1;		\
-					" : : "r" (len), "r" (step)	\
+	__asm__ __volatile__ (" 1:      " #op " %0, r0;"		\
+					"bgtid   %0, 1b;"		\
+					"addk    %0, %0, %1;"		\
+					: : "r" (len), "r" (step)	\
 					: "memory");			\
-} while (0);
+} while (0)
  
 /* Used for wdc.flush/clear which can use rB for offset which is not possible
  * to use for simple wdc or wic.
  
@@ -142,12 +130,12 @@
 	count = end - start;						\
 	WARN_ON(count < 0);						\
 									\
-	__asm__ __volatile__ (" 1:	" #op "	%0, %1;			\
-					bgtid	%1, 1b;			\
-					addk	%1, %1, %2;		\
-					" : : "r" (start), "r" (count),	\
+	__asm__ __volatile__ (" 1:	" #op "	%0, %1;"		\
+					"bgtid	%1, 1b;"		\
+					"addk	%1, %1, %2;"		\
+					: : "r" (start), "r" (count),	\
 					"r" (step) : "memory");		\
-} while (0);
+} while (0)
  
 /* It is used only first parameter for OP - for wic, wdc */
 #define CACHE_RANGE_LOOP_1(start, end, line_length, op)			\
  
@@ -157,13 +145,13 @@
 	end = ((end & align) == end) ? end - line_length : end & align;	\
 	WARN_ON(end - start < 0);					\
 									\
-	__asm__ __volatile__ (" 1:	" #op "	%1, r0;			\
-					cmpu	%0, %1, %2;		\
-					bgtid	%0, 1b;			\
-					addk	%1, %1, %3;		\
-				" : : "r" (temp), "r" (start), "r" (end),\
+	__asm__ __volatile__ (" 1:	" #op "	%1, r0;"		\
+					"cmpu	%0, %1, %2;"		\
+					"bgtid	%0, 1b;"		\
+					"addk	%1, %1, %3;"		\
+				: : "r" (temp), "r" (start), "r" (end),	\
 					"r" (line_length) : "memory");	\
-} while (0);
+} while (0)
  
 #define ASM_LOOP
  
@@ -352,7 +340,7 @@
 #endif
 	pr_debug("%s\n", __func__);
 #ifdef ASM_LOOP
-	CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length, wdc)
+	CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length, wdc);
 #else
 	for (i = 0; i < cpuinfo.dcache_size;
 		 i += cpuinfo.dcache_line_length)
@@ -361,7 +349,8 @@
 #endif
 }
  
-/* FIXME It is blindly invalidation as is expected
+/*
+ * FIXME It is blindly invalidation as is expected
  * but can't be called on noMMU in microblaze_cache_init below
  *
  * MS: noMMU kernel won't boot if simple wdc is used
@@ -375,7 +364,7 @@
 	pr_debug("%s\n", __func__);
 #ifdef ASM_LOOP
 	CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length,
-					wdc)
+					wdc);
 #else
 	for (i = 0; i < cpuinfo.dcache_size;
 		 i += cpuinfo.dcache_line_length)
  
  
  
  
  
  
  
  
  
@@ -616,49 +605,48 @@
 #define CPUVER_7_20_A	0x0c
 #define CPUVER_7_20_D	0x0f
  
-#define INFO(s)	printk(KERN_INFO "cache: " s "\n");
-
 void microblaze_cache_init(void)
 {
 	if (cpuinfo.use_instr & PVR2_USE_MSR_INSTR) {
 		if (cpuinfo.dcache_wb) {
-			INFO("wb_msr");
+			pr_info("wb_msr\n");
 			mbc = (struct scache *)&wb_msr;
 			if (cpuinfo.ver_code <= CPUVER_7_20_D) {
 				/* MS: problem with signal handling - hw bug */
-				INFO("WB won't work properly");
+				pr_info("WB won't work properly\n");
 			}
 		} else {
 			if (cpuinfo.ver_code >= CPUVER_7_20_A) {
-				INFO("wt_msr_noirq");
+				pr_info("wt_msr_noirq\n");
 				mbc = (struct scache *)&wt_msr_noirq;
 			} else {
-				INFO("wt_msr");
+				pr_info("wt_msr\n");
 				mbc = (struct scache *)&wt_msr;
 			}
 		}
 	} else {
 		if (cpuinfo.dcache_wb) {
-			INFO("wb_nomsr");
+			pr_info("wb_nomsr\n");
 			mbc = (struct scache *)&wb_nomsr;
 			if (cpuinfo.ver_code <= CPUVER_7_20_D) {
 				/* MS: problem with signal handling - hw bug */
-				INFO("WB won't work properly");
+				pr_info("WB won't work properly\n");
 			}
 		} else {
 			if (cpuinfo.ver_code >= CPUVER_7_20_A) {
-				INFO("wt_nomsr_noirq");
+				pr_info("wt_nomsr_noirq\n");
 				mbc = (struct scache *)&wt_nomsr_noirq;
 			} else {
-				INFO("wt_nomsr");
+				pr_info("wt_nomsr\n");
 				mbc = (struct scache *)&wt_nomsr;
 			}
 		}
 	}
-/* FIXME Invalidation is done in U-BOOT
- * WT cache: Data is already written to main memory
- * WB cache: Discard data on noMMU which caused that kernel doesn't boot
- */
+	/*
+	 * FIXME Invalidation is done in U-BOOT
+	 * WT cache: Data is already written to main memory
+	 * WB cache: Discard data on noMMU which caused that kernel doesn't boot
+	 */
 	/* invalidate_dcache(); */
 	enable_dcache();
  
@@ -27,7 +27,7 @@
 	early_printk("ERROR: Microblaze " x "-different for PVR and DTS\n");
 #else
 #define err_printk(x) \
-	printk(KERN_INFO "ERROR: Microblaze " x "-different for PVR and DTS\n");
+	pr_info("ERROR: Microblaze " x "-different for PVR and DTS\n");
 #endif
  
 void set_cpuinfo_pvr_full(struct cpuinfo *ci, struct device_node *cpu)
  
@@ -38,12 +38,11 @@
  
 	CI(ver_code, VERSION);
 	if (!ci->ver_code) {
-		printk(KERN_ERR "ERROR: MB has broken PVR regs "
-						"-> use DTS setting\n");
+		pr_err("ERROR: MB has broken PVR regs -> use DTS setting\n");
 		return;
 	}
  
-	temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |\
+	temp = PVR_USE_BARREL(pvr) | PVR_USE_MSR_INSTR(pvr) |
 		PVR_USE_PCMP_INSTR(pvr) | PVR_USE_DIV(pvr);
 	if (ci->use_instr != temp)
 		err_printk("BARREL, MSR, PCMP or DIV");
@@ -59,13 +58,13 @@
 		err_printk("HW_FPU");
 	ci->use_fpu = temp;
  
-	ci->use_exc = PVR_OPCODE_0x0_ILLEGAL(pvr) |\
-			PVR_UNALIGNED_EXCEPTION(pvr) |\
-			PVR_ILL_OPCODE_EXCEPTION(pvr) |\
-			PVR_IOPB_BUS_EXCEPTION(pvr) |\
-			PVR_DOPB_BUS_EXCEPTION(pvr) |\
-			PVR_DIV_ZERO_EXCEPTION(pvr) |\
-			PVR_FPU_EXCEPTION(pvr) |\
+	ci->use_exc = PVR_OPCODE_0x0_ILLEGAL(pvr) |
+			PVR_UNALIGNED_EXCEPTION(pvr) |
+			PVR_ILL_OPCODE_EXCEPTION(pvr) |
+			PVR_IOPB_BUS_EXCEPTION(pvr) |
+			PVR_DOPB_BUS_EXCEPTION(pvr) |
+			PVR_DIV_ZERO_EXCEPTION(pvr) |
+			PVR_FPU_EXCEPTION(pvr) |
 			PVR_FSL_EXCEPTION(pvr);
  
 	CI(pvr_user1, USER1);
@@ -68,32 +68,31 @@
  
 	cpu = (struct device_node *) of_find_node_by_type(NULL, "cpu");
 	if (!cpu)
-		printk(KERN_ERR "You don't have cpu!!!\n");
+		pr_err("You don't have cpu!!!\n");
  
-	printk(KERN_INFO "%s: initialising\n", __func__);
+	pr_info("%s: initialising\n", __func__);
  
 	switch (cpu_has_pvr()) {
 	case 0:
-		printk(KERN_WARNING
-			"%s: No PVR support. Using static CPU info from FDT\n",
+		pr_warn("%s: No PVR support. Using static CPU info from FDT\n",
 			__func__);
 		set_cpuinfo_static(&cpuinfo, cpu);
 		break;
 /* FIXME I found weird behavior with MB 7.00.a/b 7.10.a
  * please do not use FULL PVR with MMU */
 	case 1:
-		printk(KERN_INFO "%s: Using full CPU PVR support\n",
+		pr_info("%s: Using full CPU PVR support\n",
 			__func__);
 		set_cpuinfo_static(&cpuinfo, cpu);
 		set_cpuinfo_pvr_full(&cpuinfo, cpu);
 		break;
 	default:
-		printk(KERN_WARNING "%s: Unsupported PVR setting\n", __func__);
+		pr_warn("%s: Unsupported PVR setting\n", __func__);
 		set_cpuinfo_static(&cpuinfo, cpu);
 	}
  
 	if (cpuinfo.mmu_privins)
-		printk(KERN_WARNING "%s: Stream instructions enabled"
+		pr_warn("%s: Stream instructions enabled"
 			" - USERSPACE CAN LOCK THIS KERNEL!\n", __func__);
 }
@@ -27,7 +27,7 @@
 	tmp = 0x0;	/* Prevent warning about unused */	\
 	__asm__ __volatile__ (					\
 			"mfs	%0, rpvr" #pvrid ";"		\
-			: "=r" (tmp) : : "memory"); 		\
+			: "=r" (tmp) : : "memory");		\
 	val = tmp;						\
 }
  
@@ -11,7 +11,7 @@
 #include <linux/gfp.h>
 #include <linux/dma-debug.h>
 #include <linux/export.h>
-#include <asm/bug.h>
+#include <linux/bug.h>
  
 /*
  * Generic direct DMA implementation
  
@@ -197,9 +197,9 @@
  
 static int __init dma_init(void)
 {
-       dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
+	dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
  
-       return 0;
+	return 0;
 }
 fs_initcall(dma_init);
@@ -140,20 +140,20 @@
 		switch (version) {
 #ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
 		case UARTLITE:
-			printk(KERN_INFO "Early console on uartlite "
-						"at 0x%08x\n", base_addr);
+			pr_info("Early console on uartlite at 0x%08x\n",
+								base_addr);
 			early_console = &early_serial_uartlite_console;
 			break;
 #endif
 #ifdef CONFIG_SERIAL_8250_CONSOLE
 		case UART16550:
-			printk(KERN_INFO "Early console on uart16650 "
-						"at 0x%08x\n", base_addr);
+			pr_info("Early console on uart16650 at 0x%08x\n",
+								base_addr);
 			early_console = &early_serial_uart16550_console;
 			break;
 #endif
 		default:
-			printk(KERN_INFO  "Unsupported early console %d\n",
+			pr_info("Unsupported early console %d\n",
 								version);
 			return 1;
 		}
  
@@ -171,10 +171,9 @@
 {
 	if (!early_console_initialized || !early_console)
 		return;
-	printk(KERN_INFO "early_printk_console remapping from 0x%x to ",
-								base_addr);
+	pr_info("early_printk_console remapping from 0x%x to ", base_addr);
 	base_addr = (u32) ioremap(base_addr, PAGE_SIZE);
-	printk(KERN_CONT "0x%x\n", base_addr);
+	pr_cont("0x%x\n", base_addr);
  
 #ifdef CONFIG_MMU
 	/*
@@ -197,7 +196,7 @@
 {
 	if (!early_console_initialized || !early_console)
 		return;
-	printk(KERN_WARNING "disabling early console\n");
+	pr_warn("disabling early console\n");
 	unregister_console(early_console);
 	early_console_initialized = 0;
 }
@@ -40,7 +40,7 @@
 {
 	console_verbose();
 	spin_lock_irq(&die_lock);
-	printk(KERN_WARNING "Oops: %s, sig: %ld\n", str, err);
+	pr_warn("Oops: %s, sig: %ld\n", str, err);
 	show_regs(fp);
 	spin_unlock_irq(&die_lock);
 	/* do_exit() should take care of panic'ing from an interrupt
  
@@ -61,9 +61,9 @@
 {
 	siginfo_t info;
  
-	if (kernel_mode(regs)) {
+	if (kernel_mode(regs))
 		die("Exception in kernel mode", regs, signr);
-	}
+
 	info.si_signo = signr;
 	info.si_errno = 0;
 	info.si_code = code;
@@ -79,8 +79,7 @@
 #endif
  
 #if 0
-	printk(KERN_WARNING "Exception %02x in %s mode, FSR=%08x PC=%08x " \
-							"ESR=%08x\n",
+	pr_warn("Exception %02x in %s mode, FSR=%08x PC=%08x ESR=%08x\n",
 			type, user_mode(regs) ? "user" : "kernel", fsr,
 			(unsigned int) regs->pc, (unsigned int) regs->esr);
 #endif
@@ -92,8 +91,7 @@
 			_exception(SIGILL, regs, ILL_ILLOPC, addr);
 			return;
 		}
-		printk(KERN_WARNING "Illegal opcode exception " \
-							"in kernel mode.\n");
+		pr_warn("Illegal opcode exception in kernel mode.\n");
 		die("opcode exception", regs, SIGBUS);
 		break;
 	case MICROBLAZE_IBUS_EXCEPTION:
@@ -102,8 +100,7 @@
 			_exception(SIGBUS, regs, BUS_ADRERR, addr);
 			return;
 		}
-		printk(KERN_WARNING "Instruction bus error exception " \
-							"in kernel mode.\n");
+		pr_warn("Instruction bus error exception in kernel mode.\n");
 		die("bus exception", regs, SIGBUS);
 		break;
 	case MICROBLAZE_DBUS_EXCEPTION:
@@ -112,8 +109,7 @@
 			_exception(SIGBUS, regs, BUS_ADRERR, addr);
 			return;
 		}
-		printk(KERN_WARNING "Data bus error exception " \
-							"in kernel mode.\n");
+		pr_warn("Data bus error exception in kernel mode.\n");
 		die("bus exception", regs, SIGBUS);
 		break;
 	case MICROBLAZE_DIV_ZERO_EXCEPTION:
@@ -122,8 +118,7 @@
 			_exception(SIGFPE, regs, FPE_INTDIV, addr);
 			return;
 		}
-		printk(KERN_WARNING "Divide by zero exception " \
-							"in kernel mode.\n");
+		pr_warn("Divide by zero exception in kernel mode.\n");
 		die("Divide by zero exception", regs, SIGBUS);
 		break;
 	case MICROBLAZE_FPU_EXCEPTION:
@@ -151,8 +146,8 @@
 #endif
 	default:
 	/* FIXME what to do in unexpected exception */
-		printk(KERN_WARNING "Unexpected exception %02x "
-			"PC=%08x in %s mode\n", type, (unsigned int) addr,
+		pr_warn("Unexpected exception %02x PC=%08x in %s mode\n",
+			type, (unsigned int) addr,
 			kernel_mode(regs) ? "kernel" : "user");
 	}
 	return;
@@ -35,18 +35,18 @@
 	 * happen. This tool is too much intrusive to
 	 * ignore such a protection.
 	 */
-	asm volatile("	1:	lwi	%0, %2, 0;		\
-			2:	swi	%3, %2, 0;		\
-				addik	%1, r0, 0;		\
-			3:					\
-				.section .fixup, \"ax\";	\
-			4:	brid	3b;			\
-				addik	%1, r0, 1;		\
-				.previous;			\
-				.section __ex_table,\"a\";	\
-				.word	1b,4b;			\
-				.word	2b,4b;			\
-				.previous;"			\
+	asm volatile("	1:	lwi	%0, %2, 0;"		\
+			"2:	swi	%3, %2, 0;"		\
+			"	addik	%1, r0, 0;"		\
+			"3:"					\
+			"	.section .fixup, \"ax\";"	\
+			"4:	brid	3b;"			\
+			"	addik	%1, r0, 1;"		\
+			"	.previous;"			\
+			"	.section __ex_table,\"a\";"	\
+			"	.word	1b,4b;"			\
+			"	.word	2b,4b;"			\
+			"	.previous;"			\
 			: "=&r" (old), "=r" (faulted)
 			: "r" (parent), "r" (return_hooker)
 	);
@@ -81,16 +81,16 @@
 {
 	int faulted = 0;
  
-	__asm__ __volatile__("	1:	swi	%2, %1, 0;		\
-					addik	%0, r0, 0;		\
-				2:					\
-					.section .fixup, \"ax\";	\
-				3:	brid	2b;			\
-					addik	%0, r0, 1;		\
-					.previous;			\
-					.section __ex_table,\"a\";	\
-					.word	1b,3b;			\
-					.previous;"			\
+	__asm__ __volatile__("	1:	swi	%2, %1, 0;"		\
+				"	addik	%0, r0, 0;"		\
+				"2:"					\
+				"	.section .fixup, \"ax\";"	\
+				"3:	brid	2b;"			\
+				"	addik	%0, r0, 1;"		\
+				"	.previous;"			\
+				"	.section __ex_table,\"a\";"	\
+				"	.word	1b,3b;"			\
+				"	.previous;"			\
 				: "=r" (faulted)
 				: "r" (addr), "r" (value)
 	);
@@ -61,7 +61,7 @@
 	if (gpio) {
 		base_addr = be32_to_cpup(of_get_property(gpio, "reg", NULL));
 		base_addr = (unsigned long) ioremap(base_addr, PAGE_SIZE);
-		printk(KERN_NOTICE "Heartbeat GPIO at 0x%x\n", base_addr);
+		pr_notice("Heartbeat GPIO at 0x%x\n", base_addr);
  
 		/* GPIO is configured as output */
 		prop = (int *) of_get_property(gpio, "xlnx,is-bidir", NULL);
@@ -147,12 +147,12 @@
 	intr_mask =
 		be32_to_cpup(of_get_property(intc, "xlnx,kind-of-intr", NULL));
 	if (intr_mask > (u32)((1ULL << nr_irq) - 1))
-		printk(KERN_INFO " ERROR: Mismatch in kind-of-intr param\n");
+		pr_info(" ERROR: Mismatch in kind-of-intr param\n");
  
 #ifdef CONFIG_SELFMOD_INTC
 	selfmod_function((int *) arr_func, intc_baseaddr);
 #endif
-	printk(KERN_INFO "%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
+	pr_info("%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
 		intc->name, intc_baseaddr, nr_irq, intr_mask);
  
 	/*
@@ -141,7 +141,7 @@
 /*
  * Global data
  */
-struct kgdb_arch arch_kgdb_ops = {
+const struct kgdb_arch arch_kgdb_ops = {
 #ifdef __MICROBLAZEEL__
 	.gdb_bpt_instr = {0x18, 0x00, 0x0c, 0xba}, /* brki r16, 0x18 */
 #else
@@ -108,8 +108,7 @@
 			break;
  
 		default:
-			printk(KERN_ERR "module %s: "
-				"Unknown relocation: %u\n",
+			pr_err("module %s: Unknown relocation: %u\n",
 				module->name,
 				ELF32_R_TYPE(rela[i].r_info));
 			return -ENOEXEC;
@@ -15,29 +15,29 @@
 #include <linux/bitops.h>
 #include <linux/ptrace.h>
 #include <asm/pgalloc.h>
-#include <asm/uaccess.h> /* for USER_DS macros */
+#include <linux/uaccess.h> /* for USER_DS macros */
 #include <asm/cacheflush.h>
  
 void show_regs(struct pt_regs *regs)
 {
-	printk(KERN_INFO " Registers dump: mode=%X\r\n", regs->pt_mode);
-	printk(KERN_INFO " r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",
+	pr_info(" Registers dump: mode=%X\r\n", regs->pt_mode);
+	pr_info(" r1=%08lX, r2=%08lX, r3=%08lX, r4=%08lX\n",
 				regs->r1, regs->r2, regs->r3, regs->r4);
-	printk(KERN_INFO " r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n",
+	pr_info(" r5=%08lX, r6=%08lX, r7=%08lX, r8=%08lX\n",
 				regs->r5, regs->r6, regs->r7, regs->r8);
-	printk(KERN_INFO " r9=%08lX, r10=%08lX, r11=%08lX, r12=%08lX\n",
+	pr_info(" r9=%08lX, r10=%08lX, r11=%08lX, r12=%08lX\n",
 				regs->r9, regs->r10, regs->r11, regs->r12);
-	printk(KERN_INFO " r13=%08lX, r14=%08lX, r15=%08lX, r16=%08lX\n",
+	pr_info(" r13=%08lX, r14=%08lX, r15=%08lX, r16=%08lX\n",
 				regs->r13, regs->r14, regs->r15, regs->r16);
-	printk(KERN_INFO " r17=%08lX, r18=%08lX, r19=%08lX, r20=%08lX\n",
+	pr_info(" r17=%08lX, r18=%08lX, r19=%08lX, r20=%08lX\n",
 				regs->r17, regs->r18, regs->r19, regs->r20);
-	printk(KERN_INFO " r21=%08lX, r22=%08lX, r23=%08lX, r24=%08lX\n",
+	pr_info(" r21=%08lX, r22=%08lX, r23=%08lX, r24=%08lX\n",
 				regs->r21, regs->r22, regs->r23, regs->r24);
-	printk(KERN_INFO " r25=%08lX, r26=%08lX, r27=%08lX, r28=%08lX\n",
+	pr_info(" r25=%08lX, r26=%08lX, r27=%08lX, r28=%08lX\n",
 				regs->r25, regs->r26, regs->r27, regs->r28);
-	printk(KERN_INFO " r29=%08lX, r30=%08lX, r31=%08lX, rPC=%08lX\n",
+	pr_info(" r29=%08lX, r30=%08lX, r31=%08lX, rPC=%08lX\n",
 				regs->r29, regs->r30, regs->r31, regs->pc);
-	printk(KERN_INFO " msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n",
+	pr_info(" msr=%08lX, ear=%08lX, esr=%08lX, fsr=%08lX\n",
 				regs->msr, regs->ear, regs->esr, regs->fsr);
 }
  
@@ -40,7 +40,7 @@
 #include <asm/asm-offsets.h>
 #include <asm/cacheflush.h>
 #include <asm/syscall.h>
-#include <asm/io.h>
+#include <linux/io.h>
  
 /* Returns the address where the register at REG_OFFS in P is stashed away. */
 static microblaze_reg_t *reg_save_addr(unsigned reg_offs,
@@ -150,33 +150,35 @@
 	/* printk("TLB1 0x%08x, TLB0 0x%08x, tlb 0x%x\n", tlb0,
 							tlb1, kernel_tlb); */
  
-	printk("Ramdisk addr 0x%08x, ", ram);
+	pr_info("Ramdisk addr 0x%08x, ", ram);
 	if (fdt)
-		printk("FDT at 0x%08x\n", fdt);
+		pr_info("FDT at 0x%08x\n", fdt);
 	else
-		printk("Compiled-in FDT at 0x%08x\n",
+		pr_info("Compiled-in FDT at 0x%08x\n",
 					(unsigned int)_fdt_start);
  
 #ifdef CONFIG_MTD_UCLINUX
-	printk("Found romfs @ 0x%08x (0x%08x)\n",
+	pr_info("Found romfs @ 0x%08x (0x%08x)\n",
 			romfs_base, romfs_size);
-	printk("#### klimit %p ####\n", old_klimit);
+	pr_info("#### klimit %p ####\n", old_klimit);
 	BUG_ON(romfs_size < 0); /* What else can we do? */
  
-	printk("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",
+	pr_info("Moved 0x%08x bytes from 0x%08x to 0x%08x\n",
 			romfs_size, romfs_base, (unsigned)&__bss_stop);
  
-	printk("New klimit: 0x%08x\n", (unsigned)klimit);
+	pr_info("New klimit: 0x%08x\n", (unsigned)klimit);
 #endif
  
 #if CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR
-	if (msr)
-		printk("!!!Your kernel has setup MSR instruction but "
-				"CPU don't have it %x\n", msr);
+	if (msr) {
+		pr_info("!!!Your kernel has setup MSR instruction but ");
+		pr_cont("CPU don't have it %x\n", msr);
+	}
 #else
-	if (!msr)
-		printk("!!!Your kernel not setup MSR instruction but "
-				"CPU have it %x\n", msr);
+	if (!msr) {
+		pr_info("!!!Your kernel not setup MSR instruction but ");
+		pr_cont"CPU have it %x\n", msr);
+	}
 #endif
  
 	/* Do not copy reset vectors. offset = 0x2 means skip the first
@@ -255,7 +255,7 @@
 	set_fs(USER_DS);
  
 #ifdef DEBUG_SIG
-	printk(KERN_INFO "SIG deliver (%s:%d): sp=%p pc=%08lx\n",
+	pr_info("SIG deliver (%s:%d): sp=%p pc=%08lx\n",
 		current->comm, current->pid, frame, regs->pc);
 #endif
  
@@ -330,8 +330,8 @@
 	int signr;
 	struct k_sigaction ka;
 #ifdef DEBUG_SIG
-	printk(KERN_INFO "do signal: %p %d\n", regs, in_syscall);
-	printk(KERN_INFO "do signal2: %lx %lx %ld [%lx]\n", regs->pc, regs->r1,
+	pr_info("do signal: %p %d\n", regs, in_syscall);
+	pr_info("do signal2: %lx %lx %ld [%lx]\n", regs->pc, regs->r1,
 			regs->r12, current_thread_info()->flags);
 #endif
  
@@ -31,7 +31,6 @@
 #include <linux/uaccess.h>
 #include <linux/unistd.h>
 #include <linux/slab.h>
-
 #include <asm/syscalls.h>
  
 asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
@@ -26,7 +26,7 @@
  
 static int __init kstack_setup(char *s)
 {
-	return !strict_strtoul(s, 0, &kstack_depth_to_print);
+	return !kstrtoul(s, 0, &kstack_depth_to_print);
 }
 __setup("kstack=", kstack_setup);
  
@@ -66,9 +66,7 @@
 	}
 	print_hex_dump(KERN_INFO, "", DUMP_PREFIX_ADDRESS, 32, 4, (void *)fp,
 		       words_to_show << 2, 0);
-	printk(KERN_INFO "\n\n");
-
-	pr_info("Call Trace:\n");
+	pr_info("\n\nCall Trace:\n");
 	microblaze_unwind(task, NULL);
 	pr_info("\n");
  
@@ -25,6 +25,5 @@
  
 	return w.ll;
 }
-
 EXPORT_SYMBOL(__ashldi3);
@@ -27,6 +27,5 @@
  
 	return w.ll;
 }
-
 EXPORT_SYMBOL(__ashrdi3);
@@ -25,6 +25,5 @@
  
 	return w.ll;
 }
-
 EXPORT_SYMBOL(__lshrdi3);
@@ -103,12 +103,12 @@
 			}
 #else
 			/* Load the holding buffer */
-			buf_hold = (*i_src++ & 0xFFFFFF00) >>8;
+			buf_hold = (*i_src++ & 0xFFFFFF00) >> 8;
  
 			for (; c >= 4; c -= 4) {
 				value = *i_src++;
 				*i_dst++ = buf_hold | ((value & 0xFF) << 24);
-				buf_hold = (value & 0xFFFFFF00) >>8;
+				buf_hold = (value & 0xFFFFFF00) >> 8;
 			}
 #endif
 			/* Realign the source */
  
@@ -129,12 +129,12 @@
 			}
 #else
 			/* Load the holding buffer */
-			buf_hold = (*i_src++ & 0xFFFF0000 )>>16;
+			buf_hold = (*i_src++ & 0xFFFF0000) >> 16;
  
 			for (; c >= 4; c -= 4) {
 				value = *i_src++;
-				*i_dst++ = buf_hold | ((value & 0xFFFF)<<16);
-				buf_hold = (value & 0xFFFF0000) >>16;
+				*i_dst++ = buf_hold | ((value & 0xFFFF) << 16);
+				buf_hold = (value & 0xFFFF0000) >> 16;
 			}
 #endif
 			/* Realign the source */
@@ -129,7 +129,8 @@
  
 			for (; c >= 4; c -= 4) {
 				value = *--i_src;
-				*--i_dst = buf_hold | ((value & 0xFFFFFF00)>>8);
+				*--i_dst = buf_hold |
+						((value & 0xFFFFFF00) >> 8);
 				buf_hold = (value  & 0xFF) << 24;
 			}
 #endif
@@ -155,7 +156,8 @@
  
 			for (; c >= 4; c -= 4) {
 				value = *--i_src;
-				*--i_dst = buf_hold | ((value & 0xFFFF0000)>>16);
+				*--i_dst = buf_hold |
+						((value & 0xFFFF0000) >> 16);
 				buf_hold = (value & 0xFFFF) << 16;
 			}
 #endif
@@ -181,7 +183,8 @@
  
 			for (; c >= 4; c -= 4) {
 				value = *--i_src;
-				*--i_dst = buf_hold | ((value & 0xFF000000)>> 24);
+				*--i_dst = buf_hold |
+						((value & 0xFF000000) >> 24);
 				buf_hold = (value & 0xFFFFFF) << 8;
 			}
 #endif
@@ -37,7 +37,7 @@
 #include <asm/pgalloc.h>
 #include <linux/io.h>
 #include <linux/hardirq.h>
-#include <asm/mmu_context.h>
+#include <linux/mmu_context.h>
 #include <asm/mmu.h>
 #include <linux/uaccess.h>
 #include <asm/pgtable.h>
@@ -102,8 +102,7 @@
 # endif
 	if ((unsigned int)ret > cpuinfo.dcache_base &&
 				(unsigned int)ret < cpuinfo.dcache_high)
-		printk(KERN_WARNING
-			"ERROR: Your cache coherent area is CACHED!!!\n");
+		pr_warn("ERROR: Your cache coherent area is CACHED!!!\n");
  
 	/* dma_handle is same as physical (shadowed) address */
 	*dma_handle = (dma_addr_t)ret;
@@ -32,7 +32,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
-#include <asm/mmu_context.h>
+#include <linux/mmu_context.h>
 #include <linux/uaccess.h>
 #include <asm/exceptions.h>
  
@@ -100,7 +100,7 @@
  
 	/* On a kernel SLB miss we can only check for a valid exception entry */
 	if (unlikely(kernel_mode(regs) && (address >= TASK_SIZE))) {
-		printk(KERN_WARNING "kernel task_size exceed");
+		pr_warn("kernel task_size exceed");
 		_exception(SIGSEGV, regs, code, address);
 	}
  
@@ -114,9 +114,9 @@
  
 		/* in_atomic() in user mode is really bad,
 		   as is current->mm == NULL. */
-		printk(KERN_EMERG "Page fault in user mode with "
-		       "in_atomic(), mm = %p\n", mm);
-		printk(KERN_EMERG "r15 = %lx  MSR = %lx\n",
+		pr_emerg("Page fault in user mode with in_atomic(), mm = %p\n",
+									mm);
+		pr_emerg("r15 = %lx  MSR = %lx\n",
 		       regs->r15, regs->msr);
 		die("Weird page fault", regs, SIGSEGV);
 	}
@@ -89,7 +89,7 @@
 		reservedpages++;
 	}
 	totalram_pages += totalhigh_pages;
-	printk(KERN_INFO "High memory: %luk\n",
+	pr_info("High memory: %luk\n",
 					totalhigh_pages << (PAGE_SHIFT-10));
  
 	return reservedpages;
@@ -142,8 +142,8 @@
 			((u32)_text <= (memory_start + lowmem_size - 1))) {
 			memory_size = lowmem_size;
 			PAGE_OFFSET = memory_start;
-			printk(KERN_INFO "%s: Main mem: 0x%x, "
-				"size 0x%08x\n", __func__, (u32) memory_start,
+			pr_info("%s: Main mem: 0x%x, size 0x%08x\n",
+				__func__, (u32) memory_start,
 					(u32) memory_size);
 			break;
 		}
@@ -158,7 +158,7 @@
 	kernel_align_start = PAGE_DOWN((u32)_text);
 	/* ALIGN can be remove because _end in vmlinux.lds.S is align */
 	kernel_align_size = PAGE_UP((u32)klimit) - kernel_align_start;
-	printk(KERN_INFO "%s: kernel addr:0x%08x-0x%08x size=0x%08x\n",
+	pr_info("%s: kernel addr:0x%08x-0x%08x size=0x%08x\n",
 		__func__, kernel_align_start, kernel_align_start
 			+ kernel_align_size, kernel_align_size);
 	memblock_reserve(kernel_align_start, kernel_align_size);
@@ -181,10 +181,10 @@
 	max_low_pfn = ((u64)memory_start + (u64)lowmem_size) >> PAGE_SHIFT;
 	max_pfn = ((u64)memory_start + (u64)memory_size) >> PAGE_SHIFT;
  
-	printk(KERN_INFO "%s: max_mapnr: %#lx\n", __func__, max_mapnr);
-	printk(KERN_INFO "%s: min_low_pfn: %#lx\n", __func__, min_low_pfn);
-	printk(KERN_INFO "%s: max_low_pfn: %#lx\n", __func__, max_low_pfn);
-	printk(KERN_INFO "%s: max_pfn: %#lx\n", __func__, max_pfn);
+	pr_info("%s: max_mapnr: %#lx\n", __func__, max_mapnr);
+	pr_info("%s: min_low_pfn: %#lx\n", __func__, min_low_pfn);
+	pr_info("%s: max_low_pfn: %#lx\n", __func__, max_low_pfn);
+	pr_info("%s: max_pfn: %#lx\n", __func__, max_pfn);
  
 	/*
 	 * Find an area to use for the bootmem bitmap.
@@ -246,7 +246,7 @@
 		free_page(addr);
 		totalram_pages++;
 	}
-	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+	pr_info("Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
 }
  
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -260,7 +260,7 @@
 		totalram_pages++;
 		pages++;
 	}
-	printk(KERN_NOTICE "Freeing initrd memory: %dk freed\n",
+	pr_notice("Freeing initrd memory: %dk freed\n",
 					(int)(pages * (PAGE_SIZE / 1024)));
 }
 #endif
  
@@ -304,11 +304,11 @@
 	initsize = (unsigned long)&__init_end - (unsigned long)&__init_begin;
 	bsssize = (unsigned long)&__bss_stop - (unsigned long)&__bss_start;
  
-	pr_info("Memory: %luk/%luk available (%luk kernel code, "
-		"%luk reserved, %luk data, %luk bss, %luk init)\n",
+	pr_info("Memory: %luk/%luk available (%luk kernel code, ",
 		nr_free_pages() << (PAGE_SHIFT-10),
 		num_physpages << (PAGE_SHIFT-10),
-		codesize >> 10,
+		codesize >> 10);
+	pr_cont("%luk reserved, %luk data, %luk bss, %luk init)\n",
 		reservedpages << (PAGE_SHIFT-10),
 		datasize >> 10,
 		bsssize >> 10,
  
  
@@ -394,17 +394,17 @@
 	unsigned int kstart, ksize;
  
 	if (!memblock.reserved.cnt) {
-		printk(KERN_EMERG "Error memory count\n");
+		pr_emerg("Error memory count\n");
 		machine_restart(NULL);
 	}
  
 	if ((u32) memblock.memory.regions[0].size < 0x400000) {
-		printk(KERN_EMERG "Memory must be greater than 4MB\n");
+		pr_emerg("Memory must be greater than 4MB\n");
 		machine_restart(NULL);
 	}
  
 	if ((u32) memblock.memory.regions[0].size < kernel_tlb) {
-		printk(KERN_EMERG "Kernel size is greater than memory node\n");
+		pr_emerg("Kernel size is greater than memory node\n");
 		machine_restart(NULL);
 	}
  
@@ -39,8 +39,6 @@
 #include <asm/sections.h>
 #include <asm/fixmap.h>
  
-#define flush_HPTE(X, va, pg)	_tlbie(va)
-
 unsigned long ioremap_base;
 unsigned long ioremap_bot;
 EXPORT_SYMBOL(ioremap_bot);
@@ -75,9 +73,8 @@
 		p >= memory_start && p < virt_to_phys(high_memory) &&
 		!(p >= virt_to_phys((unsigned long)&__bss_stop) &&
 		p < virt_to_phys((unsigned long)__bss_stop))) {
-		printk(KERN_WARNING "__ioremap(): phys addr "PTE_FMT
-			" is RAM lr %pf\n", (unsigned long)p,
-			__builtin_return_address(0));
+		pr_warn("__ioremap(): phys addr "PTE_FMT" is RAM lr %pf\n",
+			(unsigned long)p, __builtin_return_address(0));
 		return NULL;
 	}
  
  
@@ -128,9 +125,10 @@
 }
 EXPORT_SYMBOL(ioremap);
  
-void iounmap(void *addr)
+void iounmap(void __iomem *addr)
 {
-	if (addr > high_memory && (unsigned long) addr < ioremap_bot)
+	if ((__force void *)addr > high_memory &&
+					(unsigned long) addr < ioremap_bot)
 		vfree((void *) (PAGE_MASK & (unsigned long) addr));
 }
 EXPORT_SYMBOL(iounmap);
@@ -152,8 +150,7 @@
 		set_pte_at(&init_mm, va, pg, pfn_pte(pa >> PAGE_SHIFT,
 				__pgprot(flags)));
 		if (unlikely(mem_init_done))
-			flush_HPTE(0, va, pmd_val(*pd));
-			/* flush_HPTE(0, va, pg); */
+			_tlbie(va);
 	}
 	return err;
 }
@@ -15,7 +15,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
  
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
  
@@ -7,7 +7,7 @@
 #include <linux/pci.h>
 #include <linux/mm.h>
 #include <linux/export.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pci-bridge.h>
  
 void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
@@ -33,7 +33,7 @@
 #include <linux/export.h>
  
 #include <asm/processor.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/pci-bridge.h>
 #include <asm/byteorder.h>
  
@@ -552,11 +552,10 @@
 		 */
 		if ((offset + size) > hose->isa_mem_size) {
 #ifdef CONFIG_MMU
-			printk(KERN_DEBUG
-				"Process %s (pid:%d) mapped non-existing PCI"
-				"legacy memory for 0%04x:%02x\n",
-				current->comm, current->pid, pci_domain_nr(bus),
-								bus->number);
+			pr_debug("Process %s (pid:%d) mapped non-existing PCI",
+				current->comm, current->pid);
+			pr_debug("legacy memory for 0%04x:%02x\n",
+				pci_domain_nr(bus), bus->number);
 #endif
 			if (vma->vm_flags & VM_SHARED)
 				return shmem_zero_setup(vma);
@@ -564,7 +563,7 @@
 		}
 		offset += hose->isa_mem_phys;
 	} else {
-		unsigned long io_offset = (unsigned long)hose->io_base_virt - \
+		unsigned long io_offset = (unsigned long)hose->io_base_virt -
 								_IO_BASE;
 		unsigned long roffset = offset + io_offset;
 		rp = &hose->io_resource;
@@ -668,7 +667,7 @@
 	unsigned long long isa_mb = 0;
 	struct resource *res;
  
-	printk(KERN_INFO "PCI host bridge %s %s ranges:\n",
+	pr_info("PCI host bridge %s %s ranges:\n",
 	       dev->full_name, primary ? "(primary)" : "");
  
 	/* Get ranges property */
@@ -685,9 +684,10 @@
 		cpu_addr = of_translate_address(dev, ranges + 3);
 		size = of_read_number(ranges + pna + 3, 2);
  
-		pr_debug("pci_space: 0x%08x pci_addr:0x%016llx "
-				"cpu_addr:0x%016llx size:0x%016llx\n",
-					pci_space, pci_addr, cpu_addr, size);
+		pr_debug("pci_space: 0x%08x pci_addr:0x%016llx ",
+				pci_space, pci_addr);
+		pr_debug("cpu_addr:0x%016llx size:0x%016llx\n",
+					cpu_addr, size);
  
 		ranges += np;
  
  
@@ -716,14 +716,12 @@
 		res = NULL;
 		switch ((pci_space >> 24) & 0x3) {
 		case 1:		/* PCI IO space */
-			printk(KERN_INFO
-			       "  IO 0x%016llx..0x%016llx -> 0x%016llx\n",
+			pr_info("  IO 0x%016llx..0x%016llx -> 0x%016llx\n",
 			       cpu_addr, cpu_addr + size - 1, pci_addr);
  
 			/* We support only one IO range */
 			if (hose->pci_io_size) {
-				printk(KERN_INFO
-				       " \\--> Skipped (too many) !\n");
+				pr_info(" \\--> Skipped (too many) !\n");
 				continue;
 			}
 			/* On 32 bits, limit I/O space to 16MB */
  
@@ -750,15 +748,13 @@
 			break;
 		case 2:		/* PCI Memory space */
 		case 3:		/* PCI 64 bits Memory space */
-			printk(KERN_INFO
-			       " MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
+			pr_info(" MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
 			       cpu_addr, cpu_addr + size - 1, pci_addr,
 			       (pci_space & 0x40000000) ? "Prefetch" : "");
  
 			/* We support only 3 memory ranges */
 			if (memno >= 3) {
-				printk(KERN_INFO
-				       " \\--> Skipped (too many) !\n");
+				pr_info(" \\--> Skipped (too many) !\n");
 				continue;
 			}
 			/* Handles ISA memory hole space here */
@@ -781,8 +777,7 @@
 				hose->pci_mem_offset = cpu_addr - pci_addr;
 			else if (pci_addr != 0 &&
 				 hose->pci_mem_offset != cpu_addr - pci_addr) {
-				printk(KERN_INFO
-				       " \\--> Skipped (offset mismatch) !\n");
+				pr_info(" \\--> Skipped (offset mismatch) !\n");
 				continue;
 			}
  
@@ -809,7 +804,7 @@
 	 */
 	if (isa_hole >= 0 && hose->pci_mem_offset != isa_mb) {
 		unsigned int next = isa_hole + 1;
-		printk(KERN_INFO " Removing ISA hole at 0x%016llx\n", isa_mb);
+		pr_info(" Removing ISA hole at 0x%016llx\n", isa_mb);
 		if (next < memno)
 			memmove(&hose->mem_resources[isa_hole],
 				&hose->mem_resources[next],
@@ -833,7 +828,7 @@
 	int i;
  
 	if (!hose) {
-		printk(KERN_ERR "No host bridge for PCI dev %s !\n",
+		pr_err("No host bridge for PCI dev %s !\n",
 		       pci_name(dev));
 		return;
 	}
  
@@ -842,12 +837,12 @@
 		if (!res->flags)
 			continue;
 		if (res->start == 0) {
-			pr_debug("PCI:%s Resource %d %016llx-%016llx [%x]" \
-							"is unassigned\n",
+			pr_debug("PCI:%s Resource %d %016llx-%016llx [%x]",
 				 pci_name(dev), i,
 				 (unsigned long long)res->start,
 				 (unsigned long long)res->end,
 				 (unsigned int)res->flags);
+			pr_debug("is unassigned\n");
 			res->end -= res->start;
 			res->start = 0;
 			res->flags |= IORESOURCE_UNSET;
@@ -856,7 +851,7 @@
  
 		pr_debug("PCI:%s Resource %d %016llx-%016llx [%x]\n",
 			 pci_name(dev), i,
-			 (unsigned long long)res->start,\
+			 (unsigned long long)res->start,
 			 (unsigned long long)res->end,
 			 (unsigned int)res->flags);
 	}
@@ -947,7 +942,7 @@
  
 		pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n",
 			 pci_name(dev), i,
-			 (unsigned long long)res->start,\
+			 (unsigned long long)res->start,
 			 (unsigned long long)res->end,
 			 (unsigned int)res->flags);
  
  
@@ -1154,12 +1149,12 @@
 			}
 		}
  
-		pr_debug("PCI: %s (bus %d) bridge rsrc %d: %016llx-%016llx "
-			 "[0x%x], parent %p (%s)\n",
+		pr_debug("PCI: %s (bus %d) bridge rsrc %d: %016llx-%016llx ",
 			 bus->self ? pci_name(bus->self) : "PHB",
 			 bus->number, i,
 			 (unsigned long long)res->start,
-			 (unsigned long long)res->end,
+			 (unsigned long long)res->end);
+		pr_debug("[0x%x], parent %p (%s)\n",
 			 (unsigned int)res->flags,
 			 pr, (pr && pr->name) ? pr->name : "nil");
  
@@ -1174,9 +1169,8 @@
 			if (reparent_resources(pr, res) == 0)
 				continue;
 		}
-		printk(KERN_WARNING "PCI: Cannot allocate resource region "
-		       "%d of PCI bridge %d, will remap\n", i, bus->number);
-
+		pr_warn("PCI: Cannot allocate resource region ");
+		pr_cont("%d of PCI bridge %d, will remap\n", i, bus->number);
 		res->start = res->end = 0;
 		res->flags = 0;
 	}
@@ -1198,8 +1192,8 @@
 	pr = pci_find_parent_resource(dev, r);
 	if (!pr || (pr->flags & IORESOURCE_UNSET) ||
 	    request_resource(pr, r) < 0) {
-		printk(KERN_WARNING "PCI: Cannot allocate resource region %d"
-		       " of device %s, will remap\n", idx, pci_name(dev));
+		pr_warn("PCI: Cannot allocate resource region %d ", idx);
+		pr_cont("of device %s, will remap\n", pci_name(dev));
 		if (pr)
 			pr_debug("PCI:  parent is %p: %016llx-%016llx [%x]\n",
 				 pr,
@@ -1282,8 +1276,7 @@
 	res->end = (offset + 0xfff) & 0xfffffffful;
 	pr_debug("Candidate legacy IO: %pR\n", res);
 	if (request_resource(&hose->io_resource, res)) {
-		printk(KERN_DEBUG
-		       "PCI %04x:%02x Cannot reserve Legacy IO %pR\n",
+		pr_debug("PCI %04x:%02x Cannot reserve Legacy IO %pR\n",
 		       pci_domain_nr(bus), bus->number, res);
 		kfree(res);
 	}
@@ -1311,8 +1304,7 @@
 	res->end = 0xbffff + offset;
 	pr_debug("Candidate VGA memory: %pR\n", res);
 	if (request_resource(pres, res)) {
-		printk(KERN_DEBUG
-		       "PCI %04x:%02x Cannot reserve VGA memory %pR\n",
+		pr_debug("PCI %04x:%02x Cannot reserve VGA memory %pR\n",
 		       pci_domain_nr(bus), bus->number, res);
 		kfree(res);
 	}
@@ -1362,10 +1354,9 @@
 			if (r->parent || !r->start || !r->flags)
 				continue;
  
-			pr_debug("PCI: Claiming %s: "
-				 "Resource %d: %016llx..%016llx [%x]\n",
-				 pci_name(dev), i,
-				 (unsigned long long)r->start,
+			pr_debug("PCI: Claiming %s: ", pci_name(dev));
+			pr_debug("Resource %d: %016llx..%016llx [%x]\n",
+				 i, (unsigned long long)r->start,
 				 (unsigned long long)r->end,
 				 (unsigned int)r->flags);
  
@@ -1423,9 +1414,9 @@
 	res->end = (res->end + io_offset) & 0xffffffffu;
  
 	if (!res->flags) {
-		printk(KERN_WARNING "PCI: I/O resource not set for host"
-		       " bridge %s (domain %d)\n",
-		       hose->dn->full_name, hose->global_number);
+		pr_warn("PCI: I/O resource not set for host ");
+		pr_cont("bridge %s (domain %d)\n",
+			hose->dn->full_name, hose->global_number);
 		/* Workaround for lack of IO resource only on 32-bit */
 		res->start = (unsigned long)hose->io_base_virt - isa_io_base;
 		res->end = res->start + IO_SPACE_LIMIT;
@@ -1445,9 +1436,9 @@
 		if (!res->flags) {
 			if (i > 0)
 				continue;
-			printk(KERN_ERR "PCI: Memory resource 0 not set for "
-			       "host bridge %s (domain %d)\n",
-			       hose->dn->full_name, hose->global_number);
+			pr_err("PCI: Memory resource 0 not set for ");
+			pr_cont("host bridge %s (domain %d)\n",
+				hose->dn->full_name, hose->global_number);
  
 			/* Workaround for lack of MEM resource only on 32-bit */
 			res->start = hose->pci_mem_offset;
@@ -1489,7 +1480,7 @@
 	bus = pci_scan_root_bus(hose->parent, hose->first_busno,
 				hose->ops, hose, &resources);
 	if (bus == NULL) {
-		printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
+		pr_err("Failed to create bus for PCI domain %04x\n",
 		       hose->global_number);
 		pci_free_resource_list(&resources);
 		return;
@@ -1505,7 +1496,7 @@
 	struct pci_controller *hose, *tmp;
 	int next_busno = 0;
  
-	printk(KERN_INFO "PCI: Probing PCI hardware\n");
+	pr_info("PCI: Probing PCI hardware\n");
  
 	/* Scan all of the recorded PCI controllers.  */
 	list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
@@ -1605,7 +1596,7 @@
 	static struct pci_bus bus;
  
 	if (!hose)
-		printk(KERN_ERR "Can't find hose for PCI bus %d!\n", busnr);
+		pr_err("Can't find hose for PCI bus %d!\n", busnr);
  
 	bus.number = busnr;
 	bus.sysdata = hose;
@@ -18,7 +18,7 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/pci.h>
-#include <asm/io.h>
+#include <linux/io.h>
  
 #define XPLB_PCI_ADDR 0x10c
 #define XPLB_PCI_DATA 0x110
@@ -82,7 +82,7 @@
  *
  * List pci devices in very early phase.
  */
-void __init xilinx_early_pci_scan(struct pci_controller *hose)
+static void __init xilinx_early_pci_scan(struct pci_controller *hose)
 {
 	u32 bus = 0;
 	u32 val, dev, func, offset;
  
  
  
  
  
@@ -91,27 +91,27 @@
 	for (dev = 0; dev < 2; dev++) {
 		/* List only first function number - up-to 8 functions */
 		for (func = 0; func < 1; func++) {
-			printk(KERN_INFO "%02x:%02x:%02x", bus, dev, func);
+			pr_info("%02x:%02x:%02x", bus, dev, func);
 			/* read the first 64 standardized bytes */
 			/* Up-to 192 bytes can be list of capabilities */
 			for (offset = 0; offset < 64; offset += 4) {
 				early_read_config_dword(hose, bus,
 					PCI_DEVFN(dev, func), offset, &val);
 				if (offset == 0 && val == 0xFFFFFFFF) {
-					printk(KERN_CONT "\nABSENT");
+					pr_cont("\nABSENT");
 					break;
 				}
 				if (!(offset % 0x10))
-					printk(KERN_CONT "\n%04x:    ", offset);
+					pr_cont("\n%04x:    ", offset);
  
-				printk(KERN_CONT "%08x  ", val);
+				pr_cont("%08x  ", val);
 			}
-			printk(KERN_INFO "\n");
+			pr_info("\n");
 		}
 	}
 }
 #else
-void __init xilinx_early_pci_scan(struct pci_controller *hose)
+static void __init xilinx_early_pci_scan(struct pci_controller *hose)
 {
 }
 #endif
...	...	@@ -150,7 +150,7 @@
150	150	#define page_to_bus(page) (page_to_phys(page))
151	151	#define bus_to_virt(addr) (phys_to_virt(addr))
152	152
153		-extern void iounmap(void *addr);
	153	+extern void iounmap(void __iomem *addr);
154	154	/extern void __ioremap(phys_addr_t address, unsigned long size,
155	155	unsigned long flags);*/
156	156	extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
...	...	@@ -17,82 +17,70 @@
17	17
18	18	static inline void __enable_icache_msr(void)
19	19	{
20		- __asm__ __volatile__ (" msrset r0, %0; \
21		- nop; " \
	20	+ __asm__ __volatile__ (" msrset r0, %0;" \
	21	+ "nop;" \
22	22	: : "i" (MSR_ICE) : "memory");
23	23	}
24	24
25	25	static inline void __disable_icache_msr(void)
26	26	{
27		- __asm__ __volatile__ (" msrclr r0, %0; \
28		- nop; " \
	27	+ __asm__ __volatile__ (" msrclr r0, %0;" \
	28	+ "nop;" \
29	29	: : "i" (MSR_ICE) : "memory");
30	30	}
31	31
32	32	static inline void __enable_dcache_msr(void)
33	33	{
34		- __asm__ __volatile__ (" msrset r0, %0; \
35		- nop; " \
36		- : \
37		- : "i" (MSR_DCE) \
38		- : "memory");
	34	+ __asm__ __volatile__ (" msrset r0, %0;" \
	35	+ "nop;" \
	36	+ : : "i" (MSR_DCE) : "memory");
39	37	}
40	38
41	39	static inline void __disable_dcache_msr(void)
42	40	{
43		- __asm__ __volatile__ (" msrclr r0, %0; \
44		- nop; " \
45		- : \
46		- : "i" (MSR_DCE) \
47		- : "memory");
	41	+ __asm__ __volatile__ (" msrclr r0, %0;" \
	42	+ "nop; " \
	43	+ : : "i" (MSR_DCE) : "memory");
48	44	}
49	45
50	46	static inline void __enable_icache_nomsr(void)
51	47	{
52		- __asm__ __volatile__ (" mfs r12, rmsr; \
53		- nop; \
54		- ori r12, r12, %0; \
55		- mts rmsr, r12; \
56		- nop; " \
57		- : \
58		- : "i" (MSR_ICE) \
59		- : "memory", "r12");
	48	+ __asm__ __volatile__ (" mfs r12, rmsr;" \
	49	+ "nop;" \
	50	+ "ori r12, r12, %0;" \
	51	+ "mts rmsr, r12;" \
	52	+ "nop;" \
	53	+ : : "i" (MSR_ICE) : "memory", "r12");
60	54	}
61	55
62	56	static inline void __disable_icache_nomsr(void)
63	57	{
64		- __asm__ __volatile__ (" mfs r12, rmsr; \
65		- nop; \
66		- andi r12, r12, ~%0; \
67		- mts rmsr, r12; \
68		- nop; " \
69		- : \
70		- : "i" (MSR_ICE) \
71		- : "memory", "r12");
	58	+ __asm__ __volatile__ (" mfs r12, rmsr;" \
	59	+ "nop;" \
	60	+ "andi r12, r12, ~%0;" \
	61	+ "mts rmsr, r12;" \
	62	+ "nop;" \
	63	+ : : "i" (MSR_ICE) : "memory", "r12");
72	64	}
73	65
74	66	static inline void __enable_dcache_nomsr(void)
75	67	{
76		- __asm__ __volatile__ (" mfs r12, rmsr; \
77		- nop; \
78		- ori r12, r12, %0; \
79		- mts rmsr, r12; \
80		- nop; " \
81		- : \
82		- : "i" (MSR_DCE) \
83		- : "memory", "r12");
	68	+ __asm__ __volatile__ (" mfs r12, rmsr;" \
	69	+ "nop;" \
	70	+ "ori r12, r12, %0;" \
	71	+ "mts rmsr, r12;" \
	72	+ "nop;" \
	73	+ : : "i" (MSR_DCE) : "memory", "r12");
84	74	}
85	75
86	76	static inline void __disable_dcache_nomsr(void)
87	77	{
88		- __asm__ __volatile__ (" mfs r12, rmsr; \
89		- nop; \
90		- andi r12, r12, ~%0; \
91		- mts rmsr, r12; \
92		- nop; " \
93		- : \
94		- : "i" (MSR_DCE) \
95		- : "memory", "r12");
	78	+ __asm__ __volatile__ (" mfs r12, rmsr;" \
	79	+ "nop;" \
	80	+ "andi r12, r12, ~%0;" \
	81	+ "mts rmsr, r12;" \
	82	+ "nop;" \
	83	+ : : "i" (MSR_DCE) : "memory", "r12");
96	84	}
97	85
98	86
...	...	@@ -106,7 +94,7 @@
106	94	int align = ~(cache_line_length - 1); \
107	95	end = min(start + cache_size, end); \
108	96	start &= align; \
109		-} while (0);
	97	+} while (0)
110	98
111	99	/*
112	100	* Helper macro to loop over the specified cache_size/line_length and
113	101
...	...	@@ -118,12 +106,12 @@
118	106	int step = -line_length; \
119	107	WARN_ON(step >= 0); \
120	108	\
121		- __asm__ __volatile__ (" 1: " #op " %0, r0; \
122		- bgtid %0, 1b; \
123		- addk %0, %0, %1; \
124		- " : : "r" (len), "r" (step) \
	109	+ __asm__ __volatile__ (" 1: " #op " %0, r0;" \
	110	+ "bgtid %0, 1b;" \
	111	+ "addk %0, %0, %1;" \
	112	+ : : "r" (len), "r" (step) \
125	113	: "memory"); \
126		-} while (0);
	114	+} while (0)
127	115
128	116	/* Used for wdc.flush/clear which can use rB for offset which is not possible
129	117	* to use for simple wdc or wic.
130	118
...	...	@@ -142,12 +130,12 @@
142	130	count = end - start; \
143	131	WARN_ON(count < 0); \
144	132	\
145		- __asm__ __volatile__ (" 1: " #op " %0, %1; \
146		- bgtid %1, 1b; \
147		- addk %1, %1, %2; \
148		- " : : "r" (start), "r" (count), \
	133	+ __asm__ __volatile__ (" 1: " #op " %0, %1;" \
	134	+ "bgtid %1, 1b;" \
	135	+ "addk %1, %1, %2;" \
	136	+ : : "r" (start), "r" (count), \
149	137	"r" (step) : "memory"); \
150		-} while (0);
	138	+} while (0)
151	139
152	140	/* It is used only first parameter for OP - for wic, wdc */
153	141	#define CACHE_RANGE_LOOP_1(start, end, line_length, op) \
154	142
...	...	@@ -157,13 +145,13 @@
157	145	end = ((end & align) == end) ? end - line_length : end & align; \
158	146	WARN_ON(end - start < 0); \
159	147	\
160		- __asm__ __volatile__ (" 1: " #op " %1, r0; \
161		- cmpu %0, %1, %2; \
162		- bgtid %0, 1b; \
163		- addk %1, %1, %3; \
164		- " : : "r" (temp), "r" (start), "r" (end),\
	148	+ __asm__ __volatile__ (" 1: " #op " %1, r0;" \
	149	+ "cmpu %0, %1, %2;" \
	150	+ "bgtid %0, 1b;" \
	151	+ "addk %1, %1, %3;" \
	152	+ : : "r" (temp), "r" (start), "r" (end), \
165	153	"r" (line_length) : "memory"); \
166		-} while (0);
	154	+} while (0)
167	155
168	156	#define ASM_LOOP
169	157
...	...	@@ -352,7 +340,7 @@
352	340	#endif
353	341	pr_debug("%s\n", __func__);
354	342	#ifdef ASM_LOOP
355		- CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length, wdc)
	343	+ CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length, wdc);
356	344	#else
357	345	for (i = 0; i < cpuinfo.dcache_size;
358	346	i += cpuinfo.dcache_line_length)
...	...	@@ -361,7 +349,8 @@
361	349	#endif
362	350	}
363	351
364		-/* FIXME It is blindly invalidation as is expected
	352	+/*
	353	+ * FIXME It is blindly invalidation as is expected
365	354	* but can't be called on noMMU in microblaze_cache_init below
366	355	*
367	356	* MS: noMMU kernel won't boot if simple wdc is used
...	...	@@ -375,7 +364,7 @@
375	364	pr_debug("%s\n", __func__);
376	365	#ifdef ASM_LOOP
377	366	CACHE_ALL_LOOP(cpuinfo.dcache_size, cpuinfo.dcache_line_length,
378		- wdc)
	367	+ wdc);
379	368	#else
380	369	for (i = 0; i < cpuinfo.dcache_size;
381	370	i += cpuinfo.dcache_line_length)
382	371
383	372
384	373
385	374
386	375
387	376
388	377
389	378
390	379
...	...	@@ -616,49 +605,48 @@
616	605	#define CPUVER_7_20_A 0x0c
617	606	#define CPUVER_7_20_D 0x0f
618	607
619		-#define INFO(s) printk(KERN_INFO "cache: " s "\n");
620		-
621	608	void microblaze_cache_init(void)
622	609	{
623	610	if (cpuinfo.use_instr & PVR2_USE_MSR_INSTR) {
624	611	if (cpuinfo.dcache_wb) {
625		- INFO("wb_msr");
	612	+ pr_info("wb_msr\n");
626	613	mbc = (struct scache *)&wb_msr;
627	614	if (cpuinfo.ver_code <= CPUVER_7_20_D) {
628	615	/* MS: problem with signal handling - hw bug */
629		- INFO("WB won't work properly");
	616	+ pr_info("WB won't work properly\n");
630	617	}
631	618	} else {
632	619	if (cpuinfo.ver_code >= CPUVER_7_20_A) {
633		- INFO("wt_msr_noirq");
	620	+ pr_info("wt_msr_noirq\n");
634	621	mbc = (struct scache *)&wt_msr_noirq;
635	622	} else {
636		- INFO("wt_msr");
	623	+ pr_info("wt_msr\n");
637	624	mbc = (struct scache *)&wt_msr;
638	625	}
639	626	}
640	627	} else {
641	628	if (cpuinfo.dcache_wb) {
642		- INFO("wb_nomsr");
	629	+ pr_info("wb_nomsr\n");
643	630	mbc = (struct scache *)&wb_nomsr;
644	631	if (cpuinfo.ver_code <= CPUVER_7_20_D) {
645	632	/* MS: problem with signal handling - hw bug */
646		- INFO("WB won't work properly");
	633	+ pr_info("WB won't work properly\n");
647	634	}
648	635	} else {
649	636	if (cpuinfo.ver_code >= CPUVER_7_20_A) {
650		- INFO("wt_nomsr_noirq");
	637	+ pr_info("wt_nomsr_noirq\n");
651	638	mbc = (struct scache *)&wt_nomsr_noirq;
652	639	} else {
653		- INFO("wt_nomsr");
	640	+ pr_info("wt_nomsr\n");
654	641	mbc = (struct scache *)&wt_nomsr;
655	642	}
656	643	}
657	644	}
658		-/* FIXME Invalidation is done in U-BOOT
659		- * WT cache: Data is already written to main memory
660		- * WB cache: Discard data on noMMU which caused that kernel doesn't boot
661		- */
	645	+ /*
	646	+ * FIXME Invalidation is done in U-BOOT
	647	+ * WT cache: Data is already written to main memory
	648	+ * WB cache: Discard data on noMMU which caused that kernel doesn't boot
	649	+ */
662	650	/* invalidate_dcache(); */
663	651	enable_dcache();
664	652
...	...	@@ -27,7 +27,7 @@
27	27	early_printk("ERROR: Microblaze " x "-different for PVR and DTS\n");
28	28	#else
29	29	#define err_printk(x) \
30		- printk(KERN_INFO "ERROR: Microblaze " x "-different for PVR and DTS\n");
	30	+ pr_info("ERROR: Microblaze " x "-different for PVR and DTS\n");
31	31	#endif
32	32
33	33	void set_cpuinfo_pvr_full(struct cpuinfo ci, struct device_node cpu)
34	34
...	...	@@ -38,12 +38,11 @@
38	38
39	39	CI(ver_code, VERSION);
40	40	if (!ci->ver_code) {
41		- printk(KERN_ERR "ERROR: MB has broken PVR regs "
42		- "-> use DTS setting\n");
	41	+ pr_err("ERROR: MB has broken PVR regs -> use DTS setting\n");
43	42	return;
44	43	}
45	44
46		- temp = PVR_USE_BARREL(pvr) \| PVR_USE_MSR_INSTR(pvr) \|\
	45	+ temp = PVR_USE_BARREL(pvr) \| PVR_USE_MSR_INSTR(pvr) \|
47	46	PVR_USE_PCMP_INSTR(pvr) \| PVR_USE_DIV(pvr);
48	47	if (ci->use_instr != temp)
49	48	err_printk("BARREL, MSR, PCMP or DIV");
...	...	@@ -59,13 +58,13 @@
59	58	err_printk("HW_FPU");
60	59	ci->use_fpu = temp;
61	60
62		- ci->use_exc = PVR_OPCODE_0x0_ILLEGAL(pvr) \|\
63		- PVR_UNALIGNED_EXCEPTION(pvr) \|\
64		- PVR_ILL_OPCODE_EXCEPTION(pvr) \|\
65		- PVR_IOPB_BUS_EXCEPTION(pvr) \|\
66		- PVR_DOPB_BUS_EXCEPTION(pvr) \|\
67		- PVR_DIV_ZERO_EXCEPTION(pvr) \|\
68		- PVR_FPU_EXCEPTION(pvr) \|\
	61	+ ci->use_exc = PVR_OPCODE_0x0_ILLEGAL(pvr) \|
	62	+ PVR_UNALIGNED_EXCEPTION(pvr) \|
	63	+ PVR_ILL_OPCODE_EXCEPTION(pvr) \|
	64	+ PVR_IOPB_BUS_EXCEPTION(pvr) \|
	65	+ PVR_DOPB_BUS_EXCEPTION(pvr) \|
	66	+ PVR_DIV_ZERO_EXCEPTION(pvr) \|
	67	+ PVR_FPU_EXCEPTION(pvr) \|
69	68	PVR_FSL_EXCEPTION(pvr);
70	69
71	70	CI(pvr_user1, USER1);
...	...	@@ -68,32 +68,31 @@
68	68
69	69	cpu = (struct device_node *) of_find_node_by_type(NULL, "cpu");
70	70	if (!cpu)
71		- printk(KERN_ERR "You don't have cpu!!!\n");
	71	+ pr_err("You don't have cpu!!!\n");
72	72
73		- printk(KERN_INFO "%s: initialising\n", __func__);
	73	+ pr_info("%s: initialising\n", __func__);
74	74
75	75	switch (cpu_has_pvr()) {
76	76	case 0:
77		- printk(KERN_WARNING
78		- "%s: No PVR support. Using static CPU info from FDT\n",
	77	+ pr_warn("%s: No PVR support. Using static CPU info from FDT\n",
79	78	__func__);
80	79	set_cpuinfo_static(&cpuinfo, cpu);
81	80	break;
82	81	/* FIXME I found weird behavior with MB 7.00.a/b 7.10.a
83	82	* please do not use FULL PVR with MMU */
84	83	case 1:
85		- printk(KERN_INFO "%s: Using full CPU PVR support\n",
	84	+ pr_info("%s: Using full CPU PVR support\n",
86	85	__func__);
87	86	set_cpuinfo_static(&cpuinfo, cpu);
88	87	set_cpuinfo_pvr_full(&cpuinfo, cpu);
89	88	break;
90	89	default:
91		- printk(KERN_WARNING "%s: Unsupported PVR setting\n", __func__);
	90	+ pr_warn("%s: Unsupported PVR setting\n", __func__);
92	91	set_cpuinfo_static(&cpuinfo, cpu);
93	92	}
94	93
95	94	if (cpuinfo.mmu_privins)
96		- printk(KERN_WARNING "%s: Stream instructions enabled"
	95	+ pr_warn("%s: Stream instructions enabled"
97	96	" - USERSPACE CAN LOCK THIS KERNEL!\n", __func__);
98	97	}
...	...	@@ -27,7 +27,7 @@
27	27	tmp = 0x0; /* Prevent warning about unused */ \
28	28	__asm__ __volatile__ ( \
29	29	"mfs %0, rpvr" #pvrid ";" \
30		- : "=r" (tmp) : : "memory"); \
	30	+ : "=r" (tmp) : : "memory"); \
31	31	val = tmp; \
32	32	}
33	33
...	...	@@ -11,7 +11,7 @@
11	11	#include <linux/gfp.h>
12	12	#include <linux/dma-debug.h>
13	13	#include <linux/export.h>
14		-#include <asm/bug.h>
	14	+#include <linux/bug.h>
15	15
16	16	/*
17	17	* Generic direct DMA implementation
18	18
...	...	@@ -197,9 +197,9 @@
197	197
198	198	static int __init dma_init(void)
199	199	{
200		- dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
	200	+ dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);
201	201
202		- return 0;
	202	+ return 0;
203	203	}
204	204	fs_initcall(dma_init);
...	...	@@ -140,20 +140,20 @@
140	140	switch (version) {
141	141	#ifdef CONFIG_SERIAL_UARTLITE_CONSOLE
142	142	case UARTLITE:
143		- printk(KERN_INFO "Early console on uartlite "
144		- "at 0x%08x\n", base_addr);
	143	+ pr_info("Early console on uartlite at 0x%08x\n",
	144	+ base_addr);
145	145	early_console = &early_serial_uartlite_console;
146	146	break;
147	147	#endif
148	148	#ifdef CONFIG_SERIAL_8250_CONSOLE
149	149	case UART16550:
150		- printk(KERN_INFO "Early console on uart16650 "
151		- "at 0x%08x\n", base_addr);
	150	+ pr_info("Early console on uart16650 at 0x%08x\n",
	151	+ base_addr);
152	152	early_console = &early_serial_uart16550_console;
153	153	break;
154	154	#endif
155	155	default:
156		- printk(KERN_INFO "Unsupported early console %d\n",
	156	+ pr_info("Unsupported early console %d\n",
157	157	version);
158	158	return 1;
159	159	}
160	160
...	...	@@ -171,10 +171,9 @@
171	171	{
172	172	if (!early_console_initialized \|\| !early_console)
173	173	return;
174		- printk(KERN_INFO "early_printk_console remapping from 0x%x to ",
175		- base_addr);
	174	+ pr_info("early_printk_console remapping from 0x%x to ", base_addr);
176	175	base_addr = (u32) ioremap(base_addr, PAGE_SIZE);
177		- printk(KERN_CONT "0x%x\n", base_addr);
	176	+ pr_cont("0x%x\n", base_addr);
178	177
179	178	#ifdef CONFIG_MMU
180	179	/*
...	...	@@ -197,7 +196,7 @@
197	196	{
198	197	if (!early_console_initialized \|\| !early_console)
199	198	return;
200		- printk(KERN_WARNING "disabling early console\n");
	199	+ pr_warn("disabling early console\n");
201	200	unregister_console(early_console);
202	201	early_console_initialized = 0;
203	202	}
...	...	@@ -40,7 +40,7 @@
40	40	{
41	41	console_verbose();
42	42	spin_lock_irq(&die_lock);
43		- printk(KERN_WARNING "Oops: %s, sig: %ld\n", str, err);
	43	+ pr_warn("Oops: %s, sig: %ld\n", str, err);
44	44	show_regs(fp);
45	45	spin_unlock_irq(&die_lock);
46	46	/* do_exit() should take care of panic'ing from an interrupt
47	47
...	...	@@ -61,9 +61,9 @@
61	61	{
62	62	siginfo_t info;
63	63
64		- if (kernel_mode(regs)) {
	64	+ if (kernel_mode(regs))
65	65	die("Exception in kernel mode", regs, signr);
66		- }
	66	+
67	67	info.si_signo = signr;
68	68	info.si_errno = 0;
69	69	info.si_code = code;
...	...	@@ -79,8 +79,7 @@
79	79	#endif
80	80
81	81	#if 0
82		- printk(KERN_WARNING "Exception %02x in %s mode, FSR=%08x PC=%08x " \
83		- "ESR=%08x\n",
	82	+ pr_warn("Exception %02x in %s mode, FSR=%08x PC=%08x ESR=%08x\n",
84	83	type, user_mode(regs) ? "user" : "kernel", fsr,
85	84	(unsigned int) regs->pc, (unsigned int) regs->esr);
86	85	#endif
...	...	@@ -92,8 +91,7 @@
92	91	_exception(SIGILL, regs, ILL_ILLOPC, addr);
93	92	return;
94	93	}
95		- printk(KERN_WARNING "Illegal opcode exception " \
96		- "in kernel mode.\n");
	94	+ pr_warn("Illegal opcode exception in kernel mode.\n");
97	95	die("opcode exception", regs, SIGBUS);
98	96	break;
99	97	case MICROBLAZE_IBUS_EXCEPTION:
...	...	@@ -102,8 +100,7 @@
102	100	_exception(SIGBUS, regs, BUS_ADRERR, addr);
103	101	return;
104	102	}
105		- printk(KERN_WARNING "Instruction bus error exception " \
106		- "in kernel mode.\n");
	103	+ pr_warn("Instruction bus error exception in kernel mode.\n");
107	104	die("bus exception", regs, SIGBUS);
108	105	break;
109	106	case MICROBLAZE_DBUS_EXCEPTION:
...	...	@@ -112,8 +109,7 @@
112	109	_exception(SIGBUS, regs, BUS_ADRERR, addr);
113	110	return;
114	111	}
115		- printk(KERN_WARNING "Data bus error exception " \
116		- "in kernel mode.\n");
	112	+ pr_warn("Data bus error exception in kernel mode.\n");
117	113	die("bus exception", regs, SIGBUS);
118	114	break;
119	115	case MICROBLAZE_DIV_ZERO_EXCEPTION:
...	...	@@ -122,8 +118,7 @@
122	118	_exception(SIGFPE, regs, FPE_INTDIV, addr);
123	119	return;
124	120	}
125		- printk(KERN_WARNING "Divide by zero exception " \
126		- "in kernel mode.\n");
	121	+ pr_warn("Divide by zero exception in kernel mode.\n");
127	122	die("Divide by zero exception", regs, SIGBUS);
128	123	break;
129	124	case MICROBLAZE_FPU_EXCEPTION:
...	...	@@ -151,8 +146,8 @@
151	146	#endif
152	147	default:
153	148	/* FIXME what to do in unexpected exception */
154		- printk(KERN_WARNING "Unexpected exception %02x "
155		- "PC=%08x in %s mode\n", type, (unsigned int) addr,
	149	+ pr_warn("Unexpected exception %02x PC=%08x in %s mode\n",
	150	+ type, (unsigned int) addr,
156	151	kernel_mode(regs) ? "kernel" : "user");
157	152	}
158	153	return;
...	...	@@ -35,18 +35,18 @@
35	35	* happen. This tool is too much intrusive to
36	36	* ignore such a protection.
37	37	*/
38		- asm volatile(" 1: lwi %0, %2, 0; \
39		- 2: swi %3, %2, 0; \
40		- addik %1, r0, 0; \
41		- 3: \
42		- .section .fixup, \"ax\"; \
43		- 4: brid 3b; \
44		- addik %1, r0, 1; \
45		- .previous; \
46		- .section __ex_table,\"a\"; \
47		- .word 1b,4b; \
48		- .word 2b,4b; \
49		- .previous;" \
	38	+ asm volatile(" 1: lwi %0, %2, 0;" \
	39	+ "2: swi %3, %2, 0;" \
	40	+ " addik %1, r0, 0;" \
	41	+ "3:" \
	42	+ " .section .fixup, \"ax\";" \
	43	+ "4: brid 3b;" \
	44	+ " addik %1, r0, 1;" \
	45	+ " .previous;" \
	46	+ " .section __ex_table,\"a\";" \
	47	+ " .word 1b,4b;" \
	48	+ " .word 2b,4b;" \
	49	+ " .previous;" \
50	50	: "=&r" (old), "=r" (faulted)
51	51	: "r" (parent), "r" (return_hooker)
52	52	);
...	...	@@ -81,16 +81,16 @@
81	81	{
82	82	int faulted = 0;
83	83
84		- __asm__ __volatile__(" 1: swi %2, %1, 0; \
85		- addik %0, r0, 0; \
86		- 2: \
87		- .section .fixup, \"ax\"; \
88		- 3: brid 2b; \
89		- addik %0, r0, 1; \
90		- .previous; \
91		- .section __ex_table,\"a\"; \
92		- .word 1b,3b; \
93		- .previous;" \
	84	+ __asm__ __volatile__(" 1: swi %2, %1, 0;" \
	85	+ " addik %0, r0, 0;" \
	86	+ "2:" \
	87	+ " .section .fixup, \"ax\";" \
	88	+ "3: brid 2b;" \
	89	+ " addik %0, r0, 1;" \
	90	+ " .previous;" \
	91	+ " .section __ex_table,\"a\";" \
	92	+ " .word 1b,3b;" \
	93	+ " .previous;" \
94	94	: "=r" (faulted)
95	95	: "r" (addr), "r" (value)
96	96	);
...	...	@@ -61,7 +61,7 @@
61	61	if (gpio) {
62	62	base_addr = be32_to_cpup(of_get_property(gpio, "reg", NULL));
63	63	base_addr = (unsigned long) ioremap(base_addr, PAGE_SIZE);
64		- printk(KERN_NOTICE "Heartbeat GPIO at 0x%x\n", base_addr);
	64	+ pr_notice("Heartbeat GPIO at 0x%x\n", base_addr);
65	65
66	66	/* GPIO is configured as output */
67	67	prop = (int *) of_get_property(gpio, "xlnx,is-bidir", NULL);