[PATCH] "space before \n" removal

From: Denis Vlasenko <vda@ilport.com.ua>

Signed-off-by: Denis Vlasenko <vda@ilport.com.ua>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

Index: linux-kj/Documentation/CodingStyle
===================================================================
--- linux-kj.orig/Documentation/CodingStyle	2005-09-21 01:19:37.000000000 +0400
+++ linux-kj/Documentation/CodingStyle	2005-09-21 01:35:53.000000000 +0400
@@ -64,7 +64,7 @@ void fun(int a, int b, int c)
 	if (condition)
 		printk(KERN_WARNING "Warning this is a long printk with "
 						"3 parameters a: %u b: %u "
-						"c: %u \n", a, b, c);
+						"c: %u\n", a, b, c);
 	else
 		next_statement;
 }
Index: linux-kj/Documentation/fujitsu/frv/gdbinit
===================================================================
--- linux-kj.orig/Documentation/fujitsu/frv/gdbinit	2005-09-21 01:19:39.000000000 +0400
+++ linux-kj/Documentation/fujitsu/frv/gdbinit	2005-09-21 01:35:53.000000000 +0400
@@ -2,7 +2,7 @@ set remotebreak 1
 
 define _amr
 
-printf "AMRx           DAMR                    IAMR         \n"
+printf "AMRx           DAMR                    IAMR\n"
 printf "====   =====================   =====================\n"
 printf "amr0 : L:%08lx P:%08lx : L:%08lx P:%08lx\n",__debug_mmu.damr[0x0].L,__debug_mmu.damr[0x0].P,__debug_mmu.iamr[0x0].L,__debug_mmu.iamr[0x0].P
 printf "amr1 : L:%08lx P:%08lx : L:%08lx P:%08lx\n",__debug_mmu.damr[0x1].L,__debug_mmu.damr[0x1].P,__debug_mmu.iamr[0x1].L,__debug_mmu.iamr[0x1].P
Index: linux-kj/arch/alpha/kernel/sys_dp264.c
===================================================================
--- linux-kj.orig/arch/alpha/kernel/sys_dp264.c	2005-09-21 01:19:05.000000000 +0400
+++ linux-kj/arch/alpha/kernel/sys_dp264.c	2005-09-21 01:35:53.000000000 +0400
@@ -221,7 +221,7 @@ static void
 dp264_device_interrupt(unsigned long vector, struct pt_regs * regs)
 {
 #if 1
-	printk("dp264_device_interrupt: NOT IMPLEMENTED YET!! \n");
+	printk("dp264_device_interrupt: NOT IMPLEMENTED YET!!\n");
 #else
 	unsigned long pld;
 	unsigned int i;
Index: linux-kj/arch/alpha/kernel/sys_titan.c
===================================================================
--- linux-kj.orig/arch/alpha/kernel/sys_titan.c	2005-09-21 01:19:05.000000000 +0400
+++ linux-kj/arch/alpha/kernel/sys_titan.c	2005-09-21 01:35:53.000000000 +0400
@@ -170,7 +170,7 @@ titan_set_irq_affinity(unsigned int irq,
 static void
 titan_device_interrupt(unsigned long vector, struct pt_regs * regs)
 {
-	printk("titan_device_interrupt: NOT IMPLEMENTED YET!! \n");
+	printk("titan_device_interrupt: NOT IMPLEMENTED YET!!\n");
 }
 
 static void 
Index: linux-kj/arch/arm/mach-pxa/pxa27x.c
===================================================================
--- linux-kj.orig/arch/arm/mach-pxa/pxa27x.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/arm/mach-pxa/pxa27x.c	2005-09-21 01:35:53.000000000 +0400
@@ -64,7 +64,7 @@ unsigned int get_clk_frequency_khz( int 
 			(t) ? "" : "in" );
 		printk( KERN_INFO "Memory clock: %d.%02dMHz (/%d)\n",
 			M / 1000000, (M % 1000000) / 10000, m );
-		printk( KERN_INFO "System bus clock: %d.%02dMHz \n",
+		printk( KERN_INFO "System bus clock: %d.%02dMHz\n",
 			S / 1000000, (S % 1000000) / 10000 );
 	}
 
Index: linux-kj/arch/arm26/kernel/setup.c
===================================================================
--- linux-kj.orig/arch/arm26/kernel/setup.c	2005-09-21 01:19:05.000000000 +0400
+++ linux-kj/arch/arm26/kernel/setup.c	2005-09-21 01:35:53.000000000 +0400
@@ -357,7 +357,7 @@ __tagtable(ATAG_RAMDISK, parse_tag_ramdi
 
 static int __init parse_tag_initrd(const struct tag *tag)
 {
-	printk(KERN_WARNING "ATAG_INITRD is deprecated; please update your bootloader. \n");
+	printk(KERN_WARNING "ATAG_INITRD is deprecated; please update your bootloader.\n");
         phys_initrd_start = (unsigned long)tag->u.initrd.start;
         phys_initrd_size = (unsigned long)tag->u.initrd.size;
 	return 0;
@@ -367,7 +367,7 @@ __tagtable(ATAG_INITRD, parse_tag_initrd
 
 static int __init parse_tag_initrd2(const struct tag *tag)
 {
-	printk(KERN_WARNING "ATAG_INITRD is deprecated; please update your bootloader. \n");
+	printk(KERN_WARNING "ATAG_INITRD is deprecated; please update your bootloader.\n");
 	phys_initrd_start = (unsigned long)tag->u.initrd.start;
 	phys_initrd_size = (unsigned long)tag->u.initrd.size;
 	return 0;
Index: linux-kj/arch/cris/arch-v10/drivers/eeprom.c
===================================================================
--- linux-kj.orig/arch/cris/arch-v10/drivers/eeprom.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/cris/arch-v10/drivers/eeprom.c	2005-09-21 01:35:53.000000000 +0400
@@ -624,7 +624,7 @@ static ssize_t eeprom_write(struct file 
       if(!eeprom_address(p))
       {
         printk(KERN_INFO "%s: Write failed to address the eeprom: "
-               "0x%08X (%i) \n", eeprom_name, (int)p, (int)p);
+               "0x%08X (%i)\n", eeprom_name, (int)p, (int)p);
         i2c_stop();
         
         /* don't forget to wake them up */
Index: linux-kj/arch/cris/arch-v32/drivers/sync_serial.c
===================================================================
--- linux-kj.orig/arch/cris/arch-v32/drivers/sync_serial.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/cris/arch-v32/drivers/sync_serial.c	2005-09-21 01:35:53.000000000 +0400
@@ -357,7 +357,7 @@ static int sync_serial_open(struct inode
 	/* Allow open this device twice (assuming one reader and one writer) */
 	if (port->busy == 2)
 	{
-		DEBUG(printk("Device is busy.. \n"));
+		DEBUG(printk("Device is busy..\n"));
 		return -EBUSY;
 	}
 	if (port->init_irqs) {
Index: linux-kj/arch/i386/kernel/apm.c
===================================================================
--- linux-kj.orig/arch/i386/kernel/apm.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/i386/kernel/apm.c	2005-09-21 01:35:53.000000000 +0400
@@ -1939,8 +1939,8 @@ static int __init apm_is_horked_d850md(s
 	if (apm_info.disabled == 0) {
 		apm_info.disabled = 1;
 		printk(KERN_INFO "%s machine detected. Disabling APM.\n", d->ident);
-		printk(KERN_INFO "This bug is fixed in bios P15 which is available for \n");
-		printk(KERN_INFO "download from support.intel.com \n");
+		printk(KERN_INFO "This bug is fixed in bios P15 which is available for\n");
+		printk(KERN_INFO "download from support.intel.com\n");
 	}
 	return 0;
 }
Index: linux-kj/arch/i386/kernel/efi.c
===================================================================
--- linux-kj.orig/arch/i386/kernel/efi.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/i386/kernel/efi.c	2005-09-21 01:35:53.000000000 +0400
@@ -363,7 +363,7 @@ void __init efi_init(void)
 	} else
 		printk(KERN_ERR PFX "Could not map the firmware vendor!\n");
 
-	printk(KERN_INFO PFX "EFI v%u.%.02u by %s \n",
+	printk(KERN_INFO PFX "EFI v%u.%.02u by %s\n",
 	       efi.systab->hdr.revision >> 16,
 	       efi.systab->hdr.revision & 0xffff, vendor);
 
Index: linux-kj/arch/i386/kernel/microcode.c
===================================================================
--- linux-kj.orig/arch/i386/kernel/microcode.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/i386/kernel/microcode.c	2005-09-21 01:35:53.000000000 +0400
@@ -179,7 +179,7 @@ static inline void mark_microcode_update
 	pr_debug("Microcode Found.\n");
 	pr_debug("   Header Revision 0x%x\n", mc_header->hdrver);
 	pr_debug("   Loader Revision 0x%x\n", mc_header->ldrver);
-	pr_debug("   Revision 0x%x \n", mc_header->rev);
+	pr_debug("   Revision 0x%x\n", mc_header->rev);
 	pr_debug("   Date %x/%x/%x\n",
 		((mc_header->date >> 24 ) & 0xff),
 		((mc_header->date >> 16 ) & 0xff),
@@ -388,7 +388,7 @@ static void do_update_one (void * unused
 	uci->err = MC_SUCCESS;
 	spin_unlock_irqrestore(&microcode_update_lock, flags);
 	printk(KERN_INFO "microcode: CPU%d updated from revision "
-	       "0x%x to 0x%x, date = %08x \n", 
+	       "0x%x to 0x%x, date = %08x\n", 
 	       cpu_num, uci->rev, val[1], uci->mc->hdr.date);
 	return;
 }
Index: linux-kj/arch/i386/kernel/mpparse.c
===================================================================
--- linux-kj.orig/arch/i386/kernel/mpparse.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/i386/kernel/mpparse.c	2005-09-21 01:35:53.000000000 +0400
@@ -333,7 +333,7 @@ static void __init smp_read_mpc_oem(stru
 	unsigned char *oemptr = ((unsigned char *)oemtable)+count;
 	
 	mpc_record = 0;
-	printk(KERN_INFO "Found an OEM MPC table at %8p - parsing it ... \n", oemtable);
+	printk(KERN_INFO "Found an OEM MPC table at %8p - parsing it ...\n", oemtable);
 	if (memcmp(oemtable->oem_signature,MPC_OEM_SIGNATURE,4))
 	{
 		printk(KERN_WARNING "SMP mpc oemtable: bad signature [%c%c%c%c]!\n",
Index: linux-kj/arch/i386/kernel/timers/timer_tsc.c
===================================================================
--- linux-kj.orig/arch/i386/kernel/timers/timer_tsc.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/i386/kernel/timers/timer_tsc.c	2005-09-21 01:35:53.000000000 +0400
@@ -420,7 +420,7 @@ static void mark_offset_tsc(void)
 		/* sanity check to ensure we're not always losing ticks */
 		if (lost_count++ > 100) {
 			printk(KERN_WARNING "Losing too many ticks!\n");
-			printk(KERN_WARNING "TSC cannot be used as a timesource.  \n");
+			printk(KERN_WARNING "TSC cannot be used as a timesource.\n");
 			printk(KERN_WARNING "Possible reasons for this are:\n");
 			printk(KERN_WARNING "  You're running with Speedstep,\n");
 			printk(KERN_WARNING "  You don't have DMA enabled for your hard disk (see hdparm),\n");
Index: linux-kj/arch/i386/kernel/traps.c
===================================================================
--- linux-kj.orig/arch/i386/kernel/traps.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/i386/kernel/traps.c	2005-09-21 01:35:53.000000000 +0400
@@ -218,7 +218,7 @@ void show_registers(struct pt_regs *regs
 	}
 	print_modules();
 	printk("CPU:    %d\nEIP:    %04x:[<%08lx>]    %s VLI\nEFLAGS: %08lx"
-			"   (%s) \n",
+			"   (%s)\n",
 		smp_processor_id(), 0xffff & regs->xcs, regs->eip,
 		print_tainted(), regs->eflags, system_utsname.release);
 	print_symbol("EIP is at %s\n", regs->eip);
Index: linux-kj/arch/i386/mach-es7000/es7000plat.c
===================================================================
--- linux-kj.orig/arch/i386/mach-es7000/es7000plat.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/i386/mach-es7000/es7000plat.c	2005-09-21 01:35:53.000000000 +0400
@@ -128,9 +128,9 @@ parse_unisys_oem (char *oemptr)
 			mip_addr = val;
 			mip = (struct mip_reg *)val;
 			mip_reg = __va(mip);
-			Dprintk("es7000_mipcfg: host_reg = 0x%lx \n",
+			Dprintk("es7000_mipcfg: host_reg = 0x%lx\n",
 				(unsigned long)host_reg);
-			Dprintk("es7000_mipcfg: mip_reg = 0x%lx \n",
+			Dprintk("es7000_mipcfg: mip_reg = 0x%lx\n",
 				(unsigned long)mip_reg);
 			success++;
 			break;
Index: linux-kj/arch/ia64/kernel/perfmon.c
===================================================================
--- linux-kj.orig/arch/ia64/kernel/perfmon.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ia64/kernel/perfmon.c	2005-09-21 01:35:53.000000000 +0400
@@ -2717,7 +2717,7 @@ pfm_context_create(pfm_context_t *ctx, v
 	init_waitqueue_head(&ctx->ctx_msgq_wait);
 	init_waitqueue_head(&ctx->ctx_zombieq);
 
-	DPRINT(("ctx=%p flags=0x%x system=%d notify_block=%d excl_idle=%d no_msg=%d ctx_fd=%d \n",
+	DPRINT(("ctx=%p flags=0x%x system=%d notify_block=%d excl_idle=%d no_msg=%d ctx_fd=%d\n",
 		ctx,
 		ctx_flags,
 		ctx->ctx_fl_system,
@@ -3682,7 +3682,7 @@ pfm_restart(pfm_context_t *ctx, void *ar
 	 * "self-monitoring".
 	 */
 	if (CTX_OVFL_NOBLOCK(ctx) == 0 && state == PFM_CTX_MASKED) {
-		DPRINT(("unblocking [%d] \n", task->pid));
+		DPRINT(("unblocking [%d]\n", task->pid));
 		up(&ctx->ctx_restart_sem);
 	} else {
 		DPRINT(("[%d] armed exit trap\n", task->pid));
Index: linux-kj/arch/m68k/kernel/traps.c
===================================================================
--- linux-kj.orig/arch/m68k/kernel/traps.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/m68k/kernel/traps.c	2005-09-21 01:35:53.000000000 +0400
@@ -499,7 +499,7 @@ static inline void access_error040(struc
 
 		if (do_page_fault(&fp->ptregs, addr, errorcode)) {
 #ifdef DEBUG
-		        printk("do_page_fault() !=0 \n");
+		        printk("do_page_fault() !=0\n");
 #endif
 			if (user_mode(&fp->ptregs)){
 				/* delay writebacks after signal delivery */
Index: linux-kj/arch/m68k/mac/config.c
===================================================================
--- linux-kj.orig/arch/m68k/mac/config.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/m68k/mac/config.c	2005-09-21 01:35:53.000000000 +0400
@@ -191,7 +191,7 @@ static void mac_cache_card_flush(int wri
 void __init config_mac(void)
 {
 	if (!MACH_IS_MAC) {
-	  printk(KERN_ERR "ERROR: no Mac, but config_mac() called!! \n");
+	  printk(KERN_ERR "ERROR: no Mac, but config_mac() called!!\n");
 	}
 
 	mach_sched_init      = mac_sched_init;
@@ -840,7 +840,7 @@ void mac_identify(void)
 	iop_preinit();
 	mac_debug_init();
 
-	printk (KERN_INFO "Detected Macintosh model: %d \n", model);
+	printk (KERN_INFO "Detected Macintosh model: %d\n", model);
 
 	/*
 	 * Report booter data:
@@ -850,12 +850,12 @@ void mac_identify(void)
 		mac_bi_data.videoaddr, mac_bi_data.videorow,
 		mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF,
 		mac_bi_data.dimensions >> 16);
-	printk (KERN_DEBUG " Videological 0x%lx phys. 0x%lx, SCC at 0x%lx \n",
+	printk (KERN_DEBUG " Videological 0x%lx phys. 0x%lx, SCC at 0x%lx\n",
 		mac_bi_data.videological, mac_orig_videoaddr,
 		mac_bi_data.sccbase);
-	printk (KERN_DEBUG " Boottime: 0x%lx GMTBias: 0x%lx \n",
+	printk (KERN_DEBUG " Boottime: 0x%lx GMTBias: 0x%lx\n",
 		mac_bi_data.boottime, mac_bi_data.gmtbias);
-	printk (KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx \n",
+	printk (KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx\n",
 		mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize);
 #if 0
 	printk ("Ramdisk: addr 0x%lx size 0x%lx\n",
Index: linux-kj/arch/m68k/q40/q40ints.c
===================================================================
--- linux-kj.orig/arch/m68k/q40/q40ints.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/m68k/q40/q40ints.c	2005-09-21 01:35:53.000000000 +0400
@@ -160,7 +160,7 @@ int q40_request_irq(unsigned int irq,
 void q40_free_irq(unsigned int irq, void *dev_id)
 {
 	if (irq > Q40_IRQ_MAX || (irq>15 && irq<32)) {
-		printk("%s: Incorrect IRQ %d, dev_id %x \n", __FUNCTION__, irq, (unsigned)dev_id);
+		printk("%s: Incorrect IRQ %d, dev_id %x\n", __FUNCTION__, irq, (unsigned)dev_id);
 		return;
 	}
 
Index: linux-kj/arch/mips/au1000/common/dbdma.c
===================================================================
--- linux-kj.orig/arch/mips/au1000/common/dbdma.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/au1000/common/dbdma.c	2005-09-21 01:35:53.000000000 +0400
@@ -804,7 +804,7 @@ au1xxx_dbdma_dump(u32 chanid)
 	dtp = ctp->chan_dest;
 	cp = ctp->chan_ptr;
 
-	printk("Chan %x, stp %x (dev %d)  dtp %x (dev %d) \n",
+	printk("Chan %x, stp %x (dev %d)  dtp %x (dev %d)\n",
 		(u32)ctp, (u32)stp, stp - dbdev_tab, (u32)dtp, dtp - dbdev_tab);
 	printk("desc base %x, get %x, put %x, cur %x\n",
 		(u32)(ctp->chan_desc_base), (u32)(ctp->get_ptr),
Index: linux-kj/arch/mips/ddb5xxx/ddb5477/setup.c
===================================================================
--- linux-kj.orig/arch/mips/ddb5xxx/ddb5477/setup.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/ddb5xxx/ddb5477/setup.c	2005-09-21 01:35:53.000000000 +0400
@@ -116,7 +116,7 @@ static unsigned int __init detect_bus_fr
 	ddb_out32(SP_TIMER_BASE+4, 0x0);	/* disable it again */
 
 	freq = (t1 - t2)*10;
-	printk("DDB bus frequency detection : %u \n", freq);
+	printk("DDB bus frequency detection : %u\n", freq);
 	return freq;
 }
 
Index: linux-kj/arch/mips/ite-boards/generic/irq.c
===================================================================
--- linux-kj.orig/arch/mips/ite-boards/generic/irq.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/ite-boards/generic/irq.c	2005-09-21 01:35:53.000000000 +0400
@@ -234,7 +234,7 @@ void mips_spurious_interrupt(struct pt_r
 	status = read_c0_status();
 	cause = read_c0_cause();
 	printk("status %x cause %x\n", status, cause);
-	printk("epc %x badvaddr %x \n", regs->cp0_epc, regs->cp0_badvaddr);
+	printk("epc %x badvaddr %x\n", regs->cp0_epc, regs->cp0_badvaddr);
 #endif
 }
 
Index: linux-kj/arch/mips/pci/fixup-rbtx4927.c
===================================================================
--- linux-kj.orig/arch/mips/pci/fixup-rbtx4927.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/pci/fixup-rbtx4927.c	2005-09-21 01:35:53.000000000 +0400
@@ -123,7 +123,7 @@ int __init pcibios_map_irq(struct pci_de
 {
 	unsigned char irq;
 
-	printk("PCI Setup for pin %d \n", pin);
+	printk("PCI Setup for pin %d\n", pin);
 
 	if (dev->device == 0x9130) /* IDE */
 		irq = 14;
Index: linux-kj/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c
===================================================================
--- linux-kj.orig/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c	2005-09-21 01:35:53.000000000 +0400
@@ -129,7 +129,7 @@ static int recv_ack(void)
 
 	if (ack) {
 		do_idle();
-		printk(KERN_ERR "Error reading the Atmel 24C32/24C64 EEPROM \n");
+		printk(KERN_ERR "Error reading the Atmel 24C32/24C64 EEPROM\n");
 		return -1;
 	}
 
Index: linux-kj/arch/mips/tx4927/common/tx4927_irq.c
===================================================================
--- linux-kj.orig/arch/mips/tx4927/common/tx4927_irq.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/tx4927/common/tx4927_irq.c	2005-09-21 01:35:53.000000000 +0400
@@ -235,7 +235,7 @@ static void __init tx4927_irq_cp0_init(v
 
 static unsigned int tx4927_irq_cp0_startup(unsigned int irq)
 {
-	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_STARTUP, "irq=%d \n", irq);
+	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_STARTUP, "irq=%d\n", irq);
 
 	tx4927_irq_cp0_enable(irq);
 
@@ -244,7 +244,7 @@ static unsigned int tx4927_irq_cp0_start
 
 static void tx4927_irq_cp0_shutdown(unsigned int irq)
 {
-	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_SHUTDOWN, "irq=%d \n", irq);
+	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_SHUTDOWN, "irq=%d\n", irq);
 
 	tx4927_irq_cp0_disable(irq);
 
@@ -255,7 +255,7 @@ static void tx4927_irq_cp0_enable(unsign
 {
 	unsigned long flags;
 
-	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENABLE, "irq=%d \n", irq);
+	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENABLE, "irq=%d\n", irq);
 
 	spin_lock_irqsave(&tx4927_cp0_lock, flags);
 
@@ -270,7 +270,7 @@ static void tx4927_irq_cp0_disable(unsig
 {
 	unsigned long flags;
 
-	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_DISABLE, "irq=%d \n", irq);
+	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_DISABLE, "irq=%d\n", irq);
 
 	spin_lock_irqsave(&tx4927_cp0_lock, flags);
 
@@ -283,7 +283,7 @@ static void tx4927_irq_cp0_disable(unsig
 
 static void tx4927_irq_cp0_mask_and_ack(unsigned int irq)
 {
-	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_MASK, "irq=%d \n", irq);
+	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_MASK, "irq=%d\n", irq);
 
 	tx4927_irq_cp0_disable(irq);
 
@@ -292,7 +292,7 @@ static void tx4927_irq_cp0_mask_and_ack(
 
 static void tx4927_irq_cp0_end(unsigned int irq)
 {
-	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENDIRQ, "irq=%d \n", irq);
+	TX4927_IRQ_DPRINTK(TX4927_IRQ_CP0_ENDIRQ, "irq=%d\n", irq);
 
 	if (!(irq_desc[irq].status & (IRQ_DISABLED | IRQ_INPROGRESS))) {
 		tx4927_irq_cp0_enable(irq);
Index: linux-kj/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c
===================================================================
--- linux-kj.orig/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/tx4927/toshiba_rbtx4927/toshiba_rbtx4927_setup.c	2005-09-21 01:35:53.000000000 +0400
@@ -871,7 +871,7 @@ void __init toshiba_rbtx4927_setup(void)
 	if (tx4927_using_backplane == 1)
 		printk("backplane board IS installed\n");
 	else
-		printk("No Backplane \n");
+		printk("No Backplane\n");
 
 	/* this is on ISA bus behind PCI bus, so need PCI up first */
 #ifdef CONFIG_TOSHIBA_FPCIB0
Index: linux-kj/arch/mips/vr41xx/nec-cmbvr4133/irq.c
===================================================================
--- linux-kj.orig/arch/mips/vr41xx/nec-cmbvr4133/irq.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/vr41xx/nec-cmbvr4133/irq.c	2005-09-21 01:35:53.000000000 +0400
@@ -99,7 +99,7 @@ void __init rockhopper_init_irq(void)
 	int i;
 
 	if(!vr4133_rockhopper) {
-		printk(KERN_ERR "Not a Rockhopper Board \n");
+		printk(KERN_ERR "Not a Rockhopper Board\n");
 		return;
 	}
 
Index: linux-kj/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c
===================================================================
--- linux-kj.orig/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/mips/vr41xx/nec-cmbvr4133/m1535plus.c	2005-09-21 01:35:53.000000000 +0400
@@ -209,7 +209,7 @@ void __init ali_m5229_preinit(void)
 {
 	if (ali_config_readw(PCI_VENDOR_ID,16) == PCI_VENDOR_ID_AL &&
 	    ali_config_readw(PCI_DEVICE_ID,16) == PCI_DEVICE_ID_AL_M1533) {
-		printk(KERN_INFO "Found an NEC Rockhopper \n");
+		printk(KERN_INFO "Found an NEC Rockhopper\n");
 		vr4133_rockhopper = 1;
 		/*
 		 * Enable ALi M5229 IDE Controller (both channels)
Index: linux-kj/arch/parisc/kernel/cache.c
===================================================================
--- linux-kj.orig/arch/parisc/kernel/cache.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/parisc/kernel/cache.c	2005-09-21 01:35:53.000000000 +0400
@@ -181,14 +181,14 @@ parisc_cache_init(void)
 		cache_info.ic_conf.cc_cst,
 		cache_info.ic_conf.cc_assoc);
 
-	printk("D-TLB conf: sh %d page %d cst %d aid %d pad1 %d \n",
+	printk("D-TLB conf: sh %d page %d cst %d aid %d pad1 %d\n",
 		cache_info.dt_conf.tc_sh,
 		cache_info.dt_conf.tc_page,
 		cache_info.dt_conf.tc_cst,
 		cache_info.dt_conf.tc_aid,
 		cache_info.dt_conf.tc_pad1);
 
-	printk("I-TLB conf: sh %d page %d cst %d aid %d pad1 %d \n",
+	printk("I-TLB conf: sh %d page %d cst %d aid %d pad1 %d\n",
 		cache_info.it_conf.tc_sh,
 		cache_info.it_conf.tc_page,
 		cache_info.it_conf.tc_cst,
Index: linux-kj/arch/ppc/boot/utils/mkprep.c
===================================================================
--- linux-kj.orig/arch/ppc/boot/utils/mkprep.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ppc/boot/utils/mkprep.c	2005-09-21 01:35:53.000000000 +0400
@@ -273,7 +273,7 @@ write_asm_data( int in, int out )
       if (++cnt == 4)
       {
 	cnt = 0;
-	sprintf( str, " # %x \n", pos+i-12);
+	sprintf( str, " # %x\n", pos+i-12);
 	write( out, str, strlen(str) );
       } else
       {
Index: linux-kj/arch/ppc/platforms/4xx/bubinga.c
===================================================================
--- linux-kj.orig/arch/ppc/platforms/4xx/bubinga.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ppc/platforms/4xx/bubinga.c	2005-09-21 01:35:53.000000000 +0400
@@ -139,7 +139,7 @@ bios_fixup(struct pci_controller *hose, 
 	int i;
 
 	printk("ioremap PCLIO_BASE = 0x%x\n", pcip);
-	printk("PCI bridge regs before fixup \n");
+	printk("PCI bridge regs before fixup\n");
 	for (i = 0; i <= 3; i++) {
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
@@ -200,7 +200,7 @@ bios_fixup(struct pci_controller *hose, 
 	/* end work arround */
 
 #ifdef DEBUG
-	printk("PCI bridge regs after fixup \n");
+	printk("PCI bridge regs after fixup\n");
 	for (i = 0; i <= 3; i++) {
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
Index: linux-kj/arch/ppc/platforms/4xx/sycamore.c
===================================================================
--- linux-kj.orig/arch/ppc/platforms/4xx/sycamore.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ppc/platforms/4xx/sycamore.c	2005-09-21 01:35:53.000000000 +0400
@@ -170,7 +170,7 @@ bios_fixup(struct pci_controller *hose, 
 	int i;
 
 	printk("ioremap PCLIO_BASE = 0x%x\n", pcip);
-	printk("PCI bridge regs before fixup \n");
+	printk("PCI bridge regs before fixup\n");
 	for (i = 0; i <= 3; i++) {
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
@@ -234,7 +234,7 @@ bios_fixup(struct pci_controller *hose, 
 	/* end work arround */
 
 #ifdef DEBUG
-	printk("PCI bridge regs after fixup \n");
+	printk("PCI bridge regs after fixup\n");
 	for (i = 0; i <= 3; i++) {
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
Index: linux-kj/arch/ppc/platforms/4xx/walnut.c
===================================================================
--- linux-kj.orig/arch/ppc/platforms/4xx/walnut.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ppc/platforms/4xx/walnut.c	2005-09-21 01:35:53.000000000 +0400
@@ -146,7 +146,7 @@ bios_fixup(struct pci_controller *hose, 
 	int i;
 
 	printk("ioremap PCLIO_BASE = 0x%x\n", pcip);
-	printk("PCI bridge regs before fixup \n");
+	printk("PCI bridge regs before fixup\n");
 	for (i = 0; i <= 3; i++) {
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
@@ -206,7 +206,7 @@ bios_fixup(struct pci_controller *hose, 
 	/* end work arround */
 
 #ifdef DEBUG
-	printk("PCI bridge regs after fixup \n");
+	printk("PCI bridge regs after fixup\n");
 	for (i = 0; i <= 3; i++) {
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].ma)));
 		printk(" pmm%dma\t0x%x\n", i, in_le32(&(pcip->pmm[i].la)));
Index: linux-kj/arch/ppc/platforms/85xx/stx_gp3.c
===================================================================
--- linux-kj.orig/arch/ppc/platforms/85xx/stx_gp3.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ppc/platforms/85xx/stx_gp3.c	2005-09-21 01:35:53.000000000 +0400
@@ -221,7 +221,7 @@ gp3_show_cpuinfo(struct seq_file *m)
 
 	memsize = total_memory;
 
-	seq_printf(m, "Vendor\t\t: RPC Electronics STx \n");
+	seq_printf(m, "Vendor\t\t: RPC Electronics STx\n");
 	seq_printf(m, "Machine\t\t: GP3 - MPC%s\n", cur_ppc_sys_spec->ppc_sys_name);
 	seq_printf(m, "bus freq\t: %u.%.6u MHz\n", freq / 1000000,
 		   freq % 1000000);
Index: linux-kj/arch/ppc/platforms/hdpu.c
===================================================================
--- linux-kj.orig/arch/ppc/platforms/hdpu.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ppc/platforms/hdpu.c	2005-09-21 01:35:53.000000000 +0400
@@ -427,7 +427,7 @@ static void __init hdpu_setup_arch(void)
 	hdpu_early_serial_map();
 #endif
 
-	printk("SKY HDPU Compute Blade \n");
+	printk("SKY HDPU Compute Blade\n");
 
 	if (ppc_md.progress)
 		ppc_md.progress("hdpu_setup_arch: exit", 0);
Index: linux-kj/arch/ppc/syslib/ppc4xx_sgdma.c
===================================================================
--- linux-kj.orig/arch/ppc/syslib/ppc4xx_sgdma.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/ppc/syslib/ppc4xx_sgdma.c	2005-09-21 01:35:53.000000000 +0400
@@ -109,7 +109,7 @@ ppc4xx_add_dma_sgl(sgl_handle_t handle, 
 #endif
 
 	if ((unsigned) (psgl->ptail + 1) >= ((unsigned) psgl + SGL_LIST_SIZE)) {
-		printk("sgl handle out of memory \n");
+		printk("sgl handle out of memory\n");
 		return DMA_STATUS_OUT_OF_MEMORY;
 	}
 
Index: linux-kj/arch/ppc64/boot/addRamDisk.c
===================================================================
--- linux-kj.orig/arch/ppc64/boot/addRamDisk.c	2005-09-21 01:19:05.000000000 +0400
+++ linux-kj/arch/ppc64/boot/addRamDisk.c	2005-09-21 01:35:53.000000000 +0400
@@ -130,9 +130,9 @@ int main(int argc, char **argv)
 	roundedKernelLen = actualKernelLen;
 	if ( round )
 		roundedKernelLen += (4096 - round);
-	printf("Vmlinux length rounded up to a 4k multiple = %ld/0x%lx \n", roundedKernelLen, roundedKernelLen);
+	printf("Vmlinux length rounded up to a 4k multiple = %ld/0x%lx\n", roundedKernelLen, roundedKernelLen);
 	roundedKernelPages = roundedKernelLen / 4096;
-	printf("Vmlinux pages to copy = %ld/0x%lx \n", roundedKernelPages, roundedKernelPages);
+	printf("Vmlinux pages to copy = %ld/0x%lx\n", roundedKernelPages, roundedKernelPages);
 
 
 
@@ -141,16 +141,16 @@ int main(int argc, char **argv)
 	fseek(sysmap, 0, SEEK_END);
 	sysmapFileLen = ftell(sysmap);
 	fseek(sysmap, 0, SEEK_SET);
-	printf("%s file size = %ld/0x%lx \n", argv[2], sysmapFileLen, sysmapFileLen);
+	printf("%s file size = %ld/0x%lx\n", argv[2], sysmapFileLen, sysmapFileLen);
 
 	sysmapLen = sysmapFileLen;
 
 	roundR = 4096 - (sysmapLen % 4096);
 	if (roundR) {
-		printf("Rounding System Map file up to a multiple of 4096, adding %ld/0x%lx \n", roundR, roundR);
+		printf("Rounding System Map file up to a multiple of 4096, adding %ld/0x%lx\n", roundR, roundR);
 		sysmapLen += roundR;
 	}
-	printf("Rounded System Map size is %ld/0x%lx \n", sysmapLen, sysmapLen);
+	printf("Rounded System Map size is %ld/0x%lx\n", sysmapLen, sysmapLen);
   
 	/* Process the Sysmap file to determine where _end is */
 	sysmapPages = sysmapLen / 4096;
@@ -159,9 +159,9 @@ int main(int argc, char **argv)
 	/* search for _end in the last page of the system map */
 	ptr_end = strstr(inbuf, " _end");
 	if (!ptr_end) {
-		fprintf(stderr, "Unable to find _end in the sysmap file \n");
-		fprintf(stderr, "inbuf: \n");
-		fprintf(stderr, "%s \n", inbuf);
+		fprintf(stderr, "Unable to find _end in the sysmap file\n");
+		fprintf(stderr, "inbuf:\n");
+		fprintf(stderr, "%s\n", inbuf);
 		exit(1);
 	}
 	printf("Found _end in the last page of the sysmap - backing up 10 characters it looks like %s", ptr_end-10);
@@ -174,14 +174,14 @@ int main(int argc, char **argv)
 	if (padPages < 0) {
 		/* vmlinux is larger than _end - adjust the offset to the start of the embedded ram disk */ 
 		offset_end = roundedKernelLen;
-		printf("vmlinux is larger than _end indicates it needs to be - offset_end = %lx \n", offset_end);
+		printf("vmlinux is larger than _end indicates it needs to be - offset_end = %lx\n", offset_end);
 		padPages = 0;
-		printf("will insert %lx pages between the vmlinux and the start of the ram disk \n", padPages);
+		printf("will insert %lx pages between the vmlinux and the start of the ram disk\n", padPages);
 	}
 	else {
 		/* _end is larger than vmlinux - use the offset to _end that we calculated from the system map */
-		printf("vmlinux is smaller than _end indicates is needed - offset_end = %lx \n", offset_end);
-		printf("will insert %lx pages between the vmlinux and the start of the ram disk \n", padPages);
+		printf("vmlinux is smaller than _end indicates is needed - offset_end = %lx\n", offset_end);
+		printf("will insert %lx pages between the vmlinux and the start of the ram disk\n", padPages);
 	}
 
 
@@ -189,22 +189,22 @@ int main(int argc, char **argv)
 	/* Input Ram Disk file */
 	// Set the offset that the ram disk will be started at.
 	ramStartOffs = offset_end;  /* determined from the input vmlinux file and the system map */
-	printf("Ram Disk will start at offset = 0x%lx \n", ramStartOffs);
+	printf("Ram Disk will start at offset = 0x%lx\n", ramStartOffs);
   
 	fseek(ramDisk, 0, SEEK_END);
 	ramFileLen = ftell(ramDisk);
 	fseek(ramDisk, 0, SEEK_SET);
-	printf("%s file size = %ld/0x%lx \n", argv[1], ramFileLen, ramFileLen);
+	printf("%s file size = %ld/0x%lx\n", argv[1], ramFileLen, ramFileLen);
 
 	ramLen = ramFileLen;
 
 	roundR = 4096 - (ramLen % 4096);
 	if ( roundR ) {
-		printf("Rounding RAM disk file up to a multiple of 4096, adding %ld/0x%lx \n", roundR, roundR);
+		printf("Rounding RAM disk file up to a multiple of 4096, adding %ld/0x%lx\n", roundR, roundR);
 		ramLen += roundR;
 	}
 
-	printf("Rounded RAM disk size is %ld/0x%lx \n", ramLen, ramLen);
+	printf("Rounded RAM disk size is %ld/0x%lx\n", ramLen, ramLen);
 	ramPages = ramLen / 4096;
 	printf("RAM disk pages to copy = %ld/0x%lx\n", ramPages, ramPages);
 
@@ -264,7 +264,7 @@ int main(int argc, char **argv)
 	}
 	/* Get the naca pointer */
 	naca = ntohl(*((u_int32_t*) &inbuf[0x0C])) - KERNELBASE;
-	printf("Naca is at offset 0x%lx \n", naca);
+	printf("Naca is at offset 0x%lx\n", naca);
 
 	/* fseek to the naca */
 	fseek(outputVmlinux, ElfHeaderSize + naca, SEEK_SET);
Index: linux-kj/arch/ppc64/kernel/iSeries_proc.c
===================================================================
--- linux-kj.orig/arch/ppc64/kernel/iSeries_proc.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/kernel/iSeries_proc.c	2005-09-21 01:35:53.000000000 +0400
@@ -77,7 +77,7 @@ static int proc_titantod_show(struct seq
 
 		seq_printf(m, "  titan elapsed = %lu uSec\n", titan_usec);
 		seq_printf(m, "  tb elapsed    = %lu ticks\n", tb_ticks);
-		seq_printf(m, "  titan jiffies = %lu.%04lu \n", titan_jiffies,
+		seq_printf(m, "  titan jiffies = %lu.%04lu\n", titan_jiffies,
 			   titan_jiff_rem_usec);
 		seq_printf(m, "  tb jiffies    = %lu.%04lu\n", tb_jiffies,
 			   tb_jiff_rem_usec);
Index: linux-kj/arch/ppc64/kernel/iSeries_setup.c
===================================================================
--- linux-kj.orig/arch/ppc64/kernel/iSeries_setup.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/kernel/iSeries_setup.c	2005-09-21 01:35:53.000000000 +0400
@@ -281,7 +281,7 @@ static unsigned long iSeries_process_mai
 		mem_blocks = iSeries_process_Condor_mainstore_vpd(mb_array,
 				max_entries);
 
-	printk("Mainstore_VPD: numMemoryBlocks = %ld \n", mem_blocks);
+	printk("Mainstore_VPD: numMemoryBlocks = %ld\n", mem_blocks);
 	for (i = 0; i < mem_blocks; ++i) {
 		printk("Mainstore_VPD: block %3ld logical chunks %016lx - %016lx\n"
 		       "                             abs chunks %016lx - %016lx\n",
Index: linux-kj/arch/ppc64/kernel/lparcfg.c
===================================================================
--- linux-kj.orig/arch/ppc64/kernel/lparcfg.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/kernel/lparcfg.c	2005-09-21 01:35:53.000000000 +0400
@@ -87,7 +87,7 @@ static unsigned long get_purr(void)
 		sum_purr += lpaca->lppaca.emulated_time_base;
 
 #ifdef PURR_DEBUG
-		printk(KERN_INFO "get_purr for cpu (%d) has value (%ld) \n",
+		printk(KERN_INFO "get_purr for cpu (%d) has value (%ld)\n",
 			cpu, lpaca->lppaca.emulated_time_base);
 #endif
 	}
@@ -107,7 +107,7 @@ static int lparcfg_data(struct seq_file 
 	struct paca_struct *lpaca = get_paca();
 	unsigned long purr = get_purr();
 
-	seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);
+	seq_printf(m, "%s %s\n", MODULE_NAME, MODULE_VERS);
 
 	shared = (int)(lpaca->lppaca_ptr->shared_proc);
 	seq_printf(m, "serial_number=%c%c%c%c%c%c%c\n",
@@ -248,7 +248,7 @@ static void parse_system_parameter_strin
 
 	char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
 	if (!local_buffer) {
-		printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
+		printk(KERN_ERR "%s %s kmalloc failure at line %d\n",
 		       __FILE__, __FUNCTION__, __LINE__);
 		return;
 	}
@@ -271,13 +271,13 @@ static void parse_system_parameter_strin
 		int idx, w_idx;
 		char *workbuffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
 		if (!workbuffer) {
-			printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
+			printk(KERN_ERR "%s %s kmalloc failure at line %d\n",
 			       __FILE__, __FUNCTION__, __LINE__);
 			kfree(local_buffer);			
 			return;
 		}
 #ifdef LPARCFG_DEBUG
-		printk(KERN_INFO "success calling get-system-parameter \n");
+		printk(KERN_INFO "success calling get-system-parameter\n");
 #endif
 		splpar_strlen = local_buffer[0] * 16 + local_buffer[1];
 		local_buffer += 2;	/* step over strlen value */
@@ -331,7 +331,7 @@ static int lparcfg_count_active_processo
 
 	while ((cpus_dn = of_find_node_by_type(cpus_dn, "cpu"))) {
 #ifdef LPARCFG_DEBUG
-		printk(KERN_ERR "cpus_dn %p \n", cpus_dn);
+		printk(KERN_ERR "cpus_dn %p\n", cpus_dn);
 #endif
 		count++;
 	}
@@ -359,7 +359,7 @@ static int lparcfg_data(struct seq_file 
 			lp_index = *lp_index_ptr;
 	}
 
-	seq_printf(m, "%s %s \n", MODULE_NAME, MODULE_VERS);
+	seq_printf(m, "%s %s\n", MODULE_NAME, MODULE_VERS);
 
 	seq_printf(m, "serial_number=%s\n", system_id);
 
Index: linux-kj/arch/ppc64/kernel/maple_pci.c
===================================================================
--- linux-kj.orig/arch/ppc64/kernel/maple_pci.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/kernel/maple_pci.c	2005-09-21 01:35:53.000000000 +0400
@@ -490,7 +490,7 @@ static void fixup_maple_ide(struct pci_d
 #endif
 #if 0 /* fix bus master base */
 	pci_write_config_dword(dev, 0x20, 0xcc01);
-	printk("old ide resource: %lx -> %lx \n",
+	printk("old ide resource: %lx -> %lx\n",
 	       dev->resource[4].start, dev->resource[4].end);
 	dev->resource[4].start = 0xcc00;
 	dev->resource[4].end = 0xcc10;
Index: linux-kj/arch/ppc64/kernel/mpic.c
===================================================================
--- linux-kj.orig/arch/ppc64/kernel/mpic.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/kernel/mpic.c	2005-09-21 01:35:53.000000000 +0400
@@ -871,7 +871,7 @@ void mpic_request_ipis(void)
 
 	BUG_ON(mpic == NULL);
 	
-	printk("requesting IPIs ... \n");
+	printk("requesting IPIs ...\n");
 
 	/* IPIs are marked SA_INTERRUPT as they must run with irqs disabled */
 	request_irq(mpic->ipi_offset+0, mpic_ipi_action, SA_INTERRUPT,
@@ -883,6 +883,6 @@ void mpic_request_ipis(void)
 	request_irq(mpic->ipi_offset+3, mpic_ipi_action, SA_INTERRUPT,
 		   "IPI3 (debugger break)", mpic);
 
-	printk("IPIs requested... \n");
+	printk("IPIs requested...\n");
 }
 #endif /* CONFIG_SMP */
Index: linux-kj/arch/ppc64/kernel/rtas.c
===================================================================
--- linux-kj.orig/arch/ppc64/kernel/rtas.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/kernel/rtas.c	2005-09-21 01:35:53.000000000 +0400
@@ -542,7 +542,7 @@ rtas_flash_firmware(void)
 
 	printk(KERN_ALERT "FLASH: flash image is %ld bytes\n", image_size);
 	printk(KERN_ALERT "FLASH: performing flash and reboot\n");
-	rtas_progress("Flashing        \n", 0x0);
+	rtas_progress("Flashing\n", 0x0);
 	rtas_progress("Please Wait...  ", 0x0);
 	printk(KERN_ALERT "FLASH: this will take several minutes.  Do not power off!\n");
 	status = rtas_call(update_token, 1, 1, NULL, rtas_block_list);
Index: linux-kj/arch/ppc64/kernel/xics.c
===================================================================
--- linux-kj.orig/arch/ppc64/kernel/xics.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/kernel/xics.c	2005-09-21 01:35:53.000000000 +0400
@@ -173,7 +173,7 @@ static int pSeriesLP_xirr_info_get(int n
 
 	lpar_rc = plpar_xirr(&return_value);
 	if (lpar_rc != H_Success)
-		panic(" bad return code xirr - rc = %lx \n", lpar_rc); 
+		panic(" bad return code xirr - rc = %lx\n", lpar_rc); 
 	return (int)return_value;
 }
 
Index: linux-kj/arch/ppc64/xmon/xmon.c
===================================================================
--- linux-kj.orig/arch/ppc64/xmon/xmon.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/ppc64/xmon/xmon.c	2005-09-21 01:35:53.000000000 +0400
@@ -1544,24 +1544,24 @@ super_regs(void)
 		printf("srr0 = %.16lx  srr1 = %.16lx\n", get_srr0(), get_srr1());
 #ifdef CONFIG_PPC_ISERIES
 		// Dump out relevant Paca data areas.
-		printf("Paca: \n");
+		printf("Paca:\n");
 		ptrPaca = get_paca();
     
-		printf("  Local Processor Control Area (LpPaca): \n");
+		printf("  Local Processor Control Area (LpPaca):\n");
 		ptrLpPaca = ptrPaca->lppaca_ptr;
-		printf("    Saved Srr0=%.16lx  Saved Srr1=%.16lx \n",
+		printf("    Saved Srr0=%.16lx  Saved Srr1=%.16lx\n",
 		       ptrLpPaca->saved_srr0, ptrLpPaca->saved_srr1);
-		printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx \n",
+		printf("    Saved Gpr3=%.16lx  Saved Gpr4=%.16lx\n",
 		       ptrLpPaca->saved_gpr3, ptrLpPaca->saved_gpr4);
-		printf("    Saved Gpr5=%.16lx \n", ptrLpPaca->saved_gpr5);
+		printf("    Saved Gpr5=%.16lx\n", ptrLpPaca->saved_gpr5);
     
-		printf("  Local Processor Register Save Area (LpRegSave): \n");
+		printf("  Local Processor Register Save Area (LpRegSave):\n");
 		ptrLpRegSave = ptrPaca->reg_save_ptr;
-		printf("    Saved Sprg0=%.16lx  Saved Sprg1=%.16lx \n",
+		printf("    Saved Sprg0=%.16lx  Saved Sprg1=%.16lx\n",
 		       ptrLpRegSave->xSPRG0, ptrLpRegSave->xSPRG0);
-		printf("    Saved Sprg2=%.16lx  Saved Sprg3=%.16lx \n",
+		printf("    Saved Sprg2=%.16lx  Saved Sprg3=%.16lx\n",
 		       ptrLpRegSave->xSPRG2, ptrLpRegSave->xSPRG3);
-		printf("    Saved Msr  =%.16lx  Saved Nia  =%.16lx \n",
+		printf("    Saved Msr  =%.16lx  Saved Nia  =%.16lx\n",
 		       ptrLpRegSave->xMSR, ptrLpRegSave->xNIA);
 #endif
 
Index: linux-kj/arch/s390/appldata/appldata_mem.c
===================================================================
--- linux-kj.orig/arch/s390/appldata/appldata_mem.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/s390/appldata/appldata_mem.c	2005-09-21 01:35:53.000000000 +0400
@@ -78,9 +78,9 @@ static inline void appldata_debug_print(
 	P_DEBUG("pgpgout    = %8lu KB\n", mem_data->pgpgout);
 	P_DEBUG("pswpin     = %8lu Pages\n", mem_data->pswpin);
 	P_DEBUG("pswpout    = %8lu Pages\n", mem_data->pswpout);
-	P_DEBUG("pgalloc    = %8lu \n", mem_data->pgalloc);
-	P_DEBUG("pgfault    = %8lu \n", mem_data->pgfault);
-	P_DEBUG("pgmajfault = %8lu \n", mem_data->pgmajfault);
+	P_DEBUG("pgalloc    = %8lu\n", mem_data->pgalloc);
+	P_DEBUG("pgfault    = %8lu\n", mem_data->pgfault);
+	P_DEBUG("pgmajfault = %8lu\n", mem_data->pgmajfault);
 	P_DEBUG("sharedram  = %8lu KB\n", mem_data->sharedram);
 	P_DEBUG("totalram   = %8lu KB\n", mem_data->totalram);
 	P_DEBUG("freeram    = %8lu KB\n", mem_data->freeram);
Index: linux-kj/arch/s390/math-emu/math.c
===================================================================
--- linux-kj.orig/arch/s390/math-emu/math.c	2005-09-21 01:19:04.000000000 +0400
+++ linux-kj/arch/s390/math-emu/math.c	2005-09-21 01:35:53.000000000 +0400
@@ -107,7 +107,7 @@ static void display_emulation_not_implem
         {
                 location = (__u16 *)(regs->psw.addr-S390_lowcore.pgm_ilc);
                 printk("%s ieee fpu instruction not emulated "
-                       "process name: %s pid: %d \n",
+                       "process name: %s pid: %d\n",
                        instr, current->comm, current->pid);
                 printk("%s's PSW:    %08lx %08lx\n", instr,
                        (unsigned long) regs->psw.mask,
Index: linux-kj/arch/sh/boards/overdrive/fpga.c
===================================================================
--- linux-kj.orig/arch/sh/boards/overdrive/fpga.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/arch/sh/boards/overdrive/fpga.c	2005-09-21 01:35:53.000000000 +0400
@@ -59,13 +59,13 @@ static void __init program_overdrive_fpg
 	short_delay();
 
 	while ((*FPGA_ProgramReg & FPGA_NOT_STATUS) != 0) {
-		printk("FPGA:  Waiting for NotStatus to go Low ... \n");
+		printk("FPGA:  Waiting for NotStatus to go Low ...\n");
 	}
 
 	FPGA_NotConfigHigh();
 
 	/* Wait for FPGA "ready to be programmed" signal */
-	printk("FPGA:  Waiting for NotStatus to go high (FPGA ready)... \n");
+	printk("FPGA:  Waiting for NotStatus to go high (FPGA ready)...\n");
 
 	for (timeout = 0;
 	     (((*FPGA_ProgramReg & FPGA_NOT_STATUS) == 0)
Index: linux-kj/arch/sh/cchips/voyagergx/irq.c
===================================================================
--- linux-kj.orig/arch/sh/cchips/voyagergx/irq.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/arch/sh/cchips/voyagergx/irq.c	2005-09-21 01:35:53.000000000 +0400
@@ -148,7 +148,7 @@ int voyagergx_irq_demux(int irq)
 		} else {
 			printk("Unexpected IRQ irq = %d status = 0x%08lx\n", irq, val);
 		}
-		pr_debug("voyagergx_irq_demux %d \n", i);
+		pr_debug("voyagergx_irq_demux %d\n", i);
 #else
 		for (bit = 1, i = 0 ; i < VOYAGER_IRQ_NUM ; bit <<= 1, i++)
 			if (val & bit)
Index: linux-kj/arch/um/drivers/mconsole_kern.c
===================================================================
--- linux-kj.orig/arch/um/drivers/mconsole_kern.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/arch/um/drivers/mconsole_kern.c	2005-09-21 01:35:53.000000000 +0400
@@ -262,19 +262,19 @@ void mconsole_proc(struct mc_request *re
 }
 
 #define UML_MCONSOLE_HELPTEXT \
-"Commands: \n\
-    version - Get kernel version \n\
-    help - Print this message \n\
-    halt - Halt UML \n\
-    reboot - Reboot UML \n\
-    config <dev>=<config> - Add a new device to UML;  \n\
-	same syntax as command line \n\
-    config <dev> - Query the configuration of a device \n\
-    remove <dev> - Remove a device from UML \n\
-    sysrq <letter> - Performs the SysRq action controlled by the letter \n\
-    cad - invoke the Ctl-Alt-Del handler \n\
-    stop - pause the UML; it will do nothing until it receives a 'go' \n\
-    go - continue the UML after a 'stop' \n\
+"Commands:\n\
+    version - Get kernel version\n\
+    help - Print this message\n\
+    halt - Halt UML\n\
+    reboot - Reboot UML\n\
+    config <dev>=<config> - Add a new device to UML;\n\
+	same syntax as command line\n\
+    config <dev> - Query the configuration of a device\n\
+    remove <dev> - Remove a device from UML\n\
+    sysrq <letter> - Performs the SysRq action controlled by the letter\n\
+    cad - invoke the Ctl-Alt-Del handler\n\
+    stop - pause the UML; it will do nothing until it receives a 'go'\n\
+    go - continue the UML after a 'stop'\n\
     log <string> - make UML enter <string> into the kernel log\n\
     proc <file> - returns the contents of the UML's /proc/<file>\n\
     stack <pid> - returns the stack of the specified pid\n\
Index: linux-kj/arch/um/kernel/sysrq.c
===================================================================
--- linux-kj.orig/arch/um/kernel/sysrq.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/arch/um/kernel/sysrq.c	2005-09-21 01:35:53.000000000 +0400
@@ -24,7 +24,7 @@ void show_trace(struct task_struct *task
 		WARN_ON(1);
 	}
 
-        printk("Call Trace: \n");
+        printk("Call Trace:\n");
         while (((long) stack & (THREAD_SIZE-1)) != 0) {
                 addr = *stack;
 		if (__kernel_text_address(addr)) {
@@ -83,6 +83,6 @@ void show_stack(struct task_struct *task
 		printk("%08lx ", *stack++);
 	}
 
-	printk("Call Trace: \n");
+	printk("Call Trace:\n");
 	show_trace(current, esp);
 }
Index: linux-kj/arch/um/kernel/tt/ptproxy/proxy.c
===================================================================
--- linux-kj.orig/arch/um/kernel/tt/ptproxy/proxy.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/arch/um/kernel/tt/ptproxy/proxy.c	2005-09-21 01:35:53.000000000 +0400
@@ -298,10 +298,10 @@ void fake_child_exit(void)
 }
 
 char gdb_init_string[] = 
-"att 1 \n\
-b panic \n\
-b stop \n\
-handle SIGWINCH nostop noprint pass \n\
+"att 1\n\
+b panic\n\
+b stop\n\
+handle SIGWINCH nostop noprint pass\n\
 ";
 
 int start_debugger(char *prog, int startup, int stop, int *fd_out)
Index: linux-kj/arch/x86_64/mm/fault.c
===================================================================
--- linux-kj.orig/arch/x86_64/mm/fault.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/x86_64/mm/fault.c	2005-09-21 01:35:53.000000000 +0400
@@ -529,7 +529,7 @@ no_context:
 		printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
 	else
 		printk(KERN_ALERT "Unable to handle kernel paging request");
-	printk(" at %016lx RIP: \n" KERN_ALERT,address);
+	printk(" at %016lx RIP:\n" KERN_ALERT,address);
 	printk_address(regs->rip);
 	printk("\n");
 	dump_pagetable(address);
Index: linux-kj/arch/x86_64/mm/numa.c
===================================================================
--- linux-kj.orig/arch/x86_64/mm/numa.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/x86_64/mm/numa.c	2005-09-21 01:35:53.000000000 +0400
@@ -51,7 +51,7 @@ int __init compute_hash_shift(struct nod
 	while ((1UL << shift) <  (maxend / NODEMAPSIZE))
 		shift++;
 
-	printk (KERN_DEBUG"Using %d for the hash shift. Max adder is %lx \n",
+	printk (KERN_DEBUG"Using %d for the hash shift. Max adder is %lx\n",
 			shift,maxend);
 	memset(memnodemap,0xff,sizeof(*memnodemap) * NODEMAPSIZE);
 	for (i = 0; i < numnodes; i++) {
Index: linux-kj/arch/x86_64/mm/srat.c
===================================================================
--- linux-kj.orig/arch/x86_64/mm/srat.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/arch/x86_64/mm/srat.c	2005-09-21 01:35:53.000000000 +0400
@@ -141,7 +141,7 @@ acpi_numa_memory_affinity_init(struct ac
 	end = start + (ma->length_lo | ((u64)ma->length_hi << 32));
 	/* It is fine to add this area to the nodes data it will be used later*/
 	if (ma->flags.hot_pluggable == 1)
-		printk(KERN_INFO "SRAT: hot plug zone found %lx - %lx \n",
+		printk(KERN_INFO "SRAT: hot plug zone found %lx - %lx\n",
 				start, end);
 	i = conflicting_nodes(start, end);
 	if (i == node) {
Index: linux-kj/drivers/acpi/acpi_memhotplug.c
===================================================================
--- linux-kj.orig/drivers/acpi/acpi_memhotplug.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/acpi/acpi_memhotplug.c	2005-09-21 01:35:53.000000000 +0400
@@ -375,7 +375,7 @@ static int acpi_memory_device_add(struct
 	/* Set the device state */
 	mem_device->state = MEMORY_POWER_ON_STATE;
 
-	printk(KERN_INFO "%s \n", acpi_device_name(device));
+	printk(KERN_INFO "%s\n", acpi_device_name(device));
 
 	return_VALUE(result);
 }
Index: linux-kj/drivers/acpi/hotkey.c
===================================================================
--- linux-kj.orig/drivers/acpi/hotkey.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/hotkey.c	2005-09-21 01:35:53.000000000 +0400
@@ -769,7 +769,7 @@ static ssize_t hotkey_write_config(struc
 
 	if (copy_from_user(config_record, buffer, count)) {
 		kfree(config_record);
-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data \n"));
+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid data\n"));
 		return_VALUE(-EINVAL);
 	}
 	config_record[count] = 0;
@@ -826,7 +826,7 @@ static ssize_t hotkey_write_config(struc
 		else
 			free_poll_hotkey_buffer(key);
 		kfree(key);
-		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid hotkey \n"));
+		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid hotkey\n"));
 		return_VALUE(-EINVAL);
 	}
 
Index: linux-kj/drivers/acpi/pci_link.c
===================================================================
--- linux-kj.orig/drivers/acpi/pci_link.c	2005-09-21 01:24:46.000000000 +0400
+++ linux-kj/drivers/acpi/pci_link.c	2005-09-21 01:35:53.000000000 +0400
@@ -295,7 +295,7 @@ static int acpi_pci_link_get_current(str
 
 	link->irq.active = irq;
 
-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Link at IRQ %d \n", link->irq.active));
+	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Link at IRQ %d\n", link->irq.active));
 
       end:
 	return_VALUE(result);
Index: linux-kj/drivers/acpi/sleep/main.c
===================================================================
--- linux-kj.orig/drivers/acpi/sleep/main.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/acpi/sleep/main.c	2005-09-21 01:35:53.000000000 +0400
@@ -52,7 +52,7 @@ static int acpi_pm_prepare(suspend_state
 	u32 acpi_state = acpi_suspend_states[pm_state];
 
 	if (!sleep_states[acpi_state]) {
-		printk("acpi_pm_prepare does not support %d \n", pm_state);
+		printk("acpi_pm_prepare does not support %d\n", pm_state);
 		return -EPERM;
 	}
 	return acpi_sleep_prepare(acpi_state);
Index: linux-kj/drivers/acpi/sleep/wakeup.c
===================================================================
--- linux-kj.orig/drivers/acpi/sleep/wakeup.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/acpi/sleep/wakeup.c	2005-09-21 01:35:53.000000000 +0400
@@ -155,7 +155,7 @@ static int __init acpi_wakeup_device_ini
 
 	if (acpi_disabled)
 		return 0;
-	printk("ACPI wakeup devices: \n");
+	printk("ACPI wakeup devices:\n");
 
 	spin_lock(&acpi_device_lock);
 	list_for_each_safe(node, next, &acpi_wakeup_device_list) {
Index: linux-kj/drivers/atm/firestream.c
===================================================================
--- linux-kj.orig/drivers/atm/firestream.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/drivers/atm/firestream.c	2005-09-21 01:35:53.000000000 +0400
@@ -1512,7 +1512,7 @@ static void top_off_fp (struct fs_dev *d
 		write_fs (dev, FP_CTU(fp->offset), 1);
 	}
 
-	fs_dprintk (FS_DEBUG_QUEUE, "Added %d entries. \n", n);
+	fs_dprintk (FS_DEBUG_QUEUE, "Added %d entries.\n", n);
 }
 
 static void __devexit free_queue (struct fs_dev *dev, struct queue *txq)
@@ -1697,7 +1697,7 @@ static int __devinit fs_init (struct fs_
 
 		/* This bit is documented as "RESERVED" */
 		if (isr & ISR_INIT_ERR) {
-			printk (KERN_ERR "Error initializing the FS... \n");
+			printk (KERN_ERR "Error initializing the FS...\n");
 			return 1;
 		}
 		if (isr & ISR_INIT) {
@@ -1710,7 +1710,7 @@ static int __devinit fs_init (struct fs_
 	}
 
 	if (!to) {
-		printk (KERN_ERR "timeout initializing the FS... \n");
+		printk (KERN_ERR "timeout initializing the FS...\n");
 		return 1;
 	}
 
@@ -1935,7 +1935,7 @@ static void __devexit firestream_remove_
 #if 0
 	printk ("hptxq:\n");
 	for (i=0;i<60;i++) {
-		printk ("%d: %08x %08x %08x %08x \n", 
+		printk ("%d: %08x %08x %08x %08x\n", 
 			i, pq[qp].cmd, pq[qp].p0, pq[qp].p1, pq[qp].p2);
 		qp++;
 		if (qp >= 60) qp = 0;
Index: linux-kj/drivers/atm/idt77252.c
===================================================================
--- linux-kj.orig/drivers/atm/idt77252.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/atm/idt77252.c	2005-09-21 01:35:53.000000000 +0400
@@ -1431,7 +1431,7 @@ idt77252_tx(struct idt77252_dev *card)
 
 	TXPRINTK("idt77252_tx: tsq  %p: base %p, next %p, last %p\n", tsqe,
 		 card->tsq.base, card->tsq.next, card->tsq.last);
-	TXPRINTK("idt77252_tx: tsqb %08x, tsqt %08x, tsqh %08x, \n",
+	TXPRINTK("idt77252_tx: tsqb %08x, tsqt %08x, tsqh %08x,\n",
 		 readl(SAR_REG_TSQB),
 		 readl(SAR_REG_TSQT),
 		 readl(SAR_REG_TSQH));
Index: linux-kj/drivers/atm/iphase.c
===================================================================
--- linux-kj.orig/drivers/atm/iphase.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/drivers/atm/iphase.c	2005-09-21 01:35:53.000000000 +0400
@@ -631,7 +631,7 @@ static int ia_que_tx (IADEV *iadev) { 
       }
       if (!test_bit(ATM_VF_READY,&vcc->flags)) {
          dev_kfree_skb_any(skb);
-         printk("Free the SKB on closed vci %d \n", vcc->vci);
+         printk("Free the SKB on closed vci %d\n", vcc->vci);
          break;
       }
       iavcc = INPH_IA_VCC(vcc);
@@ -822,7 +822,7 @@ static void ia_hw_type(IADEV *iadev) {
       iadev->LineRate = (u32)(((34368000/8)*26)/(27*53));
    else
        iadev->LineRate = (u32)(ATM_OC3_PCR);
-   IF_INIT(printk("iadev->LineRate = %d \n", iadev->LineRate);)
+   IF_INIT(printk("iadev->LineRate = %d\n", iadev->LineRate);)
 
 }
 
@@ -1016,11 +1016,11 @@ static void desc_dbg(IADEV *iadev) {
   printk("B_tcq_wr = 0x%x desc = %d last desc = %d\n",
                      tcq_wr_ptr, readw(iadev->seg_ram+tcq_wr_ptr),
                      readw(iadev->seg_ram+tcq_wr_ptr-2));
-  printk(" host_tcq_wr = 0x%x  host_tcq_rd = 0x%x \n",  iadev->host_tcq_wr, 
+  printk(" host_tcq_wr = 0x%x  host_tcq_rd = 0x%x\n",  iadev->host_tcq_wr, 
                    iadev->ffL.tcq_rd);
   tcq_st_ptr =  readw(iadev->seg_reg+TCQ_ST_ADR);
   tcq_ed_ptr =  readw(iadev->seg_reg+TCQ_ED_ADR);
-  printk("tcq_st_ptr = 0x%x    tcq_ed_ptr = 0x%x \n", tcq_st_ptr, tcq_ed_ptr);
+  printk("tcq_st_ptr = 0x%x    tcq_ed_ptr = 0x%x\n", tcq_st_ptr, tcq_ed_ptr);
   i = 0;
   while (tcq_st_ptr != tcq_ed_ptr) {
       tmp = iadev->seg_ram+tcq_st_ptr;
@@ -1028,7 +1028,7 @@ static void desc_dbg(IADEV *iadev) {
       tcq_st_ptr += 2;
   }
   for(i=0; i <iadev->num_tx_desc; i++)
-      printk("Desc_tbl[%d] = %d \n", i, iadev->desc_tbl[i].timestamp);
+      printk("Desc_tbl[%d] = %d\n", i, iadev->desc_tbl[i].timestamp);
 } 
   
   
@@ -1045,9 +1045,9 @@ static void rx_excp_rcvd(struct atm_dev 
   iadev = INPH_IA_DEV(dev);  
   state = readl(iadev->reass_reg + STATE_REG) & 0xffff;  
   while((state & EXCPQ_EMPTY) != EXCPQ_EMPTY)  
-  { printk("state = %x \n", state); 
+  { printk("state = %x\n", state); 
         excpq_rd_ptr = readw(iadev->reass_reg + EXCP_Q_RD_PTR) & 0xffff;  
- printk("state = %x excpq_rd_ptr = %x \n", state, excpq_rd_ptr); 
+ printk("state = %x excpq_rd_ptr = %x\n", state, excpq_rd_ptr); 
         if (excpq_rd_ptr == *(u16*)(iadev->reass_reg + EXCP_Q_WR_PTR))
             IF_ERR(printk("excpq_rd_ptr is wrong!!!\n");)
         // TODO: update exception stat
@@ -1115,7 +1115,7 @@ static int rx_pkt(struct atm_dev *dev)  
         if (!desc || (desc > iadev->num_rx_desc) || 
                       ((buf_desc_ptr->vc_index & 0xffff) > iadev->num_vc)) { 
             free_desc(dev, desc);
-            IF_ERR(printk("IA: bad descriptor desc = %d \n", desc);)
+            IF_ERR(printk("IA: bad descriptor desc = %d\n", desc);)
             return -1;
         }
 	vcc = iadev->rx_open[buf_desc_ptr->vc_index & 0xffff];  
@@ -1718,7 +1718,7 @@ static void tx_dle_intr(struct atm_dev *
                IA_SKB_STATE(skb) |= IA_DLED;
                skb_queue_tail(&iavcc->txing_skb, skb);
             }
-            IF_EVENT(printk("tx_dle_intr: enque skb = 0x%x \n", (u32)skb);)
+            IF_EVENT(printk("tx_dle_intr: enque skb = 0x%x\n", (u32)skb);)
             if (++dle == iadev->tx_dle_q.end)
                  dle = iadev->tx_dle_q.start;
         }
@@ -1874,7 +1874,7 @@ static int open_tx(struct atm_vcc *vcc) 
            printk("iadev:  Non UBR, ABR and CBR traffic not supportedn"); 
         
         iadev->testTable[vcc->vci]->vc_status |= VC_ACTIVE;
-	IF_EVENT(printk("ia open_tx returning \n");)  
+	IF_EVENT(printk("ia open_tx returning\n");)  
 	return 0;  
 }  
   
@@ -2044,7 +2044,7 @@ static int tx_init(struct atm_dev *dev) 
                                    readw(iadev->seg_reg+CBR_PTR_BASE));)
         tmp16 = (CBR_SCHED_TABLE*iadev->memSize) >> 1;
         writew(tmp16, iadev->seg_reg+CBR_TAB_BEG);
-        IF_INIT(printk("cbr_tab_beg = 0x%x in reg = 0x%x \n", tmp16,
+        IF_INIT(printk("cbr_tab_beg = 0x%x in reg = 0x%x\n", tmp16,
                                         readw(iadev->seg_reg+CBR_TAB_BEG));)
         writew(tmp16, iadev->seg_reg+CBR_TAB_END+1); // CBR_PTR;
         tmp16 = (CBR_SCHED_TABLE*iadev->memSize + iadev->num_vc*6 - 2) >> 1;
@@ -2223,7 +2223,7 @@ static irqreturn_t ia_int(int irq, void 
 	if (status & STAT_SEGINT)  
 	{  
 	   /* do something */ 
-           IF_EVENT(printk("IA: tx_intr \n");) 
+           IF_EVENT(printk("IA: tx_intr\n");) 
 	   tx_intr(dev);  
 	}  
 	if (status & STAT_DLETINT)  
@@ -2375,7 +2375,7 @@ static int __init ia_init(struct atm_dev
 	iadev->reass_ram = base + ACTUAL_REASS_RAM_BASE;  
   
 	/* lets print out the above */  
-	IF_INIT(printk("Base addrs: %p %p %p \n %p %p %p %p\n", 
+	IF_INIT(printk("Base addrs: %p %p %p\n %p %p %p %p\n", 
           iadev->reg,iadev->seg_reg,iadev->reass_reg, 
           iadev->phy, iadev->ram, iadev->seg_ram, 
           iadev->reass_ram);) 
@@ -3050,12 +3050,12 @@ static int ia_pkt_tx (struct atm_vcc *vc
         if (atomic_read(&vcc->stats->tx) % 20 == 0) {
           if (iavcc->vc_desc_cnt > 10) {
              vcc->tx_quota =  vcc->tx_quota * 3 / 4;
-            printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
+            printk("Tx1:  vcc->tx_quota = %d\n", (u32)vcc->tx_quota );
               iavcc->flow_inc = -1;
               iavcc->saved_tx_quota = vcc->tx_quota;
            } else if ((iavcc->flow_inc < 0) && (iavcc->vc_desc_cnt < 3)) {
              // vcc->tx_quota = 3 * iavcc->saved_tx_quota / 4;
-             printk("Tx2:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 
+             printk("Tx2:  vcc->tx_quota = %d\n", (u32)vcc->tx_quota ); 
               iavcc->flow_inc = 0;
            }
         }
@@ -3125,7 +3125,7 @@ static int ia_proc_read(struct atm_dev *
         n += sprintf(tmpPtr, "-4KVC-");  
      tmpPtr = page + n; 
      if ((iadev->memType & MEM_SIZE_MASK) == MEM_SIZE_1M)
-        n += sprintf(tmpPtr, "1M  \n");
+        n += sprintf(tmpPtr, "1M\n");
      else if ((iadev->memType & MEM_SIZE_MASK) == MEM_SIZE_512K)
         n += sprintf(tmpPtr, "512K\n");
      else
@@ -3195,7 +3195,7 @@ static int __devinit ia_init_one(struct 
 	}
 	dev->dev_data = iadev;
 	IF_INIT(printk(DEV_LABEL "registered at (itf :%d)\n", dev->number);)
-	IF_INIT(printk("dev_id = 0x%x iadev->LineRate = %d \n", (u32)dev,
+	IF_INIT(printk("dev_id = 0x%x iadev->LineRate = %d\n", (u32)dev,
 		iadev->LineRate);)
 
 	ia_dev[iadev_count] = iadev;
Index: linux-kj/drivers/atm/nicstar.c
===================================================================
--- linux-kj.orig/drivers/atm/nicstar.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/drivers/atm/nicstar.c	2005-09-21 01:35:53.000000000 +0400
@@ -1400,7 +1400,7 @@ static int ns_open(struct atm_vcc *vcc)
    int vci = vcc->vci;
 
    card = (ns_dev *) vcc->dev->dev_data;
-   PRINTK("nicstar%d: opening vpi.vci %d.%d \n", card->index, (int) vpi, vci);
+   PRINTK("nicstar%d: opening vpi.vci %d.%d\n", card->index, (int) vpi, vci);
    if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0)
    {
       PRINTK("nicstar%d: unsupported AAL.\n", card->index);
@@ -1438,7 +1438,7 @@ static int ns_open(struct atm_vcc *vcc)
          if (vcc->qos.txtp.max_pcr == 0 && vcc->qos.txtp.pcr == 0 &&
              vcc->qos.txtp.min_pcr == 0)
          {
-            PRINTK("nicstar%d: trying to open a CBR vc with cell rate = 0 \n",
+            PRINTK("nicstar%d: trying to open a CBR vc with cell rate = 0\n",
 	           card->index);
 	    clear_bit(ATM_VF_PARTIAL,&vcc->flags);
 	    clear_bit(ATM_VF_ADDR,&vcc->flags);
@@ -1576,7 +1576,7 @@ static void ns_close(struct atm_vcc *vcc
    
    vc = vcc->dev_data;
    card = vcc->dev->dev_data;
-   PRINTK("nicstar%d: closing vpi.vci %d.%d \n", card->index,
+   PRINTK("nicstar%d: closing vpi.vci %d.%d\n", card->index,
           (int) vcc->vpi, vcc->vci);
 
    clear_bit(ATM_VF_READY,&vcc->flags);
@@ -1715,19 +1715,19 @@ static void ns_close(struct atm_vcc *vcc
       u32 stat, cfg;
       stat = readl(card->membase + STAT);
       cfg = readl(card->membase + CFG);
-      printk("STAT = 0x%08X  CFG = 0x%08X  \n", stat, cfg);
-      printk("TSQ: base = 0x%08X  next = 0x%08X  last = 0x%08X  TSQT = 0x%08X \n",
+      printk("STAT = 0x%08X  CFG = 0x%08X\n", stat, cfg);
+      printk("TSQ: base = 0x%08X  next = 0x%08X  last = 0x%08X  TSQT = 0x%08X\n",
              (u32) card->tsq.base, (u32) card->tsq.next,(u32) card->tsq.last,
 	     readl(card->membase + TSQT));
-      printk("RSQ: base = 0x%08X  next = 0x%08X  last = 0x%08X  RSQT = 0x%08X \n",
+      printk("RSQ: base = 0x%08X  next = 0x%08X  last = 0x%08X  RSQT = 0x%08X\n",
              (u32) card->rsq.base, (u32) card->rsq.next,(u32) card->rsq.last,
 	     readl(card->membase + RSQT));
-      printk("Empty free buffer queue interrupt %s \n",
+      printk("Empty free buffer queue interrupt %s\n",
              card->efbie ? "enabled" : "disabled");
-      printk("SBCNT = %d  count = %d   LBCNT = %d count = %d \n",
+      printk("SBCNT = %d  count = %d   LBCNT = %d count = %d\n",
              ns_stat_sfbqc_get(stat), card->sbpool.count,
 	     ns_stat_lfbqc_get(stat), card->lbpool.count);
-      printk("hbpool.count = %d  iovpool.count = %d \n",
+      printk("hbpool.count = %d  iovpool.count = %d\n",
              card->hbpool.count, card->iovpool.count);
    }
 #endif /* RX_DEBUG */
@@ -1756,7 +1756,7 @@ static void fill_tst(ns_dev *card, int n
          break;
    }
    if (e == NS_TST_NUM_ENTRIES) {
-      printk("nicstar%d: No free TST entries found. \n", card->index);
+      printk("nicstar%d: No free TST entries found.\n", card->index);
       return;
    }
 
@@ -2697,25 +2697,25 @@ static int ns_proc_read(struct atm_dev *
    card = (ns_dev *) dev->dev_data;
    stat = readl(card->membase + STAT);
    if (!left--)
-      return sprintf(page, "Pool   count    min   init    max \n");
+      return sprintf(page, "Pool   count    min   init    max\n");
    if (!left--)
-      return sprintf(page, "Small  %5d  %5d  %5d  %5d \n",
+      return sprintf(page, "Small  %5d  %5d  %5d  %5d\n",
                      ns_stat_sfbqc_get(stat), card->sbnr.min, card->sbnr.init,
 		     card->sbnr.max);
    if (!left--)
-      return sprintf(page, "Large  %5d  %5d  %5d  %5d \n",
+      return sprintf(page, "Large  %5d  %5d  %5d  %5d\n",
                      ns_stat_lfbqc_get(stat), card->lbnr.min, card->lbnr.init,
 		     card->lbnr.max);
    if (!left--)
-      return sprintf(page, "Huge   %5d  %5d  %5d  %5d \n", card->hbpool.count,
+      return sprintf(page, "Huge   %5d  %5d  %5d  %5d\n", card->hbpool.count,
                      card->hbnr.min, card->hbnr.init, card->hbnr.max);
    if (!left--)
-      return sprintf(page, "Iovec  %5d  %5d  %5d  %5d \n", card->iovpool.count,
+      return sprintf(page, "Iovec  %5d  %5d  %5d  %5d\n", card->iovpool.count,
                      card->iovnr.min, card->iovnr.init, card->iovnr.max);
    if (!left--)
    {
       int retval;
-      retval = sprintf(page, "Interrupt counter: %u \n", card->intcnt);
+      retval = sprintf(page, "Interrupt counter: %u\n", card->intcnt);
       card->intcnt = 0;
       return retval;
    }
@@ -2736,7 +2736,7 @@ static int ns_proc_read(struct atm_dev *
          phy_regs[i] = readl(card->membase + DR0) & 0x000000FF;
       }
 
-      return sprintf(page, "PHY regs: 0x%02X 0x%02X 0x%02X 0x%02X \n",
+      return sprintf(page, "PHY regs: 0x%02X 0x%02X 0x%02X 0x%02X\n",
                      phy_regs[0], phy_regs[1], phy_regs[2], phy_regs[3]);
    }
 #endif /* 0 - Dump 25.6 Mbps PHY registers */
@@ -2745,9 +2745,9 @@ static int ns_proc_read(struct atm_dev *
    if (left-- < NS_TST_NUM_ENTRIES)
    {
       if (card->tste2vc[left + 1] == NULL)
-         return sprintf(page, "%5d - VBR/UBR \n", left + 1);
+         return sprintf(page, "%5d - VBR/UBR\n", left + 1);
       else
-         return sprintf(page, "%5d - %d %d \n", left + 1,
+         return sprintf(page, "%5d - %d %d\n", left + 1,
                         card->tste2vc[left + 1]->tx_vcc->vpi,
                         card->tste2vc[left + 1]->tx_vcc->vci);
    }
@@ -2967,7 +2967,7 @@ static int ns_ioctl(struct atm_dev *dev,
             return dev->phy->ioctl(dev, cmd, arg);
          }
          else {
-            printk("nicstar%d: %s == NULL \n", card->index,
+            printk("nicstar%d: %s == NULL\n", card->index,
                    dev->phy ? "dev->phy->ioctl" : "dev->phy");
             return -ENOIOCTLCMD;
          }
Index: linux-kj/drivers/block/cciss.c
===================================================================
--- linux-kj.orig/drivers/block/cciss.c	2005-09-21 01:19:22.000000000 +0400
+++ linux-kj/drivers/block/cciss.c	2005-09-21 01:35:53.000000000 +0400
@@ -1681,7 +1681,7 @@ resend_cmd2:
 			break;
 			case CMD_PROTOCOL_ERR:
                                 printk(KERN_WARNING "cciss: cmd %p has "
-					"protocol error \n", c);
+					"protocol error\n", c);
                                 return_status = IO_ERROR;
                         break;
 case CMD_HARDWARE_ERR:
@@ -1984,7 +1984,7 @@ resend_cmd1:
 					}
 				}
 				printk(KERN_WARNING "ciss ciss%d: sendcmd"
-				" Error %x \n", ctlr, 
+				" Error %x\n", ctlr, 
 					c->err_info->CommandStatus); 
 				printk(KERN_WARNING "ciss ciss%d: sendcmd"
 				" offensive info\n"
@@ -2151,7 +2151,7 @@ static inline void complete_command( ctl
 			break;
 			case CMD_PROTOCOL_ERR:
                                 printk(KERN_WARNING "cciss: cmd %p has "
-					"protocol error \n", cmd);
+					"protocol error\n", cmd);
                                 status = 0;
                         break;
 			case CMD_HARDWARE_ERR:
@@ -3067,7 +3067,7 @@ static void __devexit cciss_remove_one (
 
 	if (pci_get_drvdata(pdev) == NULL)
 	{
-		printk( KERN_ERR "cciss: Unable to remove device \n");
+		printk( KERN_ERR "cciss: Unable to remove device\n");
 		return;
 	}
 	tmp_ptr = pci_get_drvdata(pdev);
@@ -3075,7 +3075,7 @@ static void __devexit cciss_remove_one (
 	if (hba[i] == NULL) 
 	{
 		printk(KERN_ERR "cciss: device appears to "
-			"already be removed \n");
+			"already be removed\n");
 		return;
 	}
 	/* Turn board interrupts off  and send the flush cache command */
Index: linux-kj/drivers/block/cciss_scsi.c
===================================================================
--- linux-kj.orig/drivers/block/cciss_scsi.c	2005-09-21 01:19:22.000000000 +0400
+++ linux-kj/drivers/block/cciss_scsi.c	2005-09-21 01:35:53.000000000 +0400
@@ -641,7 +641,7 @@ complete_scsi_command( CommandList_struc
 			break;
 			case CMD_PROTOCOL_ERR:
                                 printk(KERN_WARNING "cciss: cp %p has "
-					"protocol error \n", cp);
+					"protocol error\n", cp);
                         break;
 			case CMD_HARDWARE_ERR:
 				cmd->result = DID_ERROR << 16;
@@ -842,7 +842,7 @@ cciss_scsi_interpret_error(CommandList_s
 		break;
 		case CMD_PROTOCOL_ERR:
 			printk(KERN_WARNING "cciss: cp %p has "
-				"protocol error \n", cp);
+				"protocol error\n", cp);
 		break;
 		case CMD_HARDWARE_ERR:
 			/* cmd->result = DID_ERROR << 16; */
Index: linux-kj/drivers/block/cpqarray.c
===================================================================
--- linux-kj.orig/drivers/block/cpqarray.c	2005-09-21 01:24:36.000000000 +0400
+++ linux-kj/drivers/block/cpqarray.c	2005-09-21 01:35:53.000000000 +0400
@@ -359,7 +359,7 @@ static void __devexit cpqarray_remove_on
 	ctlr_info_t *tmp_ptr;
 
 	if (pci_get_drvdata(pdev) == NULL) {
-		printk( KERN_ERR "cpqarray: Unable to remove device \n");
+		printk( KERN_ERR "cpqarray: Unable to remove device\n");
 		return;
 	}
 
@@ -367,7 +367,7 @@ static void __devexit cpqarray_remove_on
 	i = tmp_ptr->ctlr;
 	if (hba[i] == NULL) {
 		printk(KERN_ERR "cpqarray: controller %d appears to have"
-			"already been removed \n", i);
+			"already been removed\n", i);
 		return;
         }
 	pci_set_drvdata(pdev, NULL);
@@ -382,7 +382,7 @@ static void __devexit cpqarray_remove_on
 {
 	if (hba[i] == NULL) {
 		printk(KERN_ERR "cpqarray: controller %d appears to have"
-			"already been removed \n", i);
+			"already been removed\n", i);
 		return;
         }
 	cpqarray_remove_one(i);
Index: linux-kj/drivers/block/paride/pt.c
===================================================================
--- linux-kj.orig/drivers/block/paride/pt.c	2005-09-21 01:19:22.000000000 +0400
+++ linux-kj/drivers/block/paride/pt.c	2005-09-21 01:35:53.000000000 +0400
@@ -909,7 +909,7 @@ static ssize_t pt_write(struct file *fil
 			p = (read_reg(pi, 2) & 3);
 			if (p != 0) {
 				pi_disconnect(pi);
-				printk("%s: Phase error on write: %d \n",
+				printk("%s: Phase error on write: %d\n",
 				       tape->name, p);
 				return -EIO;
 			}
Index: linux-kj/drivers/cdrom/aztcd.c
===================================================================
--- linux-kj.orig/drivers/cdrom/aztcd.c	2005-09-21 01:19:23.000000000 +0400
+++ linux-kj/drivers/cdrom/aztcd.c	2005-09-21 01:35:53.000000000 +0400
@@ -500,7 +500,7 @@ static int aztSendCmd(int cmd)
 		}
 	}
 	if (retry >= AZT_RETRY_ATTEMPTS) {
-		printk("### Error 2 aztcd: aztSendCmd %x \n", cmd);
+		printk("### Error 2 aztcd: aztSendCmd %x\n", cmd);
 		azt_error = 0xA5;
 	}
 	RETURNM("aztSendCmd", -1);
Index: linux-kj/drivers/cdrom/mcdx.c
===================================================================
--- linux-kj.orig/drivers/cdrom/mcdx.c	2005-09-21 01:23:50.000000000 +0400
+++ linux-kj/drivers/cdrom/mcdx.c	2005-09-21 01:35:53.000000000 +0400
@@ -958,7 +958,7 @@ static int mcdx_talk(struct s_drive_stuf
 
 		/* command error? */
 		if (e_cmderr(st)) {
-			xwarn("command error cmd = %02x %s \n",
+			xwarn("command error cmd = %02x %s\n",
 			      cmd[0], cmdlen > 1 ? "..." : "");
 			st = -1;
 			continue;
@@ -1264,7 +1264,7 @@ static int __init mcdx_init_drive(int dr
 static int __init mcdx_init(void)
 {
 	int drive;
-	xwarn("Version 2.14(hs) \n");
+	xwarn("Version 2.14(hs)\n");
 
 	xwarn("$Id: mcdx.c,v 1.21 1997/01/26 07:12:59 davem Exp $\n");
 
Index: linux-kj/drivers/char/ip2main.c
===================================================================
--- linux-kj.orig/drivers/char/ip2main.c	2005-09-21 01:19:13.000000000 +0400
+++ linux-kj/drivers/char/ip2main.c	2005-09-21 01:35:53.000000000 +0400
@@ -627,7 +627,7 @@ ip2_loadmain(int *iop, int *irqp, unsign
 					if (status == PCIBIOS_DEVICE_NOT_FOUND) {
 						printk( KERN_ERR "IP2: PCI board %d not found\n", i );
 					} else {
-						printk( KERN_ERR "IP2: PCI error 0x%x \n", status );
+						printk( KERN_ERR "IP2: PCI error 0x%x\n", status );
 					}
 				} 
 			}
Index: linux-kj/drivers/char/ipmi/ipmi_bt_sm.c
===================================================================
--- linux-kj.orig/drivers/char/ipmi/ipmi_bt_sm.c	2005-09-21 01:19:11.000000000 +0400
+++ linux-kj/drivers/char/ipmi/ipmi_bt_sm.c	2005-09-21 01:35:53.000000000 +0400
@@ -361,7 +361,7 @@ static enum si_sm_result bt_event(struct
 	bt->nonzero_status |= status;
 
 	if ((bt_debug & BT_DEBUG_STATES) && (bt->state != bt->last_state))
-		printk(KERN_WARNING "BT: %s %s TO=%ld - %ld \n",
+		printk(KERN_WARNING "BT: %s %s TO=%ld - %ld\n",
 			STATE2TXT,
 			STATUS2TXT(buf),
 			bt->timeout,
Index: linux-kj/drivers/char/rio/rioboot.c
===================================================================
--- linux-kj.orig/drivers/char/rio/rioboot.c	2005-09-21 01:19:10.000000000 +0400
+++ linux-kj/drivers/char/rio/rioboot.c	2005-09-21 01:35:53.000000000 +0400
@@ -626,7 +626,7 @@ register struct DownLoad *rbp;
 			}
 		}
 
-		rio_dprintk (RIO_DEBUG_BOOT, "Set the card running... \n");
+		rio_dprintk (RIO_DEBUG_BOOT, "Set the card running...\n");
 		/*
 		** last thing - show the world that everything is in place
 		*/
Index: linux-kj/drivers/char/rio/rioinit.c
===================================================================
--- linux-kj.orig/drivers/char/rio/rioinit.c	2005-09-21 01:19:10.000000000 +0400
+++ linux-kj/drivers/char/rio/rioinit.c	2005-09-21 01:35:53.000000000 +0400
@@ -760,7 +760,7 @@ int RIOEISAinit( int Mode )
 		/*
 		** Tell the memory mapper that we want to talk to it
 		*/
-		rio_dprintk (RIO_DEBUG_INIT, "About to map EISA card \n");
+		rio_dprintk (RIO_DEBUG_INIT, "About to map EISA card\n");
 
 		if (RIOMapin( Paddr, RIO_EISA_MEM_SIZE, &Caddr) == -1) {
 		rio_dprintk (RIO_DEBUG_INIT, "Couldn't map %d bytes at %x\n",
Index: linux-kj/drivers/char/rio/riointr.c
===================================================================
--- linux-kj.orig/drivers/char/rio/riointr.c	2005-09-21 01:19:10.000000000 +0400
+++ linux-kj/drivers/char/rio/riointr.c	2005-09-21 01:35:53.000000000 +0400
@@ -586,7 +586,7 @@ struct Port *		PortP;
 
   TtyP = PortP->gs.tty;
   if (!TtyP) {
-    rio_dprintk (RIO_DEBUG_INTR, "RIOReceive: tty is null. \n");
+    rio_dprintk (RIO_DEBUG_INTR, "RIOReceive: tty is null.\n");
     return;
   }
 
Index: linux-kj/drivers/char/rio/riotty.c
===================================================================
--- linux-kj.orig/drivers/char/rio/riotty.c	2005-09-21 01:19:11.000000000 +0400
+++ linux-kj/drivers/char/rio/riotty.c	2005-09-21 01:35:53.000000000 +0400
@@ -240,7 +240,7 @@ riotopen(struct tty_struct * tty, struct
 			rio_dprintk (RIO_DEBUG_TTY, "Waiting for RTA to boot\n");
 			do {
 				if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-					rio_dprintk (RIO_DEBUG_TTY, "RTA EINTR in delay \n");
+					rio_dprintk (RIO_DEBUG_TTY, "RTA EINTR in delay\n");
 					func_exit ();
 					return -EINTR;
 				}
@@ -265,7 +265,7 @@ riotopen(struct tty_struct * tty, struct
            easier to read and shorter. Now, if it works too that would
 	   be great... -- REW 
 	*/
-	rio_dprintk (RIO_DEBUG_TTY, "Checking if RTA has booted... \n");
+	rio_dprintk (RIO_DEBUG_TTY, "Checking if RTA has booted...\n");
 	while (!(PortP->HostP->Mapping[PortP->RupNum].Flags & RTA_BOOTED)) {
 	  if (!PortP->WaitUntilBooted) {
 	    rio_dprintk (RIO_DEBUG_TTY, "RTA never booted\n");
@@ -278,7 +278,7 @@ riotopen(struct tty_struct * tty, struct
 	     now. --REW 
 	  */
 	  if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-	    rio_dprintk (RIO_DEBUG_TTY, "RTA_wait_for_boot: EINTR in delay \n");
+	    rio_dprintk (RIO_DEBUG_TTY, "RTA_wait_for_boot: EINTR in delay\n");
 	    func_exit ();
 	    return -EINTR;
 	  }
@@ -626,7 +626,7 @@ riotclose(void  *ptr)
 		rio_dprintk (RIO_DEBUG_TTY, "Calling timeout to flush in closing\n");
 		rio_spin_unlock_irqrestore(&PortP->portSem, flags);
 		if (RIODelay_ni(PortP, HUNDRED_MS*10) == RIO_FAIL) {
-			rio_dprintk (RIO_DEBUG_TTY, "RTA EINTR in delay \n");
+			rio_dprintk (RIO_DEBUG_TTY, "RTA EINTR in delay\n");
 			rv = -EINTR;
 			rio_spin_lock_irqsave(&PortP->portSem, flags);
 			goto close_end;
@@ -680,7 +680,7 @@ riotclose(void  *ptr)
 			goto close_end;
 		}
 		if (RIODelay(PortP, HUNDRED_MS) == RIO_FAIL) {
-			rio_dprintk (RIO_DEBUG_TTY, "RTA EINTR in delay \n");
+			rio_dprintk (RIO_DEBUG_TTY, "RTA EINTR in delay\n");
 			RIOPreemptiveCmd(p, PortP,FCLOSE);
 			break;
 		}
Index: linux-kj/drivers/char/rocket.c
===================================================================
--- linux-kj.orig/drivers/char/rocket.c	2005-09-21 01:19:12.000000000 +0400
+++ linux-kj/drivers/char/rocket.c	2005-09-21 01:35:53.000000000 +0400
@@ -1899,7 +1899,7 @@ static __init int register_PCI(int i, st
 	ret = pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);
 
 	if (ret) {
-		printk(KERN_INFO "  Error during register_PCI(), unable to read config dword \n");
+		printk(KERN_INFO "  Error during register_PCI(), unable to read config dword\n");
 		return 0;
 	}
 
@@ -2420,7 +2420,7 @@ int __init rp_init(void)
 
 	/*  If an ISA card is configured, reserve the 4 byte IO space for the Mudbac controller */
 	if (controller && (!request_region(controller, 4, "Comtrol RocketPort"))) {
-		printk(KERN_INFO "Unable to reserve IO region for first configured ISA RocketPort controller 0x%lx.  Driver exiting \n", controller);
+		printk(KERN_INFO "Unable to reserve IO region for first configured ISA RocketPort controller 0x%lx.  Driver exiting\n", controller);
 		return -EBUSY;
 	}
 
Index: linux-kj/drivers/char/specialix.c
===================================================================
--- linux-kj.orig/drivers/char/specialix.c	2005-09-21 01:19:13.000000000 +0400
+++ linux-kj/drivers/char/specialix.c	2005-09-21 01:35:53.000000000 +0400
@@ -471,7 +471,7 @@ void missed_irq (unsigned long data)
 	                                             SRSR_MREQint);
 	spin_unlock_irqrestore(&bp->lock, flags);
 	if (irq) {
-		printk (KERN_INFO "Missed interrupt... Calling int from timer. \n");
+		printk (KERN_INFO "Missed interrupt... Calling int from timer.\n");
 		sx_interrupt (((struct specialix_board *)data)->irq, 
 		              (void*)data, NULL);
 	}
@@ -1145,7 +1145,7 @@ static void sx_change_speed(struct speci
 	/* Set baud rate for port */
 	tmp = port->custom_divisor ;
 	if ( tmp )
-		printk (KERN_INFO "sx%d: Using custom baud rate divisor %ld. \n"
+		printk (KERN_INFO "sx%d: Using custom baud rate divisor %ld.\n"
 		                  "This is an untested option, please be carefull.\n",
 		                  port_No (port), tmp);
 	else
@@ -1156,12 +1156,12 @@ static void sx_change_speed(struct speci
 		again = jiffies + HZ * 60;
 		/* Page 48 of version 2.0 of the CL-CD1865 databook */
 		if (tmp >= 12) {
-			printk (KERN_INFO "sx%d: Baud rate divisor is %ld. \n"
+			printk (KERN_INFO "sx%d: Baud rate divisor is %ld.\n"
 			        "Performance degradation is possible.\n"
 			        "Read specialix.txt for more info.\n",
 			        port_No (port), tmp);
 		} else {
-			printk (KERN_INFO "sx%d: Baud rate divisor is %ld. \n"
+			printk (KERN_INFO "sx%d: Baud rate divisor is %ld.\n"
 			        "Warning: overstressing Cirrus chip. "
 			        "This might not work.\n"
 			        "Read specialix.txt for more info.\n", 
Index: linux-kj/drivers/char/stallion.c
===================================================================
--- linux-kj.orig/drivers/char/stallion.c	2005-09-21 01:19:13.000000000 +0400
+++ linux-kj/drivers/char/stallion.c	2005-09-21 01:35:53.000000000 +0400
@@ -2272,7 +2272,7 @@ static inline int stl_initeio(stlbrd_t *
 				"address %x conflicts with another device\n",
 				brdp->brdnr, brdp->ioaddr2);
 			printk(KERN_WARNING "STALLION: Warning, also "
-				"releasing board %d I/O address %x \n", 
+				"releasing board %d I/O address %x\n", 
 				brdp->brdnr, brdp->ioaddr1);
 			release_region(brdp->ioaddr1, brdp->iosize1);
         		return(-EBUSY);
@@ -2468,7 +2468,7 @@ static inline int stl_initech(stlbrd_t *
 				"address %x conflicts with another device\n",
 				brdp->brdnr, brdp->ioaddr2);
 			printk(KERN_WARNING "STALLION: Warning, also "
-				"releasing board %d I/O address %x \n", 
+				"releasing board %d I/O address %x\n", 
 				brdp->brdnr, brdp->ioaddr1);
 			release_region(brdp->ioaddr1, brdp->iosize1);
 			return(-EBUSY);
Index: linux-kj/drivers/char/sx.c
===================================================================
--- linux-kj.orig/drivers/char/sx.c	2005-09-21 01:19:11.000000000 +0400
+++ linux-kj/drivers/char/sx.c	2005-09-21 01:35:53.000000000 +0400
@@ -1038,7 +1038,7 @@ static void sx_transmit_chars (struct sx
 		if (c > SERIAL_XMIT_SIZE - port->gs.xmit_tail) 
 			c = SERIAL_XMIT_SIZE - port->gs.xmit_tail;
 
-		sx_dprintk (SX_DEBUG_TRANSMIT, " %d(%ld) \n", 
+		sx_dprintk (SX_DEBUG_TRANSMIT, " %d(%ld)\n", 
 		            c, SERIAL_XMIT_SIZE- port->gs.xmit_tail);
 
 		/* If for one reason or another, we can't copy more data, we're done! */
@@ -1281,7 +1281,7 @@ static irqreturn_t sx_interrupt (int irq
 		if (port->gs.flags & GS_ACTIVE) {
 			if (sx_read_channel_byte (port, hi_state)) {
 				sx_dprintk (SX_DEBUG_INTERRUPTS, 
-				            "Port %d: modem signal change?... \n", i);
+				            "Port %d: modem signal change?...\n", i);
 				sx_check_modem_signals (port); 
 			}
 			if (port->gs.xmit_cnt) {
@@ -2058,7 +2058,7 @@ static void printheader(void)
 
 	if (!header_printed) {
 		printk (KERN_INFO "Specialix SX driver "
-		        "(C) 1998/1999 R.E.Wolff@BitWizard.nl \n");
+		        "(C) 1998/1999 R.E.Wolff@BitWizard.nl\n");
 		printk (KERN_INFO "sx: version %s\n", RCS_ID);
 		header_printed = 1;
 	}
Index: linux-kj/drivers/char/tpm/tpm.c
===================================================================
--- linux-kj.orig/drivers/char/tpm/tpm.c	2005-09-21 01:19:11.000000000 +0400
+++ linux-kj/drivers/char/tpm/tpm.c	2005-09-21 01:35:53.000000000 +0400
@@ -65,7 +65,7 @@ static ssize_t tpm_transmit(struct tpm_c
 		return -ENODATA;
 	if (count > bufsiz) {
 		dev_err(&chip->pci_dev->dev,
-			"invalid count value %x %zx \n", count, bufsiz);
+			"invalid count value %x %zx\n", count, bufsiz);
 		return -E2BIG;
 	}
 
Index: linux-kj/drivers/ide/ide-cd.c
===================================================================
--- linux-kj.orig/drivers/ide/ide-cd.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/ide/ide-cd.c	2005-09-21 01:35:53.000000000 +0400
@@ -504,7 +504,7 @@ void cdrom_analyze_sense_data(ide_drive_
 					lo = mid+1;
 			}
 
-			printk (KERN_ERR "  The failed \"%s\" packet command was: \n  \"", s);
+			printk (KERN_ERR "  The failed \"%s\" packet command was:\n  \"", s);
 			for (i=0; i<sizeof (failed_command->cmd); i++)
 				printk ("%02x ", failed_command->cmd[i]);
 			printk ("\"\n");
Index: linux-kj/drivers/ide/pci/sc1200.c
===================================================================
--- linux-kj.orig/drivers/ide/pci/sc1200.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/ide/pci/sc1200.c	2005-09-21 01:35:53.000000000 +0400
@@ -228,7 +228,7 @@ static int sc1200_config_dma2 (ide_drive
 	}
 
 	if (timings == 0) {
-		printk("%s: sc1200_config_dma: huh? mode=%02x clk=%x \n", drive->name, mode, pci_clock);
+		printk("%s: sc1200_config_dma: huh? mode=%02x clk=%x\n", drive->name, mode, pci_clock);
 		return 1;	/* failure */
 	}
 
Index: linux-kj/drivers/ide/pci/sis5513.c
===================================================================
--- linux-kj.orig/drivers/ide/pci/sis5513.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/ide/pci/sis5513.c	2005-09-21 01:35:53.000000000 +0400
@@ -380,18 +380,18 @@ static int sis_get_info (char *buffer, c
 			     (reg & 0x04) ? "On" : "Off",
 			     (reg & 0x02) ? "On" : "Off");
 	} else if (chipset_family < ATA_133) {
-		p += sprintf(p, "%s \t \t \t \t %s \n",
+		p += sprintf(p, "%s \t \t \t \t %s\n",
 			     (reg & 0x02) ? "On" : "Off",
 			     (reg & 0x04) ? "On" : "Off");
 	} else { /* ATA_133 */
-		p += sprintf(p, "%s \t \t \t \t %s \n",
+		p += sprintf(p, "%s \t \t \t \t %s\n",
 			     (reg2 & 0x02) ? "On" : "Off",
 			     (reg3 & 0x02) ? "On" : "Off");
 	}
 
 /* Operation Mode */
 	pci_read_config_byte(bmide_dev, 0x09, &reg);
-	p += sprintf(p, "Operation Mode: %s \t \t \t %s \n",
+	p += sprintf(p, "Operation Mode: %s \t \t \t %s\n",
 		     (reg & 0x01) ? "Native" : "Compatible",
 		     (reg & 0x04) ? "Native" : "Compatible");
 
Index: linux-kj/drivers/ieee1394/raw1394.c
===================================================================
--- linux-kj.orig/drivers/ieee1394/raw1394.c	2005-09-21 01:19:31.000000000 +0400
+++ linux-kj/drivers/ieee1394/raw1394.c	2005-09-21 01:35:53.000000000 +0400
@@ -1757,7 +1757,7 @@ static int arm_register(struct file_info
 		/* INSERT ENTRY */
 		list_add_tail(&addr->addr_list, &fi->addr_list);
 	} else {
-		DBGMSG("arm_register failed errno: %d \n", retval);
+		DBGMSG("arm_register failed errno: %d\n", retval);
 		vfree(addr->addr_space_buffer);
 		kfree(addr);
 		spin_unlock_irqrestore(&host_info_lock, flags);
@@ -2780,7 +2780,7 @@ static int raw1394_release(struct inode 
 	spin_unlock_irq(&host_info_lock);
 	if (fail > 0) {
 		printk(KERN_ERR "raw1394: during addr_list-release "
-		       "error(s) occurred \n");
+		       "error(s) occurred\n");
 	}
 
 	while (!done) {
Index: linux-kj/drivers/input/serio/hil_mlc.c
===================================================================
--- linux-kj.orig/drivers/input/serio/hil_mlc.c	2005-09-21 01:19:23.000000000 +0400
+++ linux-kj/drivers/input/serio/hil_mlc.c	2005-09-21 01:35:53.000000000 +0400
@@ -575,7 +575,7 @@ static int hilse_donode (hil_mlc *mlc) {
 
 #ifdef HIL_MLC_DEBUG
 	if (mlc->seidx && (mlc->seidx != seidx)  && mlc->seidx != 41 && mlc->seidx != 42 && mlc->seidx != 43) {
-	  printk(KERN_DEBUG PREFIX "z%i \n%s {%i}", doze, kick ? "K" : "", mlc->seidx);
+	  printk(KERN_DEBUG PREFIX "z%i\n%s {%i}", doze, kick ? "K" : "", mlc->seidx);
 		doze = 0;
 	}
 	kick = 0;
Index: linux-kj/drivers/isdn/divert/divert_init.c
===================================================================
--- linux-kj.orig/drivers/isdn/divert/divert_init.c	2005-09-21 01:19:15.000000000 +0400
+++ linux-kj/drivers/isdn/divert/divert_init.c	2005-09-21 01:35:53.000000000 +0400
@@ -75,7 +75,7 @@ static void __exit divert_exit(void)
   spin_unlock_irqrestore(&divert_lock, flags);
   deleterule(-1); /* delete all rules and free mem */
   deleteprocs();
-  printk(KERN_INFO "dss1_divert module successfully removed \n");
+  printk(KERN_INFO "dss1_divert module successfully removed\n");
 }
 
 module_init(divert_init);
Index: linux-kj/drivers/isdn/hardware/eicon/divamnt.c
===================================================================
--- linux-kj.orig/drivers/isdn/hardware/eicon/divamnt.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/isdn/hardware/eicon/divamnt.c	2005-09-21 01:35:53.000000000 +0400
@@ -218,7 +218,7 @@ static int DIVA_INIT_FUNCTION maint_init
 	printk(KERN_INFO "%s\n", DRIVERNAME);
 	printk(KERN_INFO "%s: Rel:%s  Rev:", DRIVERLNAME, DRIVERRELEASE_MNT);
 	strcpy(tmprev, main_revision);
-	printk("%s  Build: %s \n", getrev(tmprev), DIVA_BUILD);
+	printk("%s  Build: %s\n", getrev(tmprev), DIVA_BUILD);
 
 	if (!divas_maint_register_chrdev()) {
 		ret = -EIO;
Index: linux-kj/drivers/isdn/hisax/hfc_usb.c
===================================================================
--- linux-kj.orig/drivers/isdn/hisax/hfc_usb.c	2005-09-21 01:19:15.000000000 +0400
+++ linux-kj/drivers/isdn/hisax/hfc_usb.c	2005-09-21 01:35:53.000000000 +0400
@@ -762,7 +762,7 @@ tx_iso_complete(struct urb *urb, struct 
 		errcode = usb_submit_urb(urb, GFP_ATOMIC);
 		if (errcode < 0) {
 			printk(KERN_INFO
-			       "HFC-S USB: error submitting ISO URB: %d \n",
+			       "HFC-S USB: error submitting ISO URB: %d\n",
 			       errcode);
 		}
 	} else {
@@ -799,7 +799,7 @@ rx_iso_complete(struct urb *urb, struct 
 	if (urb->status == -EOVERFLOW) {
 #ifdef CONFIG_HISAX_DEBUG
 		DBG(USB_DBG,
-		    "HFC-USB: ignoring USB DATAOVERRUN  for fifo  %i \n",
+		    "HFC-USB: ignoring USB DATAOVERRUN  for fifo  %i\n",
 		    fifon);
 #endif
 		status = 0;
@@ -863,7 +863,7 @@ rx_iso_complete(struct urb *urb, struct 
 		errcode = usb_submit_urb(urb, GFP_ATOMIC);
 		if (errcode < 0) {
 			printk(KERN_INFO
-			       "HFC-S USB: error submitting ISO URB: %d \n",
+			       "HFC-S USB: error submitting ISO URB: %d\n",
 			       errcode);
 		}
 	} else {
Index: linux-kj/drivers/isdn/hisax/q931.c
===================================================================
--- linux-kj.orig/drivers/isdn/hisax/q931.c	2005-09-21 01:19:15.000000000 +0400
+++ linux-kj/drivers/isdn/hisax/q931.c	2005-09-21 01:35:53.000000000 +0400
@@ -468,7 +468,7 @@ prcause(char *dest, u_char * p)
 	if (i == CVSIZE)
 		dp += sprintf(dp, "Unknown cause type %x!\n", cause);
 	else
-		dp += sprintf(dp, "  cause value %x : %s \n", cause, cvlist[i].edescr);
+		dp += sprintf(dp, "  cause value %x : %s\n", cause, cvlist[i].edescr);
 
 	while (!0) {
 		if (p > end)
@@ -547,7 +547,7 @@ prcause_1tr6(char *dest, u_char * p)
 	if (i == cause_1tr6_len)
 		dp += sprintf(dp, "Unknown cause type %x!\n", cause);
 	else
-		dp += sprintf(dp, "  cause value %x : %s \n", cause, cause_1tr6[i].descr);
+		dp += sprintf(dp, "  cause value %x : %s\n", cause, cause_1tr6[i].descr);
 
 	return (dp - dest);
 
Index: linux-kj/drivers/isdn/hysdn/hysdn_init.c
===================================================================
--- linux-kj.orig/drivers/isdn/hysdn/hysdn_init.c	2005-09-21 01:19:15.000000000 +0400
+++ linux-kj/drivers/isdn/hysdn/hysdn_init.c	2005-09-21 01:35:53.000000000 +0400
@@ -84,7 +84,7 @@ search_cards(void)
 			continue;
 
 		if (!(card = kmalloc(sizeof(hysdn_card), GFP_KERNEL))) {
-			printk(KERN_ERR "HYSDN: unable to alloc device mem \n");
+			printk(KERN_ERR "HYSDN: unable to alloc device mem\n");
 			return;
 		}
 		memset(card, 0, sizeof(hysdn_card));
@@ -202,7 +202,7 @@ hysdn_init(void)
 	strcpy(tmp, hysdn_init_revision);
 	printk(KERN_NOTICE "HYSDN: module Rev: %s loaded\n", hysdn_getrev(tmp));
 	strcpy(tmp, hysdn_net_revision);
-	printk(KERN_NOTICE "HYSDN: network interface Rev: %s \n", hysdn_getrev(tmp));
+	printk(KERN_NOTICE "HYSDN: network interface Rev: %s\n", hysdn_getrev(tmp));
 	search_cards();
 	printk(KERN_INFO "HYSDN: %d card(s) found.\n", cardmax);
 
Index: linux-kj/drivers/isdn/hysdn/hysdn_sched.c
===================================================================
--- linux-kj.orig/drivers/isdn/hysdn/hysdn_sched.c	2005-09-21 01:19:15.000000000 +0400
+++ linux-kj/drivers/isdn/hysdn/hysdn_sched.c	2005-09-21 01:35:53.000000000 +0400
@@ -55,7 +55,7 @@ hysdn_sched_rx(hysdn_card * card, uchar 
 			break;
 #endif /* CONFIG_HYSDN_CAPI */
 		default:
-			printk(KERN_INFO "irq message channel %d len %d unhandled \n", chan, len);
+			printk(KERN_INFO "irq message channel %d len %d unhandled\n", chan, len);
 			break;
 
 	}			/* switch rx channel */
Index: linux-kj/drivers/isdn/i4l/isdn_concap.c
===================================================================
--- linux-kj.orig/drivers/isdn/i4l/isdn_concap.c	2005-09-21 01:19:14.000000000 +0400
+++ linux-kj/drivers/isdn/i4l/isdn_concap.c	2005-09-21 01:35:53.000000000 +0400
@@ -45,7 +45,7 @@ static int isdn_concap_dl_data_req(struc
 	isdn_net_dev *nd = ((isdn_net_local *) ndev->priv)->netdev;
 	isdn_net_local *lp = isdn_net_get_locked_lp(nd);
 
-	IX25DEBUG( "isdn_concap_dl_data_req: %s \n", concap->net_dev->name);
+	IX25DEBUG( "isdn_concap_dl_data_req: %s\n", concap->net_dev->name);
 	if (!lp) {
 		IX25DEBUG( "isdn_concap_dl_data_req: %s : isdn_net_send_skb returned %d\n", concap -> net_dev -> name, 1);
 		return 1;
@@ -63,7 +63,7 @@ static int isdn_concap_dl_connect_req(st
 	struct net_device *ndev = concap -> net_dev;
 	isdn_net_local *lp = (isdn_net_local *) ndev->priv;
 	int ret;
-	IX25DEBUG( "isdn_concap_dl_connect_req: %s \n", ndev -> name);
+	IX25DEBUG( "isdn_concap_dl_connect_req: %s\n", ndev -> name);
 
 	/* dial ... */
 	ret = isdn_net_dial_req( lp );
@@ -73,7 +73,7 @@ static int isdn_concap_dl_connect_req(st
 
 static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
 {
-	IX25DEBUG( "isdn_concap_dl_disconn_req: %s \n", concap -> net_dev -> name);
+	IX25DEBUG( "isdn_concap_dl_disconn_req: %s\n", concap -> net_dev -> name);
 
 	isdn_net_hangup( concap -> net_dev );
 	return 0;
Index: linux-kj/drivers/isdn/i4l/isdn_tty.c
===================================================================
--- linux-kj.orig/drivers/isdn/i4l/isdn_tty.c	2005-09-21 01:19:14.000000000 +0400
+++ linux-kj/drivers/isdn/i4l/isdn_tty.c	2005-09-21 01:35:53.000000000 +0400
@@ -1643,7 +1643,7 @@ isdn_tty_open(struct tty_struct *tty, st
 	retval = isdn_tty_block_til_ready(tty, filp, info);
 	if (retval) {
 #ifdef ISDN_DEBUG_MODEM_OPEN
-		printk(KERN_DEBUG "isdn_tty_open return after isdn_tty_block_til_ready \n");
+		printk(KERN_DEBUG "isdn_tty_open return after isdn_tty_block_til_ready\n");
 #endif
 		module_put(info->owner);
 		return retval;
Index: linux-kj/drivers/isdn/i4l/isdn_ttyfax.c
===================================================================
--- linux-kj.orig/drivers/isdn/i4l/isdn_ttyfax.c	2005-09-21 01:19:15.000000000 +0400
+++ linux-kj/drivers/isdn/i4l/isdn_ttyfax.c	2005-09-21 01:35:53.000000000 +0400
@@ -564,7 +564,7 @@ isdn_tty_cmd_FCLASS2(char **p, modem_inf
 	if (!strncmp(p[0], "BUF?", 4)) {
 		p[0] += 4;
 #ifdef ISDN_TTY_FAX_STAT_DEBUG
-		printk(KERN_DEBUG "isdn_tty: Fax FBUF? (%d) \n", (16 * m->mdmreg[REG_PSIZE]));
+		printk(KERN_DEBUG "isdn_tty: Fax FBUF? (%d)\n", (16 * m->mdmreg[REG_PSIZE]));
 #endif
 		p[0]++;
 		sprintf(rs, "\r\n %d ", (16 * m->mdmreg[REG_PSIZE]));
Index: linux-kj/drivers/isdn/i4l/isdn_x25iface.c
===================================================================
--- linux-kj.orig/drivers/isdn/i4l/isdn_x25iface.c	2005-09-21 01:19:15.000000000 +0400
+++ linux-kj/drivers/isdn/i4l/isdn_x25iface.c	2005-09-21 01:35:53.000000000 +0400
@@ -113,7 +113,7 @@ static int isdn_x25iface_proto_close(str
 			"invalid concap_proto pointer\n" );
 		return -1;
 	}
-	IX25DEBUG( "isdn_x25iface_proto_close %s \n", MY_DEVNAME(cprot -> net_dev) );
+	IX25DEBUG( "isdn_x25iface_proto_close %s\n", MY_DEVNAME(cprot -> net_dev) );
 	spin_lock_irqsave(&cprot->lock, flags);
 	cprot -> dops    = NULL;
 	cprot -> net_dev = NULL;
@@ -133,7 +133,7 @@ static void isdn_x25iface_proto_del(stru
 
 	ix25_pdata_t * tmp;
  
-	IX25DEBUG( "isdn_x25iface_proto_del \n" );
+	IX25DEBUG( "isdn_x25iface_proto_del\n" );
 	if( ! cprot ){
 		printk( KERN_ERR "isdn_x25iface_proto_del: "
 			"concap_proto pointer is NULL\n" );
@@ -165,7 +165,7 @@ static int isdn_x25iface_proto_restart(s
 	ix25_pdata_t * pda = cprot -> proto_data ;
 	ulong flags;
 
-	IX25DEBUG( "isdn_x25iface_proto_restart %s \n", MY_DEVNAME(ndev) );
+	IX25DEBUG( "isdn_x25iface_proto_restart %s\n", MY_DEVNAME(ndev) );
 
 	if ( pdata_is_bad( pda ) ) return -1;
 
@@ -189,7 +189,7 @@ static int isdn_x25iface_proto_restart(s
  */
 static int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb)
 {
-  	IX25DEBUG( "isdn_x25iface_receive %s \n", MY_DEVNAME(cprot->net_dev) );
+  	IX25DEBUG( "isdn_x25iface_receive %s\n", MY_DEVNAME(cprot->net_dev) );
 	if ( ( (ix25_pdata_t*) (cprot->proto_data) ) 
 	     -> state == WAN_CONNECTED ){
 		if( skb_push(skb, 1)){
@@ -211,7 +211,7 @@ static int isdn_x25iface_connect_ind(str
 	struct sk_buff * skb = dev_alloc_skb(1);
 	enum wan_states *state_p 
 	  = &( ( (ix25_pdata_t*) (cprot->proto_data) ) -> state);
-	IX25DEBUG( "isdn_x25iface_connect_ind %s \n"
+	IX25DEBUG( "isdn_x25iface_connect_ind %s\n"
 		   , MY_DEVNAME(cprot->net_dev) );
 	if( *state_p == WAN_UNCONFIGURED ){ 
 		printk(KERN_WARNING 
@@ -240,7 +240,7 @@ static int isdn_x25iface_disconn_ind(str
 	struct sk_buff *skb;
 	enum wan_states *state_p 
 	  = &( ( (ix25_pdata_t*) (cprot->proto_data) ) -> state);
-	IX25DEBUG( "isdn_x25iface_disconn_ind %s \n", MY_DEVNAME(cprot -> net_dev) );
+	IX25DEBUG( "isdn_x25iface_disconn_ind %s\n", MY_DEVNAME(cprot -> net_dev) );
 	if( *state_p == WAN_UNCONFIGURED ){ 
 		printk(KERN_WARNING 
 		       "isdn_x25iface_disconn_ind while unconfigured\n");
@@ -269,7 +269,7 @@ static int isdn_x25iface_xmit(struct con
 	unsigned char firstbyte = skb->data[0];
 	enum wan_states *state = &((ix25_pdata_t*)cprot->proto_data)->state;
 	int ret = 0;
-	IX25DEBUG( "isdn_x25iface_xmit: %s first=%x state=%d \n", MY_DEVNAME(cprot -> net_dev), firstbyte, *state );
+	IX25DEBUG( "isdn_x25iface_xmit: %s first=%x state=%d\n", MY_DEVNAME(cprot -> net_dev), firstbyte, *state );
 	switch ( firstbyte ){
 	case 0x00: /* dl_data request */
 		if( *state == WAN_CONNECTED ){
Index: linux-kj/drivers/macintosh/therm_adt746x.c
===================================================================
--- linux-kj.orig/drivers/macintosh/therm_adt746x.c	2005-09-21 01:19:34.000000000 +0400
+++ linux-kj/drivers/macintosh/therm_adt746x.c	2005-09-21 01:35:53.000000000 +0400
@@ -299,7 +299,7 @@ static void update_fans_speed (struct th
 				new_speed = 255;
 
 			printk(KERN_DEBUG "adt746x: setting fans speed to %d "
-					 "(limit exceeded by %d on %s) \n",
+					 "(limit exceeded by %d on %s)\n",
 					new_speed, var,
 					sensor_location[fan_number+1]);
 			write_both_fan_speed(th, new_speed);
Index: linux-kj/drivers/md/md.c
===================================================================
--- linux-kj.orig/drivers/md/md.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/drivers/md/md.c	2005-09-21 01:35:53.000000000 +0400
@@ -2348,7 +2348,7 @@ static int hot_remove_disk(mddev_t * mdd
 
 	return 0;
 busy:
-	printk(KERN_WARNING "md: cannot remove active disk %s from %s ... \n",
+	printk(KERN_WARNING "md: cannot remove active disk %s from %s ...\n",
 		bdevname(rdev->bdev,b), mdname(mddev));
 	return -EBUSY;
 }
Index: linux-kj/drivers/md/raid1.c
===================================================================
--- linux-kj.orig/drivers/md/raid1.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/drivers/md/raid1.c	2005-09-21 01:35:53.000000000 +0400
@@ -862,7 +862,7 @@ static void error(mddev_t *mddev, mdk_rd
 	rdev->in_sync = 0;
 	rdev->faulty = 1;
 	mddev->sb_dirty = 1;
-	printk(KERN_ALERT "raid1: Disk failure on %s, disabling device. \n"
+	printk(KERN_ALERT "raid1: Disk failure on %s, disabling device.\n"
 		"	Operation continuing on %d devices\n",
 		bdevname(rdev->bdev,b), conf->working_disks);
 }
Index: linux-kj/drivers/md/raid10.c
===================================================================
--- linux-kj.orig/drivers/md/raid10.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/drivers/md/raid10.c	2005-09-21 01:35:53.000000000 +0400
@@ -864,7 +864,7 @@ static void error(mddev_t *mddev, mdk_rd
 	rdev->in_sync = 0;
 	rdev->faulty = 1;
 	mddev->sb_dirty = 1;
-	printk(KERN_ALERT "raid10: Disk failure on %s, disabling device. \n"
+	printk(KERN_ALERT "raid10: Disk failure on %s, disabling device.\n"
 		"	Operation continuing on %d devices\n",
 		bdevname(rdev->bdev,b), conf->working_disks);
 }
Index: linux-kj/drivers/media/dvb/b2c2/flexcop-sram.c
===================================================================
--- linux-kj.orig/drivers/media/dvb/b2c2/flexcop-sram.c	2005-09-21 01:19:24.000000000 +0400
+++ linux-kj/drivers/media/dvb/b2c2/flexcop-sram.c	2005-09-21 01:35:53.000000000 +0400
@@ -390,7 +390,7 @@ static int flexcop_sram_detect(struct fl
 	sram_init(adapter);
 	write_reg_dw(adapter, 0x208, tmp);
 
-	dprintk("%s: SRAM detection failed. Set to 32K \n", __FUNCTION__);
+	dprintk("%s: SRAM detection failed. Set to 32K\n", __FUNCTION__);
 
 	return 0;
 }
Index: linux-kj/drivers/media/dvb/b2c2/flexcop-usb.c
===================================================================
--- linux-kj.orig/drivers/media/dvb/b2c2/flexcop-usb.c	2005-09-21 01:19:24.000000000 +0400
+++ linux-kj/drivers/media/dvb/b2c2/flexcop-usb.c	2005-09-21 01:35:53.000000000 +0400
@@ -307,7 +307,7 @@ static void flexcop_usb_process_frame(st
 					if ( *(b+2) == 0x47 )
 						flexcop_pass_dmx_packets(fc_usb->fc_dev, b+2, 1);
 					else
-						deb_ts("not ts packet %02x %02x %02x %02x \n", *(b+2), *(b+3), *(b+4), *(b+5) );
+						deb_ts("not ts packet %02x %02x %02x %02x\n", *(b+2), *(b+3), *(b+4), *(b+5) );
 
 					b += 190;
 					l -= 190;
Index: linux-kj/drivers/media/dvb/bt8xx/bt878.c
===================================================================
--- linux-kj.orig/drivers/media/dvb/bt8xx/bt878.c	2005-09-21 01:19:24.000000000 +0400
+++ linux-kj/drivers/media/dvb/bt8xx/bt878.c	2005-09-21 01:35:53.000000000 +0400
@@ -349,7 +349,7 @@ bt878_device_control(struct bt878 *bt, u
 	/* special gpio signal */
 	switch (cmd) {
 	    case DST_IG_ENABLE:
-		// dprintk("dvb_bt8xx: dst enable mask 0x%02x enb 0x%02x \n", mp->dstg.enb.mask, mp->dstg.enb.enable);
+		// dprintk("dvb_bt8xx: dst enable mask 0x%02x enb 0x%02x\n", mp->dstg.enb.mask, mp->dstg.enb.enable);
 		retval = bttv_gpio_enable(bt->bttv_nr,
 				mp->enb.mask,
 				mp->enb.enable);
Index: linux-kj/drivers/media/dvb/ttpci/av7110_av.c
===================================================================
--- linux-kj.orig/drivers/media/dvb/ttpci/av7110_av.c	2005-09-21 01:19:24.000000000 +0400
+++ linux-kj/drivers/media/dvb/ttpci/av7110_av.c	2005-09-21 01:35:53.000000000 +0400
@@ -167,7 +167,7 @@ int av7110_av_start_record(struct av7110
 int av7110_av_start_play(struct av7110 *av7110, int av)
 {
 	int ret = 0;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (av7110->rec_mode)
 		return -EBUSY;
@@ -203,7 +203,7 @@ int av7110_av_start_play(struct av7110 *
 int av7110_av_stop(struct av7110 *av7110, int av)
 {
 	int ret = 0;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (!(av7110->playing & av) && !(av7110->rec_mode & av))
 		return 0;
@@ -285,7 +285,7 @@ int av7110_set_volume(struct av7110 *av7
 {
 	int err, vol, val, balance = 0;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	av7110->mixer.volume_left = volleft;
 	av7110->mixer.volume_right = volright;
@@ -325,7 +325,7 @@ int av7110_set_volume(struct av7110 *av7
 int av7110_set_vidmode(struct av7110 *av7110, int mode)
 {
 	int ret;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	ret = av7110_fw_cmd(av7110, COMTYPE_ENCODER, LoadVidCode, 1, mode);
 
@@ -356,7 +356,7 @@ static int get_video_format(struct av711
 	u8 *p;
 	int ret = 0;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (av7110->sinfo)
 		return 0;
@@ -409,7 +409,7 @@ static inline long aux_ring_buffer_write
 static void play_video_cb(u8 *buf, int count, void *priv)
 {
 	struct av7110 *av7110 = (struct av7110 *) priv;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if ((buf[3] & 0xe0) == 0xe0) {
 		get_video_format(av7110, buf, count);
@@ -421,7 +421,7 @@ static void play_video_cb(u8 *buf, int c
 static void play_audio_cb(u8 *buf, int count, void *priv)
 {
 	struct av7110 *av7110 = (struct av7110 *) priv;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	aux_ring_buffer_write(&av7110->aout, buf, count);
 }
@@ -433,7 +433,7 @@ static ssize_t dvb_play(struct av7110 *a
 			unsigned long count, int nonblock, int type)
 {
 	unsigned long todo = count, n;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -466,7 +466,7 @@ static ssize_t dvb_play_kernel(struct av
 			unsigned long count, int nonblock, int type)
 {
 	unsigned long todo = count, n;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -496,7 +496,7 @@ static ssize_t dvb_aplay(struct av7110 *
 			 unsigned long count, int nonblock, int type)
 {
 	unsigned long todo = count, n;
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (!av7110->kbuf[type])
 		return -ENOBUFS;
@@ -775,7 +775,7 @@ int av7110_write_to_decoder(struct dvb_d
 	struct av7110 *av7110 = (struct av7110 *) demux->priv;
 	struct ipack *ipack = &av7110->ipack[feed->pes_type];
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	switch (feed->pes_type) {
 	case 0:
@@ -876,7 +876,7 @@ static unsigned int dvb_video_poll(struc
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	unsigned int mask = 0;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if ((file->f_flags & O_ACCMODE) != O_RDONLY)
 		poll_wait(file, &av7110->avout.queue, wait);
@@ -903,7 +903,7 @@ static ssize_t dvb_video_write(struct fi
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if ((file->f_flags & O_ACCMODE) == O_RDONLY)
 		return -EPERM;
@@ -920,7 +920,7 @@ static unsigned int dvb_audio_poll(struc
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	unsigned int mask = 0;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	poll_wait(file, &av7110->aout.queue, wait);
 
@@ -939,7 +939,7 @@ static ssize_t dvb_audio_write(struct fi
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (av7110->audiostate.stream_source != AUDIO_SOURCE_MEMORY) {
 		printk(KERN_ERR "not audio source memory\n");
@@ -956,7 +956,7 @@ static int play_iframe(struct av7110 *av
 {
 	int i, n;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (!(av7110->playing & RP_VIDEO)) {
 		if (av7110_av_start_play(av7110, RP_VIDEO) < 0)
@@ -1330,7 +1330,7 @@ static int dvb_video_open(struct inode *
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	int err;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if ((err = dvb_generic_open(inode, file)) < 0)
 		return err;
@@ -1354,7 +1354,7 @@ static int dvb_video_release(struct inod
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
 		av7110_av_stop(av7110, RP_VIDEO);
@@ -1369,7 +1369,7 @@ static int dvb_audio_open(struct inode *
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 	int err=dvb_generic_open(inode, file);
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	if (err < 0)
 		return err;
@@ -1383,7 +1383,7 @@ static int dvb_audio_release(struct inod
 	struct dvb_device *dvbdev = (struct dvb_device *) file->private_data;
 	struct av7110 *av7110 = (struct av7110 *) dvbdev->priv;
 
-	dprintk(2, "av7110:%p, \n", av7110);
+	dprintk(2, "av7110:%p,\n", av7110);
 
 	av7110_av_stop(av7110, RP_AUDIO);
 	return dvb_generic_release(inode, file);
Index: linux-kj/drivers/media/video/bttv-cards.c
===================================================================
--- linux-kj.orig/drivers/media/video/bttv-cards.c	2005-09-21 01:19:25.000000000 +0400
+++ linux-kj/drivers/media/video/bttv-cards.c	2005-09-21 01:35:53.000000000 +0400
@@ -4406,7 +4406,7 @@ static void PXC200_muxsel(struct bttv *b
 
 	rc=bttv_I2CRead(btv,(PX_I2C_PIC<<1),NULL);
 	if (!(rc & PX_CFG_PXC200F)) {
-	  printk(KERN_DEBUG "bttv%d: PXC200_muxsel: not PXC200F rc:%d \n", btv->c.nr,rc);
+	  printk(KERN_DEBUG "bttv%d: PXC200_muxsel: not PXC200F rc:%d\n", btv->c.nr,rc);
 	  return;
 	}
 
Index: linux-kj/drivers/media/video/cpia.c
===================================================================
--- linux-kj.orig/drivers/media/video/cpia.c	2005-09-21 01:19:26.000000000 +0400
+++ linux-kj/drivers/media/video/cpia.c	2005-09-21 01:35:53.000000000 +0400
@@ -384,7 +384,7 @@ static int cpia_read_proc(char *page, ch
 		               "  powers of 2\n", tmpstr); 
 	else
 		out += sprintf(out, "max_gain:               %8d  %28s"
-			       "  1,2,4 or 8 \n",
+			       "  1,2,4 or 8\n",
 		               1<<(cam->params.exposure.gainMode-1), tmpstr);
 
 	switch(cam->params.exposure.expMode) {
Index: linux-kj/drivers/media/video/cpia.h
===================================================================
--- linux-kj.orig/drivers/media/video/cpia.h	2005-09-21 01:19:26.000000000 +0400
+++ linux-kj/drivers/media/video/cpia.h	2005-09-21 01:35:53.000000000 +0400
@@ -421,7 +421,7 @@ void cpia_unregister_camera(struct cam_d
 #endif
 
 #define DEB_BYTE(p)\
-  DBG("%1d %1d %1d %1d %1d %1d %1d %1d \n",\
+  DBG("%1d %1d %1d %1d %1d %1d %1d %1d\n",\
       (p)&0x80?1:0, (p)&0x40?1:0, (p)&0x20?1:0, (p)&0x10?1:0,\
         (p)&0x08?1:0, (p)&0x04?1:0, (p)&0x02?1:0, (p)&0x01?1:0);
 
Index: linux-kj/drivers/media/video/zoran_procfs.c
===================================================================
--- linux-kj.orig/drivers/media/video/zoran_procfs.c	2005-09-21 01:19:26.000000000 +0400
+++ linux-kj/drivers/media/video/zoran_procfs.c	2005-09-21 01:35:53.000000000 +0400
@@ -130,7 +130,7 @@ static int zoran_show(struct seq_file *p
 
 	seq_printf(p, "ZR36067 registers:\n");
 	for (i = 0; i < 0x130; i += 16)
-		seq_printf(p, "%03X %08X  %08X  %08X  %08X \n", i,
+		seq_printf(p, "%03X %08X  %08X  %08X  %08X\n", i,
 			   btread(i), btread(i+4), btread(i+8), btread(i+12));
 	return 0;
 }
Index: linux-kj/drivers/message/fusion/mptctl.c
===================================================================
--- linux-kj.orig/drivers/message/fusion/mptctl.c	2005-09-21 01:19:31.000000000 +0400
+++ linux-kj/drivers/message/fusion/mptctl.c	2005-09-21 01:35:53.000000000 +0400
@@ -305,7 +305,7 @@ static void mptctl_timeout_expired (MPT_
 		/* Issue a reset for this device.
 		 * The IOC is not responding.
 		 */
-		dctlprintk((MYIOC_s_INFO_FMT "Calling HardReset! \n",
+		dctlprintk((MYIOC_s_INFO_FMT "Calling HardReset!\n",
 			 ioctl->ioc->name));
 		mpt_HardResetHandler(ioctl->ioc, NO_SLEEP);
 	}
@@ -380,7 +380,7 @@ static int mptctl_bus_reset(MPT_IOCTL *i
 	if ((retval = mpt_send_handshake_request(mptctl_id, ioctl->ioc,
 	     sizeof(SCSITaskMgmt_t), (u32*)pScsiTm, CAN_SLEEP)) != 0) {
 		dfailprintk((MYIOC_s_ERR_FMT "_send_handshake FAILED!"
-			" (hd %p, ioc %p, mf %p) \n", hd->ioc->name, hd,
+			" (hd %p, ioc %p, mf %p)\n", hd->ioc->name, hd,
 			hd->ioc, mf));
 		goto mptctl_bus_reset_done;
 	}
@@ -1761,7 +1761,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_
 		return -ENOMEM;
 	} else if (ioc->ioctl->status & MPT_IOCTL_STATUS_DID_IOCRESET) {
 		printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
-			"Busy with IOC Reset \n", __FILE__, __LINE__);
+			"Busy with IOC Reset\n", __FILE__, __LINE__);
 		return -EBUSY;
 	}
 
@@ -1832,7 +1832,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_
 
 			if ((target < 0) || (target >= ioc->sh->max_id)) {
 				printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
-					"Target ID out of bounds. \n",
+					"Target ID out of bounds.\n",
 					__FILE__, __LINE__);
 				rc = -ENODEV;
 				goto done_free_mem;
@@ -1882,7 +1882,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_
 
 		} else {
 			printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
-				"SCSI driver is not loaded. \n",
+				"SCSI driver is not loaded.\n",
 					__FILE__, __LINE__);
 			rc = -EFAULT;
 			goto done_free_mem;
@@ -1939,7 +1939,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_
 			ioc->ioctl->target = pScsiReq->TargetID;
 		} else {
 			printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
-				"SCSI driver is not loaded. \n",
+				"SCSI driver is not loaded.\n",
 					__FILE__, __LINE__);
 			rc = -EFAULT;
 			goto done_free_mem;
@@ -1951,7 +1951,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_
 			MPT_SCSI_HOST *hd = NULL;
 			if ((ioc->sh == NULL) || ((hd = (MPT_SCSI_HOST *)ioc->sh->hostdata) == NULL)) {
 				printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
-					"SCSI driver not loaded or SCSI host not found. \n",
+					"SCSI driver not loaded or SCSI host not found.\n",
 					__FILE__, __LINE__);
 				rc = -EFAULT;
 				goto done_free_mem;
@@ -2017,7 +2017,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_
 		*/
 
 		printk(KERN_ERR "%s@%d::mptctl_do_mpt_command - "
-			"Illegal request (function 0x%x) \n",
+			"Illegal request (function 0x%x)\n",
 			__FILE__, __LINE__, hdr->Function);
 		rc = -EFAULT;
 		goto done_free_mem;
@@ -2119,7 +2119,7 @@ mptctl_do_mpt_command (struct mpt_ioctl_
 			sizeof(SCSITaskMgmt_t), (u32*)mf,
 			CAN_SLEEP) != 0) {
 			dfailprintk((MYIOC_s_ERR_FMT "_send_handshake FAILED!"
-				" (ioc %p, mf %p) \n", ioc->name,
+				" (ioc %p, mf %p)\n", ioc->name,
 				ioc, mf));
 			mptctl_free_tm_flags(ioc);
 			rc = -ENODATA;
Index: linux-kj/drivers/message/fusion/mptscsih.c
===================================================================
--- linux-kj.orig/drivers/message/fusion/mptscsih.c	2005-09-21 01:19:31.000000000 +0400
+++ linux-kj/drivers/message/fusion/mptscsih.c	2005-09-21 01:35:53.000000000 +0400
@@ -899,7 +899,7 @@ mptscsih_search_running_cmds(MPT_SCSI_HO
 
 			mf = (SCSIIORequest_t *)MPT_INDEX_2_MFPTR(hd->ioc, ii);
 
-			dsprintk(( "search_running: found (sc=%p, mf = %p) target %d, lun %d \n",
+			dsprintk(( "search_running: found (sc=%p, mf = %p) target %d, lun %d\n",
 					hd->ScsiLookup[ii], mf, mf->TargetID, mf->LUN[1]));
 
 			if ((mf->TargetID != ((u8)target)) || (mf->LUN[1] != ((u8) lun)))
@@ -1544,17 +1544,17 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8
 	if (mptscsih_tm_pending_wait(hd) == FAILED) {
 		if (type == MPI_SCSITASKMGMT_TASKTYPE_ABORT_TASK) {
 			dtmprintk((KERN_INFO MYNAM ": %s: TMHandler abort: "
-			   "Timed out waiting for last TM (%d) to complete! \n",
+			   "Timed out waiting for last TM (%d) to complete!\n",
 			   hd->ioc->name, hd->tmPending));
 			return FAILED;
 		} else if (type == MPI_SCSITASKMGMT_TASKTYPE_TARGET_RESET) {
 			dtmprintk((KERN_INFO MYNAM ": %s: TMHandler target reset: "
-			   "Timed out waiting for last TM (%d) to complete! \n",
+			   "Timed out waiting for last TM (%d) to complete!\n",
 			   hd->ioc->name, hd->tmPending));
 			return FAILED;
 		} else if (type == MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS) {
 			dtmprintk((KERN_INFO MYNAM ": %s: TMHandler bus reset: "
-			   "Timed out waiting for last TM (%d) to complete! \n",
+			   "Timed out waiting for last TM (%d) to complete!\n",
 			   hd->ioc->name, hd->tmPending));
 			if (hd->tmPending & (1 << MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS))
 				return FAILED;
@@ -1598,7 +1598,7 @@ mptscsih_TMHandler(MPT_SCSI_HOST *hd, u8
 	 */
 	if ((type == MPI_SCSITASKMGMT_TASKTYPE_RESET_BUS) && (rc ||
 		ioc->reload_fw || (ioc->alt_ioc && ioc->alt_ioc->reload_fw))) {
-		dtmprintk((MYIOC_s_INFO_FMT "Calling HardReset! \n",
+		dtmprintk((MYIOC_s_INFO_FMT "Calling HardReset!\n",
 			 hd->ioc->name));
 		rc = mpt_HardResetHandler(hd->ioc, CAN_SLEEP);
 	}
@@ -1677,7 +1677,7 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd
 		sizeof(SCSITaskMgmt_t), (u32*)pScsiTm,
 		CAN_SLEEP)) != 0) {
 		dfailprintk((MYIOC_s_ERR_FMT "_send_handshake FAILED!"
-			" (hd %p, ioc %p, mf %p) \n", hd->ioc->name, hd,
+			" (hd %p, ioc %p, mf %p)\n", hd->ioc->name, hd,
 			hd->ioc, mf));
 		mpt_free_msg_frame(hd->ioc, mf);
 		return retval;
@@ -1685,10 +1685,10 @@ mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd
 
 	if(mptscsih_tm_wait_for_completion(hd, timeout) == FAILED) {
 		dfailprintk((MYIOC_s_ERR_FMT "_wait_for_completion FAILED!"
-			" (hd %p, ioc %p, mf %p) \n", hd->ioc->name, hd,
+			" (hd %p, ioc %p, mf %p)\n", hd->ioc->name, hd,
 			hd->ioc, mf));
 		mpt_free_msg_frame(hd->ioc, mf);
-		dtmprintk((MYIOC_s_INFO_FMT "Calling HardReset! \n",
+		dtmprintk((MYIOC_s_INFO_FMT "Calling HardReset!\n",
 			 hd->ioc->name));
 		retval = mpt_HardResetHandler(hd->ioc, CAN_SLEEP);
 	}
@@ -5317,7 +5317,7 @@ mptscsih_dv_parms(MPT_SCSI_HOST *hd, DVP
 
 	case MPT_FALLBACK:
 		ddvprintk((MYIOC_s_NOTE_FMT
-			"Fallback: Start: offset %d, factor %x, width %d \n",
+			"Fallback: Start: offset %d, factor %x, width %d\n",
 				hd->ioc->name, dv->now.offset,
 				dv->now.factor, dv->now.width));
 		width = dv->now.width;
Index: linux-kj/drivers/message/i2o/i2o_proc.c
===================================================================
--- linux-kj.orig/drivers/message/i2o/i2o_proc.c	2005-09-21 01:19:30.000000000 +0400
+++ linux-kj/drivers/message/i2o/i2o_proc.c	2005-09-21 01:35:53.000000000 +0400
@@ -1586,22 +1586,22 @@ static int i2o_seq_show_sensors(struct s
 	}
 
 	seq_printf(seq, "Event_enable : 0x%02X\n", result.event_enable);
-	seq_printf(seq, "    [%s] Operational state change. \n",
+	seq_printf(seq, "    [%s] Operational state change.\n",
 		   (result.event_enable & 0x01) ? "+" : "-");
-	seq_printf(seq, "    [%s] Low catastrophic. \n",
+	seq_printf(seq, "    [%s] Low catastrophic.\n",
 		   (result.event_enable & 0x02) ? "+" : "-");
-	seq_printf(seq, "    [%s] Low reading. \n",
+	seq_printf(seq, "    [%s] Low reading.\n",
 		   (result.event_enable & 0x04) ? "+" : "-");
-	seq_printf(seq, "    [%s] Low warning. \n",
+	seq_printf(seq, "    [%s] Low warning.\n",
 		   (result.event_enable & 0x08) ? "+" : "-");
 	seq_printf(seq,
-		   "    [%s] Change back to normal from out of range state. \n",
+		   "    [%s] Change back to normal from out of range state.\n",
 		   (result.event_enable & 0x10) ? "+" : "-");
-	seq_printf(seq, "    [%s] High warning. \n",
+	seq_printf(seq, "    [%s] High warning.\n",
 		   (result.event_enable & 0x20) ? "+" : "-");
-	seq_printf(seq, "    [%s] High reading. \n",
+	seq_printf(seq, "    [%s] High reading.\n",
 		   (result.event_enable & 0x40) ? "+" : "-");
-	seq_printf(seq, "    [%s] High catastrophic. \n",
+	seq_printf(seq, "    [%s] High catastrophic.\n",
 		   (result.event_enable & 0x80) ? "+" : "-");
 
 	return 0;
Index: linux-kj/drivers/mtd/chips/jedec_probe.c
===================================================================
--- linux-kj.orig/drivers/mtd/chips/jedec_probe.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/mtd/chips/jedec_probe.c	2005-09-21 01:35:53.000000000 +0400
@@ -1754,7 +1754,7 @@ static inline void jedec_reset(u32 base,
 	 * the F0 is written to */
 	if(cfi->addr_unlock1) {
 		DEBUG( MTD_DEBUG_LEVEL3,
-		       "reset unlock called %x %x \n",
+		       "reset unlock called %x %x\n",
 		       cfi->addr_unlock1,cfi->addr_unlock2);
 		cfi_send_gen_cmd(0xaa, cfi->addr_unlock1, base, map, cfi, cfi->device_type, NULL);
 		cfi_send_gen_cmd(0x55, cfi->addr_unlock2, base, map, cfi, cfi->device_type, NULL);
Index: linux-kj/drivers/mtd/maps/tqm8xxl.c
===================================================================
--- linux-kj.orig/drivers/mtd/maps/tqm8xxl.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/mtd/maps/tqm8xxl.c	2005-09-21 01:35:53.000000000 +0400
@@ -178,7 +178,7 @@ int __init init_tqm_mtd(void)
 			mtd_size += mtd_banks[idx]->size;
 			num_banks++;
 
-			printk(KERN_INFO "%s: bank%d, name:%s, size:%dbytes \n", __FUNCTION__, num_banks, 
+			printk(KERN_INFO "%s: bank%d, name:%s, size:%dbytes\n", __FUNCTION__, num_banks, 
 			mtd_banks[idx]->name, mtd_banks[idx]->size);
 		}
 	}
Index: linux-kj/drivers/mtd/nand/nand_base.c
===================================================================
--- linux-kj.orig/drivers/mtd/nand/nand_base.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/mtd/nand/nand_base.c	2005-09-21 01:35:53.000000000 +0400
@@ -2547,7 +2547,7 @@ int nand_scan (struct mtd_info *mtd, int
 	case NAND_ECC_HW6_512: 
 	case NAND_ECC_HW8_512: 
 		if (mtd->oobblock == 256) {
-			printk (KERN_WARNING "512 byte HW ECC not possible on 256 Byte pagesize, fallback to SW ECC \n");
+			printk (KERN_WARNING "512 byte HW ECC not possible on 256 Byte pagesize, fallback to SW ECC\n");
 			this->eccmode = NAND_ECC_SOFT;
 			this->calculate_ecc = nand_calculate_ecc;
 			this->correct_data = nand_correct_data;
Index: linux-kj/drivers/net/3c505.c
===================================================================
--- linux-kj.orig/drivers/net/3c505.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/3c505.c	2005-09-21 01:35:53.000000000 +0400
@@ -299,7 +299,7 @@ static inline void adapter_reset(struct 
 
 	outb_control(orig_hcr, dev);
 	if (!start_receive(dev, &adapter->tx_pcb))
-		printk(KERN_ERR "%s: start receive command failed \n", dev->name);
+		printk(KERN_ERR "%s: start receive command failed\n", dev->name);
 }
 
 /* Check to make sure that a DMA transfer hasn't timed out.  This should
Index: linux-kj/drivers/net/b44.c
===================================================================
--- linux-kj.orig/drivers/net/b44.c	2005-09-21 01:23:22.000000000 +0400
+++ linux-kj/drivers/net/b44.c	2005-09-21 01:35:53.000000000 +0400
@@ -1312,7 +1312,7 @@ err_out_free:
 	u16 val16;
 
 	pci_read_config_word(bp->pdev, PCI_STATUS, &val16);
-	printk("DEBUG: PCI status [%04x] \n", val16);
+	printk("DEBUG: PCI status [%04x]\n", val16);
 
 }
 #endif
Index: linux-kj/drivers/net/bonding/bond_main.c
===================================================================
--- linux-kj.orig/drivers/net/bonding/bond_main.c	2005-09-21 01:25:50.000000000 +0400
+++ linux-kj/drivers/net/bonding/bond_main.c	2005-09-21 01:35:53.000000000 +0400
@@ -2021,7 +2021,7 @@ static int bond_enslave(struct net_devic
 			 * We got all the way through the address and it was
 			 * all 0's.
 			 */
-			dprintk("%s doesn't have a MAC address yet.  \n",
+			dprintk("%s doesn't have a MAC address yet.\n",
 				bond_dev->name);
 			dprintk("Going to give assign it from %s.\n",
 				slave_dev->name);
@@ -4106,12 +4106,12 @@ static int bond_do_ioctl(struct net_devi
 
 	slave_dev = dev_get_by_name(ifr->ifr_slave);
 
-	dprintk("slave_dev=%p: \n", slave_dev);
+	dprintk("slave_dev=%p:\n", slave_dev);
 
 	if (!slave_dev) {
 		res = -ENODEV;
 	} else {
-		dprintk("slave_dev->name=%s: \n", slave_dev->name);
+		dprintk("slave_dev->name=%s:\n", slave_dev->name);
 		switch (cmd) {
 		case BOND_ENSLAVE_OLD:
 		case SIOCBONDENSLAVE:
Index: linux-kj/drivers/net/e1000/e1000_hw.c
===================================================================
--- linux-kj.orig/drivers/net/e1000/e1000_hw.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/e1000/e1000_hw.c	2005-09-21 01:35:53.000000000 +0400
@@ -1037,7 +1037,7 @@ e1000_copper_link_preconfig(struct e1000
         DEBUGOUT("Error, did not detect valid phy.\n");
         return ret_val;
     }
-    DEBUGOUT1("Phy ID = %x \n", hw->phy_id);
+    DEBUGOUT1("Phy ID = %x\n", hw->phy_id);
 
     /* Set PHY to class A mode (if necessary) */
     ret_val = e1000_set_phy_mode(hw);
@@ -1710,7 +1710,7 @@ e1000_phy_force_speed_duplex(struct e100
         if(ret_val)
             return ret_val;
 
-        DEBUGOUT1("M88E1000 PSCR: %x \n", phy_data);
+        DEBUGOUT1("M88E1000 PSCR: %x\n", phy_data);
 
         /* Need to reset the PHY or these changes will be ignored */
         mii_ctrl_reg |= MII_CR_RESET;
Index: linux-kj/drivers/net/eepro.c
===================================================================
--- linux-kj.orig/drivers/net/eepro.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/eepro.c	2005-09-21 01:35:53.000000000 +0400
@@ -649,7 +649,7 @@ static void __init printEEPROMInfo(struc
 	if (GetBit(Word,ee_PortTPE)) printk(KERN_DEBUG "TPE ");
 	if (GetBit(Word,ee_PortBNC)) printk(KERN_DEBUG "BNC ");
 	if (GetBit(Word,ee_PortAUI)) printk(KERN_DEBUG "AUI ");
-	printk(KERN_DEBUG "port(s) \n");
+	printk(KERN_DEBUG "port(s)\n");
 
 	Word = lp->word[6];
 	printk(KERN_DEBUG "Word6:\n");
@@ -758,7 +758,7 @@ static int __init eepro_probe1(struct ne
 	/* Grab the region so we can find another board if autoIRQ fails. */
 	if (!request_region(ioaddr, EEPRO_IO_EXTENT, DRV_NAME)) { 
 		if (!autoprobe)
-			printk(KERN_WARNING "EEPRO: io-port 0x%04x in use \n",
+			printk(KERN_WARNING "EEPRO: io-port 0x%04x in use\n",
 				ioaddr);
 		return -EBUSY;
 	}
Index: linux-kj/drivers/net/hamradio/baycom_ser_fdx.c
===================================================================
--- linux-kj.orig/drivers/net/hamradio/baycom_ser_fdx.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/hamradio/baycom_ser_fdx.c	2005-09-21 01:35:53.000000000 +0400
@@ -419,7 +419,7 @@ static int ser12_open(struct net_device 
 	if (bc->baud < 300 || bc->baud > 4800)
 		return -EINVAL;
 	if (!request_region(dev->base_addr, SER12_EXTENT, "baycom_ser_fdx")) {
-		printk(KERN_WARNING "BAYCOM_SER_FSX: I/O port 0x%04lx busy \n", 
+		printk(KERN_WARNING "BAYCOM_SER_FSX: I/O port 0x%04lx busy\n", 
 		       dev->base_addr);
 		return -EACCES;
 	}
Index: linux-kj/drivers/net/ibm_emac/ibm_emac_debug.c
===================================================================
--- linux-kj.orig/drivers/net/ibm_emac/ibm_emac_debug.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/ibm_emac/ibm_emac_debug.c	2005-09-21 01:35:53.000000000 +0400
@@ -61,7 +61,7 @@ void emac_mac_dump(struct net_device *de
 	struct ocp_enet_private *fep = dev->priv;
 	volatile emac_t *emacp = fep->emacp;
 
-	printk(KERN_DEBUG "EMAC DEBUG ********** \n");
+	printk(KERN_DEBUG "EMAC DEBUG **********\n");
 	printk(KERN_DEBUG "EMAC_M0  ==> 0x%x\n", in_be32(&emacp->em0mr0));
 	printk(KERN_DEBUG "EMAC_M1  ==> 0x%x\n", in_be32(&emacp->em0mr1));
 	printk(KERN_DEBUG "EMAC_TXM0==> 0x%x\n", in_be32(&emacp->em0tmr0));
@@ -79,7 +79,7 @@ void emac_mal_dump(struct net_device *de
 {
 	struct ibm_ocp_mal *mal = ((struct ocp_enet_private *)dev->priv)->mal;
 
-	printk(KERN_DEBUG " MAL DEBUG ********** \n");
+	printk(KERN_DEBUG " MAL DEBUG **********\n");
 	printk(KERN_DEBUG " MCR      ==> 0x%x\n",
 	       (unsigned int)get_mal_dcrn(mal, DCRN_MALCR));
 	printk(KERN_DEBUG " ESR      ==> 0x%x\n",
@@ -130,7 +130,7 @@ void emac_serr_dump_0(struct net_device 
 	unsigned long int mal_error, plb_error, plb_addr;
 
 	mal_error = get_mal_dcrn(mal, DCRN_MALESR);
-	printk(KERN_DEBUG "ppc405_eth_serr: %s channel %ld \n",
+	printk(KERN_DEBUG "ppc405_eth_serr: %s channel %ld\n",
 	       (mal_error & 0x40000000) ? "Receive" :
 	       "Transmit", (mal_error & 0x3e000000) >> 25);
 	printk(KERN_DEBUG "  -----  latched error  -----\n");
@@ -208,7 +208,7 @@ void emac_err_dump(struct net_device *de
 	if (em0isr & EMAC_ISR_TE0)
 		printk(KERN_DEBUG "  TE0: xmit channel 0 aborted\n");
 	if (em0isr & EMAC_ISR_DB1)
-		printk(KERN_DEBUG "  DB1: xmit error or SQE on TX channel \n");
+		printk(KERN_DEBUG "  DB1: xmit error or SQE on TX channel\n");
 	if (em0isr & EMAC_ISR_SE1)
 		printk(KERN_DEBUG
 		       "  SE1: Signal Quality Error test failure from TX channel 1\n");
Index: linux-kj/drivers/net/irda/ali-ircc.c
===================================================================
--- linux-kj.orig/drivers/net/irda/ali-ircc.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/irda/ali-ircc.c	2005-09-21 01:35:53.000000000 +0400
@@ -727,18 +727,18 @@ static irqreturn_t ali_ircc_fir_interrup
 			if(OldMessageCount > ((self->LineStatus+1) & 0x07))
 			{
 				self->rcvFramesOverflow = TRUE;	
-				IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ******** \n", __FUNCTION__);
+				IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ********\n", __FUNCTION__);
 			}
 						
 			if (ali_ircc_dma_receive_complete(self))
 			{
-				IRDA_DEBUG(1, "%s(), ******* receive complete ******** \n", __FUNCTION__);
+				IRDA_DEBUG(1, "%s(), ******* receive complete ********\n", __FUNCTION__);
 				
 				self->ier = IER_EOM;				
 			}
 			else
 			{
-				IRDA_DEBUG(1, "%s(), ******* Not receive complete ******** \n", __FUNCTION__);
+				IRDA_DEBUG(1, "%s(), ******* Not receive complete ********\n", __FUNCTION__);
 				
 				self->ier = IER_EOM | IER_TIMER;								
 			}	
@@ -751,7 +751,7 @@ static irqreturn_t ali_ircc_fir_interrup
 		if(OldMessageCount > ((self->LineStatus+1) & 0x07))
 		{
 			self->rcvFramesOverflow = TRUE;	
-			IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE ******* \n", __FUNCTION__);
+			IRDA_DEBUG(1, "%s(), ******* self->rcvFramesOverflow = TRUE *******\n", __FUNCTION__);
 		}
 		/* Disable Timer */
 		switch_bank(iobase, BANK1);
@@ -916,7 +916,7 @@ static void ali_ircc_sir_write_wakeup(st
 			// benjamin 2000/11/10 06:32PM
 			if (self->io.speed > 115200)
 			{
-				IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT \n", __FUNCTION__ );				
+				IRDA_DEBUG(2, "%s(), ali_ircc_change_speed from UART_LSR_TEMT\n", __FUNCTION__ );				
 					
 				self->ier = IER_EOM;
 				// SetCOMInterrupts(self, TRUE);							
@@ -944,7 +944,7 @@ static void ali_ircc_change_speed(struct
 	
 	IRDA_DEBUG(1, "%s(), ---------------- Start ----------------\n", __FUNCTION__ );
 	
-	IRDA_DEBUG(2, "%s(), setting speed = %d \n", __FUNCTION__ , baud);
+	IRDA_DEBUG(2, "%s(), setting speed = %d\n", __FUNCTION__ , baud);
 	
 	/* This function *must* be called with irq off and spin-lock.
 	 * - Jean II */
@@ -1472,7 +1472,7 @@ static int ali_ircc_fir_hard_xmit(struct
 			diff = self->now.tv_usec - self->stamp.tv_usec;
 			/* self->stamp is set from ali_ircc_dma_receive_complete() */
 							
-			IRDA_DEBUG(1, "%s(), ******* diff = %d ******* \n", __FUNCTION__ , diff);	
+			IRDA_DEBUG(1, "%s(), ******* diff = %d *******\n", __FUNCTION__ , diff);	
 			
 			if (diff < 0) 
 				diff += 1000000;
@@ -1613,7 +1613,7 @@ static void ali_ircc_dma_xmit(struct ali
 	tmp = inb(iobase+FIR_LCR_B);
 	tmp &= ~0x20; // Disable SIP
 	outb(((unsigned char)(tmp & 0x3f) | LCR_B_TX_MODE) & ~LCR_B_BW, iobase+FIR_LCR_B);
-	IRDA_DEBUG(1, "%s(), ******* Change to TX mode: FIR_LCR_B = 0x%x ******* \n", __FUNCTION__ , inb(iobase+FIR_LCR_B));
+	IRDA_DEBUG(1, "%s(), ******* Change to TX mode: FIR_LCR_B = 0x%x *******\n", __FUNCTION__ , inb(iobase+FIR_LCR_B));
 	
 	outb(0, iobase+FIR_LSR);
 			
@@ -1740,7 +1740,7 @@ static int ali_ircc_dma_receive(struct a
 	//switch_bank(iobase, BANK0);
 	tmp = inb(iobase+FIR_LCR_B);
 	outb((unsigned char)(tmp &0x3f) | LCR_B_RX_MODE | LCR_B_BW , iobase + FIR_LCR_B); // 2000/12/1 05:16PM
-	IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x *** \n", __FUNCTION__ , inb(iobase+FIR_LCR_B));
+	IRDA_DEBUG(1, "%s(), *** Change To RX mode: FIR_LCR_B = 0x%x ***\n", __FUNCTION__ , inb(iobase+FIR_LCR_B));
 			
 	/* Set Rx Threshold */
 	switch_bank(iobase, BANK1);
@@ -1812,7 +1812,7 @@ static int  ali_ircc_dma_receive_complet
 		/* Check for errors */
 		if ((status & 0xd8) || self->rcvFramesOverflow || (len==0)) 		
 		{
-			IRDA_DEBUG(0,"%s(), ************* RX Errors ************ \n", __FUNCTION__ );	
+			IRDA_DEBUG(0,"%s(), ************* RX Errors ************\n", __FUNCTION__ );	
 			
 			/* Skip frame */
 			self->stats.rx_errors++;
@@ -1822,29 +1822,29 @@ static int  ali_ircc_dma_receive_complet
 			if (status & LSR_FIFO_UR) 
 			{
 				self->stats.rx_frame_errors++;
-				IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************ \n", __FUNCTION__ );
+				IRDA_DEBUG(0,"%s(), ************* FIFO Errors ************\n", __FUNCTION__ );
 			}	
 			if (status & LSR_FRAME_ERROR)
 			{
 				self->stats.rx_frame_errors++;
-				IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************ \n", __FUNCTION__ );
+				IRDA_DEBUG(0,"%s(), ************* FRAME Errors ************\n", __FUNCTION__ );
 			}
 							
 			if (status & LSR_CRC_ERROR) 
 			{
 				self->stats.rx_crc_errors++;
-				IRDA_DEBUG(0,"%s(), ************* CRC Errors ************ \n", __FUNCTION__ );
+				IRDA_DEBUG(0,"%s(), ************* CRC Errors ************\n", __FUNCTION__ );
 			}
 			
 			if(self->rcvFramesOverflow)
 			{
 				self->stats.rx_frame_errors++;
-				IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************ \n", __FUNCTION__ );								
+				IRDA_DEBUG(0,"%s(), ************* Overran DMA buffer ************\n", __FUNCTION__ );								
 			}
 			if(len == 0)
 			{
 				self->stats.rx_frame_errors++;
-				IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 ********* \n", __FUNCTION__ );
+				IRDA_DEBUG(0,"%s(), ********** Receive Frame Size = 0 *********\n", __FUNCTION__ );
 			}
 		}	 
 		else 
@@ -1856,7 +1856,7 @@ static int  ali_ircc_dma_receive_complet
 				val = inb(iobase+FIR_BSR);	
 				if ((val& BSR_FIFO_NOT_EMPTY)== 0x80) 
 				{
-					IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************ \n", __FUNCTION__ );
+					IRDA_DEBUG(0, "%s(), ************* BSR_FIFO_NOT_EMPTY ************\n", __FUNCTION__ );
 					
 					/* Put this entry back in fifo */
 					st_fifo->head--;
Index: linux-kj/drivers/net/irda/irda-usb.c
===================================================================
--- linux-kj.orig/drivers/net/irda/irda-usb.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/irda/irda-usb.c	2005-09-21 01:35:53.000000000 +0400
@@ -759,13 +759,13 @@ static void irda_usb_receive(struct urb 
 			self->stats.rx_crc_errors++;	
 			break;
 		case -ECONNRESET:		/* -104 */
-			IRDA_DEBUG(0, "%s(), Connection Reset (-104), transfer_flags 0x%04X \n", __FUNCTION__, urb->transfer_flags);
+			IRDA_DEBUG(0, "%s(), Connection Reset (-104), transfer_flags 0x%04X\n", __FUNCTION__, urb->transfer_flags);
 			/* uhci_cleanup_unlink() is going to kill the Rx
 			 * URB just after we return. No problem, at this
 			 * point the URB will be idle ;-) - Jean II */
 			break;
 		default:
-			IRDA_DEBUG(0, "%s(), RX status %d,transfer_flags 0x%04X \n", __FUNCTION__, urb->status, urb->transfer_flags);
+			IRDA_DEBUG(0, "%s(), RX status %d,transfer_flags 0x%04X\n", __FUNCTION__, urb->status, urb->transfer_flags);
 			break;
 		}
 		goto done;
Index: linux-kj/drivers/net/irda/vlsi_ir.c
===================================================================
--- linux-kj.orig/drivers/net/irda/vlsi_ir.c	2005-09-21 01:23:31.000000000 +0400
+++ linux-kj/drivers/net/irda/vlsi_ir.c	2005-09-21 01:35:53.000000000 +0400
@@ -1750,7 +1750,7 @@ static int vlsi_irda_suspend(struct pci_
 	vlsi_irda_dev_t *idev;
 
 	if (!ndev) {
-		IRDA_ERROR("%s - %s: no netdevice \n",
+		IRDA_ERROR("%s - %s: no netdevice\n",
 			   __FUNCTION__, PCIDEV_NAME(pdev));
 		return 0;
 	}
@@ -1789,7 +1789,7 @@ static int vlsi_irda_resume(struct pci_d
 	vlsi_irda_dev_t	*idev;
 
 	if (!ndev) {
-		IRDA_ERROR("%s - %s: no netdevice \n",
+		IRDA_ERROR("%s - %s: no netdevice\n",
 			   __FUNCTION__, PCIDEV_NAME(pdev));
 		return 0;
 	}
Index: linux-kj/drivers/net/mv643xx_eth.c
===================================================================
--- linux-kj.orig/drivers/net/mv643xx_eth.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/mv643xx_eth.c	2005-09-21 01:35:53.000000000 +0400
@@ -1240,9 +1240,9 @@ linear:
 					"%s: Error on transmitting packet\n",
 					dev->name);
 			if (status == ETH_QUEUE_FULL)
-				printk("Error on Queue Full \n");
+				printk("Error on Queue Full\n");
 			if (status == ETH_QUEUE_LAST_RESOURCE)
-				printk("Tx resource error \n");
+				printk("Tx resource error\n");
 		}
 		stats->tx_bytes += pkt_info.byte_cnt;
 
@@ -1277,10 +1277,10 @@ linear:
 							dev->name);
 
 				if (status == ETH_QUEUE_LAST_RESOURCE)
-					printk("Tx resource error \n");
+					printk("Tx resource error\n");
 
 				if (status == ETH_QUEUE_FULL)
-					printk("Queue is full \n");
+					printk("Queue is full\n");
 			}
 			stats->tx_bytes += pkt_info.byte_cnt;
 		}
@@ -1521,16 +1521,16 @@ static int mv643xx_eth_probe(struct devi
 								dev->name);
 
 #ifdef MV643XX_CHECKSUM_OFFLOAD_TX
-	printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON \n", dev->name);
+	printk(KERN_NOTICE "%s: RX TCP/UDP Checksum Offload ON\n", dev->name);
 #endif
 
 #ifdef MV643XX_COAL
-	printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON \n",
+	printk(KERN_NOTICE "%s: TX and RX Interrupt Coalescing ON\n",
 								dev->name);
 #endif
 
 #ifdef MV643XX_NAPI
-	printk(KERN_NOTICE "%s: RX NAPI Enabled \n", dev->name);
+	printk(KERN_NOTICE "%s: RX NAPI Enabled\n", dev->name);
 #endif
 
 	return 0;
Index: linux-kj/drivers/net/s2io.c
===================================================================
--- linux-kj.orig/drivers/net/s2io.c	2005-09-21 01:23:23.000000000 +0400
+++ linux-kj/drivers/net/s2io.c	2005-09-21 01:35:53.000000000 +0400
@@ -4844,7 +4844,7 @@ static void s2io_set_link(unsigned long 
 					DBG_PRINT(ERR_DBG, " Link down");
 					DBG_PRINT(ERR_DBG, "after ");
 					DBG_PRINT(ERR_DBG, "enabling ");
-					DBG_PRINT(ERR_DBG, "device \n");
+					DBG_PRINT(ERR_DBG, "device\n");
 				}
 			}
 			if (nic->device_enabled_once == FALSE) {
Index: linux-kj/drivers/net/sis900.c
===================================================================
--- linux-kj.orig/drivers/net/sis900.c	2005-09-21 01:23:23.000000000 +0400
+++ linux-kj/drivers/net/sis900.c	2005-09-21 01:35:53.000000000 +0400
@@ -1483,7 +1483,7 @@ static void sis900_read_mode(struct net_
 	}
 
 	if(netif_msg_link(sis_priv))
-		printk(KERN_INFO "%s: Media Link On %s %s-duplex \n",
+		printk(KERN_INFO "%s: Media Link On %s %s-duplex\n",
 	       				net_dev->name,
 	       				*speed == HW_SPEED_100_MBPS ?
 	       					"100mbps" : "10mbps",
@@ -1507,7 +1507,7 @@ static void sis900_tx_timeout(struct net
 	int i;
 
 	if(netif_msg_tx_err(sis_priv))
-		printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x \n",
+		printk(KERN_INFO "%s: Transmit timeout, status %8.8x %8.8x\n",
 	       		net_dev->name, inl(ioaddr + cr), inl(ioaddr + isr));
 
 	/* Disable interrupts by clearing the interrupt mask. */
Index: linux-kj/drivers/net/sk98lin/skgesirq.c
===================================================================
--- linux-kj.orig/drivers/net/sk98lin/skgesirq.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/sk98lin/skgesirq.c	2005-09-21 01:35:53.000000000 +0400
@@ -972,7 +972,7 @@ int		Port)		/* Which port should be chec
 
 	if ((Shorts - pPrt->PPrevShorts) > CheckShorts) {
 		SK_DBG_MSG(pAC, SK_DBGMOD_HWM, SK_DBGCAT_IRQ,
-			("Short Event Count Restart Port %d \n", Port));
+			("Short Event Count Restart Port %d\n", Port));
 		Rtv = SK_HW_PS_RESTART;
 	}
 
Index: linux-kj/drivers/net/skfp/fplustm.c
===================================================================
--- linux-kj.orig/drivers/net/skfp/fplustm.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/skfp/fplustm.c	2005-09-21 01:35:53.000000000 +0400
@@ -1352,7 +1352,7 @@ void rtm_set_timer(struct s_smc *smc)
 	/*
 	 * MIB timer and hardware timer have the same resolution of 80nS
 	 */
-	DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns \n",
+	DB_RMT("RMT: setting new fddiPATHT_Rmode, t = %d ns\n",
 		(int) smc->mib.a[PATH0].fddiPATHT_Rmode,0) ;
 	outpd(ADDR(B2_RTM_INI),smc->mib.a[PATH0].fddiPATHT_Rmode) ;
 }
Index: linux-kj/drivers/net/skfp/pcmplc.c
===================================================================
--- linux-kj.orig/drivers/net/skfp/pcmplc.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/skfp/pcmplc.c	2005-09-21 01:35:53.000000000 +0400
@@ -1280,7 +1280,7 @@ static void pc_rcode_actions(struct s_sm
 
 	mib = phy->mib ;
 
-	DB_PCMN(1,"SIG rec %x %x: \n", bit,phy->r_val[bit] ) ;
+	DB_PCMN(1,"SIG rec %x %x:\n", bit,phy->r_val[bit] ) ;
 	bit++ ;
 
 	switch(bit) {
@@ -1583,7 +1583,7 @@ static void pc_tcode_actions(struct s_sm
 		mib->fddiPORTMacIndicated.T_val = phy->t_val[9] ;
 		break ;
 	}
-	DB_PCMN(1,"SIG snd %x %x: \n", bit,phy->t_val[bit] ) ;
+	DB_PCMN(1,"SIG snd %x %x:\n", bit,phy->t_val[bit] ) ;
 }
 
 /*
Index: linux-kj/drivers/net/skfp/srf.c
===================================================================
--- linux-kj.orig/drivers/net/skfp/srf.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/skfp/srf.c	2005-09-21 01:35:53.000000000 +0400
@@ -414,7 +414,7 @@ static void smt_send_srf(struct s_smc *s
 	smt->smt_len = SMT_MAX_INFO_LEN - pcon.pc_len ;
 	mb->sm_len = smt->smt_len + sizeof(struct smt_header) ;
 
-	DB_SMT("SRF: sending SRF at %x, len %d \n",smt,mb->sm_len) ;
+	DB_SMT("SRF: sending SRF at %x, len %d\n",smt,mb->sm_len) ;
 	DB_SMT("SRF: state SR%d Threshold %d\n",
 		smc->srf.sr_state,smc->srf.SRThreshold/TICKS_PER_SECOND) ;
 #ifdef	DEBUG
Index: linux-kj/drivers/net/smc9194.c
===================================================================
--- linux-kj.orig/drivers/net/smc9194.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/smc9194.c	2005-09-21 01:35:53.000000000 +0400
@@ -541,7 +541,7 @@ static int smc_wait_to_send_packet( stru
 	numPages =  ((length & 0xfffe) + 6) / 256;
 
 	if (numPages > 7 ) {
-		printk(CARDNAME": Far too big packet error. \n");
+		printk(CARDNAME": Far too big packet error.\n");
 		/* freeing the packet is a good thing here... but should
 		 . any packets of this size get down here?   */
 		dev_kfree_skb (skb);
@@ -583,7 +583,7 @@ static int smc_wait_to_send_packet( stru
    	if ( !time_out ) {
 		/* oh well, wait until the chip finds memory later */
 		SMC_ENABLE_INT( IM_ALLOC_INT );
-      		PRINTK2((CARDNAME": memory allocation deferred. \n"));
+      		PRINTK2((CARDNAME": memory allocation deferred.\n"));
 		/* it's deferred, but I'll handle it later */
       		return 0;
    	}
@@ -623,7 +623,7 @@ static void smc_hardware_send_packet( st
 	ioaddr = dev->base_addr;
 
 	if ( !skb ) {
-		PRINTK((CARDNAME": In XMIT with no packet to send \n"));
+		PRINTK((CARDNAME": In XMIT with no packet to send\n"));
 		return;
 	}
 	length = ETH_ZLEN < skb->len ? skb->len : ETH_ZLEN;
@@ -633,7 +633,7 @@ static void smc_hardware_send_packet( st
 	packet_no = inb( ioaddr + PNR_ARR + 1 );
 	if ( packet_no & 0x80 ) {
 		/* or isn't there?  BAD CHIP! */
-		printk(KERN_DEBUG CARDNAME": Memory allocation failed. \n");
+		printk(KERN_DEBUG CARDNAME": Memory allocation failed.\n");
 		dev_kfree_skb_any(skb);
 		lp->saved_skb = NULL;
 		netif_wake_queue(dev);
@@ -698,7 +698,7 @@ static void smc_hardware_send_packet( st
 	/* and let the chipset deal with it */
 	outw( MC_ENQUEUE , ioaddr + MMU_CMD );
 
-	PRINTK2((CARDNAME": Sent packet of length %d \n",length));
+	PRINTK2((CARDNAME": Sent packet of length %d\n",length));
 
 	lp->saved_skb = NULL;
 	dev_kfree_skb_any (skb);
@@ -944,7 +944,7 @@ static int __init smc_probe(struct net_d
 	if ( !chip_ids[ ( revision_register  >> 4 ) & 0xF  ] ) {
 		/* I don't recognize this chip, so... */
 		printk(CARDNAME ": IO %x: Unrecognized revision register:"
-			" %x, Contact author. \n", ioaddr, revision_register );
+			" %x, Contact author.\n", ioaddr, revision_register );
 
 		retval = -ENODEV;
 		goto err_out;
@@ -1053,7 +1053,7 @@ static int __init smc_probe(struct net_d
 	printk("ADDR: ");
 	for (i = 0; i < 5; i++)
 		printk("%2.2x:", dev->dev_addr[i] );
-	printk("%2.2x \n", dev->dev_addr[5] );
+	printk("%2.2x\n", dev->dev_addr[5] );
 
 	/* set the private data to zero by default */
 	memset(dev->priv, 0, sizeof(struct smc_local));
@@ -1089,7 +1089,7 @@ static void print_packet( byte * buf, in
 	int remainder;
 	int lines;
 
-	printk("Packet of length %d \n", length );
+	printk("Packet of length %d\n", length );
 	lines = length / 16;
 	remainder = length % 16;
 
@@ -1217,7 +1217,7 @@ static void smc_rcv(struct net_device *d
 
 	if ( packet_number & FP_RXEMPTY ) {
 		/* we got called , but nothing was on the FIFO */
-		PRINTK((CARDNAME ": WARNING: smc_rcv with nothing on FIFO. \n"));
+		PRINTK((CARDNAME ": WARNING: smc_rcv with nothing on FIFO.\n"));
 		/* don't need to restore anything */
 		return;
 	}
@@ -1274,14 +1274,14 @@ static void smc_rcv(struct net_device *d
 		   to send the DWORDs or the bytes first, or some
 		   mixture.  A mixture might improve already slow PIO
 		   performance  */
-		PRINTK3((" Reading %d dwords (and %d bytes) \n",
+		PRINTK3((" Reading %d dwords (and %d bytes)\n",
 			packet_length >> 2, packet_length & 3 ));
 		insl(ioaddr + DATA_1 , data, packet_length >> 2 );
 		/* read the left over bytes */
 		insb( ioaddr + DATA_1, data + (packet_length & 0xFFFFFC),
 			packet_length & 0x3  );
 #else
-		PRINTK3((" Reading %d words and %d byte(s) \n",
+		PRINTK3((" Reading %d words and %d byte(s)\n",
 			(packet_length >> 1 ), packet_length & 1 ));
 		insw(ioaddr + DATA_1 , data, packet_length >> 1);
 		if ( packet_length & 1 ) {
@@ -1351,7 +1351,7 @@ static void smc_tx( struct net_device * 
 	outw( PTR_AUTOINC | PTR_READ, ioaddr + POINTER );
 
 	tx_status = inw( ioaddr + DATA_1 );
-	PRINTK3((CARDNAME": TX DONE STATUS: %4x \n", tx_status ));
+	PRINTK3((CARDNAME": TX DONE STATUS: %4x\n", tx_status ));
 
 	lp->stats.tx_errors++;
 	if ( tx_status & TS_LOSTCAR ) lp->stats.tx_carrier_errors++;
@@ -1365,7 +1365,7 @@ static void smc_tx( struct net_device * 
 #endif
 
 	if ( tx_status & TS_SUCCESS ) {
-		printk(CARDNAME": Successful packet caused interrupt \n");
+		printk(CARDNAME": Successful packet caused interrupt\n");
 	}
 	/* re-enable transmit */
 	SMC_SELECT_BANK( 0 );
@@ -1411,7 +1411,7 @@ static irqreturn_t smc_interrupt(int irq
 	int handled = 0;
 
 
-	PRINTK3((CARDNAME": SMC interrupt started \n"));
+	PRINTK3((CARDNAME": SMC interrupt started\n"));
 
 	saved_bank = inw( ioaddr + BANK_SELECT );
 
@@ -1426,7 +1426,7 @@ static irqreturn_t smc_interrupt(int irq
 	/* set a timeout value, so I don't stay here forever */
 	timeout = 4;
 
-	PRINTK2((KERN_WARNING CARDNAME ": MASK IS %x \n", mask ));
+	PRINTK2((KERN_WARNING CARDNAME ": MASK IS %x\n", mask ));
 	do {
 		/* read the status flag, and mask it */
 		status = inb( ioaddr + INTERRUPT ) & mask;
@@ -1436,7 +1436,7 @@ static irqreturn_t smc_interrupt(int irq
 		handled = 1;
 
 		PRINTK3((KERN_WARNING CARDNAME
-			": Handling interrupt status %x \n", status ));
+			": Handling interrupt status %x\n", status ));
 
 		if (status & IM_RCV_INT) {
 			/* Got a packet(s). */
@@ -1470,7 +1470,7 @@ static irqreturn_t smc_interrupt(int irq
 
 		} else if (status & IM_ALLOC_INT ) {
 			PRINTK2((KERN_DEBUG CARDNAME
-				": Allocation interrupt \n"));
+				": Allocation interrupt\n"));
 			/* clear this interrupt so it doesn't happen again */
 			mask &= ~IM_ALLOC_INT;
 
@@ -1488,9 +1488,9 @@ static irqreturn_t smc_interrupt(int irq
 			lp->stats.rx_fifo_errors++;
 			outb( IM_RX_OVRN_INT, ioaddr + INTERRUPT );
 		} else if (status & IM_EPH_INT ) {
-			PRINTK((CARDNAME ": UNSUPPORTED: EPH INTERRUPT \n"));
+			PRINTK((CARDNAME ": UNSUPPORTED: EPH INTERRUPT\n"));
 		} else if (status & IM_ERCV_INT ) {
-			PRINTK((CARDNAME ": UNSUPPORTED: ERCV INTERRUPT \n"));
+			PRINTK((CARDNAME ": UNSUPPORTED: ERCV INTERRUPT\n"));
 			outb( IM_ERCV_INT, ioaddr + INTERRUPT );
 		}
 	} while ( timeout -- );
@@ -1500,7 +1500,7 @@ static irqreturn_t smc_interrupt(int irq
 	SMC_SELECT_BANK( 2 );
 	outb( mask, ioaddr + INT_MASK );
 
-	PRINTK3(( KERN_WARNING CARDNAME ": MASK is now %x \n", mask ));
+	PRINTK3(( KERN_WARNING CARDNAME ": MASK is now %x\n", mask ));
 	outw( saved_pointer, ioaddr + POINTER );
 
 	SMC_SELECT_BANK( saved_bank );
Index: linux-kj/drivers/net/smc91x.c
===================================================================
--- linux-kj.orig/drivers/net/smc91x.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/smc91x.c	2005-09-21 01:35:53.000000000 +0400
@@ -1365,7 +1365,7 @@ static irqreturn_t smc_interrupt(int irq
 			smc_phy_interrupt(dev);
 		} else if (status & IM_ERCV_INT) {
 			SMC_ACK_INT(IM_ERCV_INT);
-			PRINTK("%s: UNSUPPORTED: ERCV INTERRUPT \n", dev->name);
+			PRINTK("%s: UNSUPPORTED: ERCV INTERRUPT\n", dev->name);
 		}
 	} while (--timeout);
 
Index: linux-kj/drivers/net/tg3.c
===================================================================
--- linux-kj.orig/drivers/net/tg3.c	2005-09-21 01:24:37.000000000 +0400
+++ linux-kj/drivers/net/tg3.c	2005-09-21 01:35:53.000000000 +0400
@@ -10650,7 +10650,7 @@ static int __devinit tg3_init_one(struct
 
 	printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] "
 	       "MIirq[%d] ASF[%d] Split[%d] WireSpeed[%d] "
-	       "TSOcap[%d] \n",
+	       "TSOcap[%d]\n",
 	       dev->name,
 	       (tp->tg3_flags & TG3_FLAG_RX_CHECKSUMS) != 0,
 	       (tp->tg3_flags & TG3_FLAG_USE_LINKCHG_REG) != 0,
Index: linux-kj/drivers/net/tlan.c
===================================================================
--- linux-kj.orig/drivers/net/tlan.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/tlan.c	2005-09-21 01:35:53.000000000 +0400
@@ -2474,7 +2474,7 @@ void TLan_PhyPrint( struct net_device *d
 		printk( "TLAN:   Device %s, Unmanaged PHY.\n", dev->name );
 	} else if ( phy <= TLAN_PHY_MAX_ADDR ) {
 		printk( "TLAN:   Device %s, PHY 0x%02x.\n", dev->name, phy );
-		printk( "TLAN:      Off.  +0     +1     +2     +3 \n" );
+		printk( "TLAN:      Off.  +0     +1     +2     +3\n" );
                 for ( i = 0; i < 0x20; i+= 4 ) {
 			printk( "TLAN:      0x%02x", i );
 			TLan_MiiReadReg( dev, phy, i, &data0 );
Index: linux-kj/drivers/net/tokenring/3c359.c
===================================================================
--- linux-kj.orig/drivers/net/tokenring/3c359.c	2005-09-21 01:23:34.000000000 +0400
+++ linux-kj/drivers/net/tokenring/3c359.c	2005-09-21 01:35:53.000000000 +0400
@@ -74,7 +74,7 @@ static char version[] __devinitdata  = 
 "3c359.c v1.2.0 2/17/01 - Mike Phillips (mikep@linuxtr.net)" ; 
 
 MODULE_AUTHOR("Mike Phillips <mikep@linuxtr.net>") ; 
-MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver \n") ;
+MODULE_DESCRIPTION("3Com 3C359 Velocity XL Token Ring Adapter Driver\n") ;
 
 /* Module paramters */
 
@@ -108,7 +108,7 @@ MODULE_PARM_DESC(pkt_buf_sz,"3c359: Init
 static int message_level[XL_MAX_ADAPTERS] = {0,} ; 
 
 module_param_array(message_level, int, NULL, 0) ;
-MODULE_PARM_DESC(message_level, "3c359: Level of reported messages \n") ; 
+MODULE_PARM_DESC(message_level, "3c359: Level of reported messages\n") ; 
 /* 
  *	This is a real nasty way of doing this, but otherwise you
  *	will be stuck with 1555 lines of hex #'s in the code.
@@ -162,19 +162,19 @@ static void print_tx_state(struct net_de
 	u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
 	int i ; 
 
-	printk("tx_ring_head: %d, tx_ring_tail: %d, free_ent: %d \n",xl_priv->tx_ring_head, 
+	printk("tx_ring_head: %d, tx_ring_tail: %d, free_ent: %d\n",xl_priv->tx_ring_head, 
 		xl_priv->tx_ring_tail, xl_priv->free_ring_entries) ; 
-	printk("Ring    , Address ,   FSH  , DnNextPtr, Buffer, Buffer_Len \n"); 
+	printk("Ring    , Address ,   FSH  , DnNextPtr, Buffer, Buffer_Len\n"); 
 	for (i = 0; i < 16; i++) {
 		txd = &(xl_priv->xl_tx_ring[i]) ; 
-		printk("%d, %08lx, %08x, %08x, %08x, %08x \n", i, virt_to_bus(txd), 
+		printk("%d, %08lx, %08x, %08x, %08x, %08x\n", i, virt_to_bus(txd), 
 			txd->framestartheader, txd->dnnextptr, txd->buffer, txd->buffer_length ) ; 
 	}
 
-	printk("DNLISTPTR = %04x \n", readl(xl_mmio + MMIO_DNLISTPTR) ); 
+	printk("DNLISTPTR = %04x\n", readl(xl_mmio + MMIO_DNLISTPTR) ); 
 	
-	printk("DmaCtl = %04x \n", readl(xl_mmio + MMIO_DMA_CTRL) ); 
-	printk("Queue status = %0x \n",netif_running(dev) ) ; 
+	printk("DmaCtl = %04x\n", readl(xl_mmio + MMIO_DMA_CTRL) ); 
+	printk("Queue status = %0x\n",netif_running(dev) ) ; 
 }
 
 static void print_rx_state(struct net_device *dev)
@@ -185,19 +185,19 @@ static void print_rx_state(struct net_de
 	u8 __iomem *xl_mmio = xl_priv->xl_mmio ; 
 	int i ; 
 
-	printk("rx_ring_tail: %d \n", xl_priv->rx_ring_tail) ; 
-	printk("Ring    , Address ,   FrameState  , UPNextPtr, FragAddr, Frag_Len \n"); 
+	printk("rx_ring_tail: %d\n", xl_priv->rx_ring_tail) ; 
+	printk("Ring    , Address ,   FrameState  , UPNextPtr, FragAddr, Frag_Len\n"); 
 	for (i = 0; i < 16; i++) { 
 		/* rxd = (struct xl_rx_desc *)xl_priv->rx_ring_dma_addr + (i * sizeof(struct xl_rx_desc)) ; */
 		rxd = &(xl_priv->xl_rx_ring[i]) ; 
-		printk("%d, %08lx, %08x, %08x, %08x, %08x \n", i, virt_to_bus(rxd), 
+		printk("%d, %08lx, %08x, %08x, %08x, %08x\n", i, virt_to_bus(rxd), 
 			rxd->framestatus, rxd->upnextptr, rxd->upfragaddr, rxd->upfraglen ) ; 
 	}
 
-	printk("UPLISTPTR = %04x \n", readl(xl_mmio + MMIO_UPLISTPTR) ); 
+	printk("UPLISTPTR = %04x\n", readl(xl_mmio + MMIO_UPLISTPTR) ); 
 	
-	printk("DmaCtl = %04x \n", readl(xl_mmio + MMIO_DMA_CTRL) ); 
-	printk("Queue status = %0x \n",netif_running(dev) ) ;
+	printk("DmaCtl = %04x\n", readl(xl_mmio + MMIO_DMA_CTRL) ); 
+	printk("Queue status = %0x\n",netif_running(dev) ) ;
 } 
 #endif
 
@@ -368,7 +368,7 @@ static int __init xl_init(struct net_dev
 {
     	struct xl_private *xl_priv = (struct xl_private *)dev->priv ;
 
-	printk(KERN_INFO "%s \n", version);
+	printk(KERN_INFO "%s\n", version);
 	printk(KERN_INFO "%s: I/O at %hx, MMIO at %p, using irq %d\n",
 		xl_priv->xl_card_name, (unsigned int)dev->base_addr ,xl_priv->xl_mmio, dev->irq);
 
@@ -434,7 +434,7 @@ static int xl_hw_reset(struct net_device
 	writel( (IO_WORD_READ | PMBAR),xl_mmio + MMIO_MAC_ACCESS_CMD);  
 
 #if XL_DEBUG
-	printk(KERN_INFO "Read from PMBAR = %04x \n", readw(xl_mmio + MMIO_MACDATA)) ; 
+	printk(KERN_INFO "Read from PMBAR = %04x\n", readw(xl_mmio + MMIO_MACDATA)) ; 
 #endif
 
 	if ( readw( (xl_mmio + MMIO_MACDATA))  & PMB_CPHOLD ) { 
@@ -557,9 +557,9 @@ static int xl_hw_reset(struct net_device
 #if XL_DEBUG
 	writel(IO_WORD_READ | SWITCHSETTINGS, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
 	if ( readw(xl_mmio + MMIO_MACDATA) & 2) { 
-		printk(KERN_INFO "Default ring speed 4 mbps \n") ;
+		printk(KERN_INFO "Default ring speed 4 mbps\n") ;
 	} else {
-		printk(KERN_INFO "Default ring speed 16 mbps \n") ; 
+		printk(KERN_INFO "Default ring speed 16 mbps\n") ; 
 	} 
 	printk(KERN_INFO "%s: xl_priv->srb = %04x\n",xl_priv->xl_card_name, xl_priv->srb);
 #endif
@@ -621,7 +621,7 @@ static int xl_open(struct net_device *de
 
 	if (open_err != 0) { /* Something went wrong with the open command */
 		if (open_err & 0x07) { /* Wrong speed, retry at different speed */
-			printk(KERN_WARNING "%s: Open Error, retrying at different ringspeed \n", dev->name) ; 
+			printk(KERN_WARNING "%s: Open Error, retrying at different ringspeed\n", dev->name) ; 
 			switchsettings = switchsettings ^ 2 ; 
 			xl_ee_write(dev,0x08,switchsettings) ; 
 			xl_hw_reset(dev) ; 
@@ -675,7 +675,7 @@ static int xl_open(struct net_device *de
 	}
 
 	if (i==0) { 
-		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers. Adapter disabled \n",dev->name) ; 
+		printk(KERN_WARNING "%s: Not enough memory to allocate rx buffers. Adapter disabled\n",dev->name) ; 
 		free_irq(dev->irq,dev) ; 
 		return -EIO ; 
 	} 
@@ -823,7 +823,7 @@ static int xl_open_hw(struct net_device 
  
 		writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 12, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
 		xl_priv->arb = ntohs(readw(xl_mmio + MMIO_MACDATA)) ; 
-		printk(", ARB: %04x \n",xl_priv->arb ) ; 
+		printk(", ARB: %04x\n",xl_priv->arb ) ; 
 		writel( (MEM_WORD_READ | 0xD0000 | xl_priv->srb) + 14, xl_mmio + MMIO_MAC_ACCESS_CMD) ; 
 		vsoff = ntohs(readw(xl_mmio + MMIO_MACDATA)) ; 
 
@@ -837,7 +837,7 @@ static int xl_open_hw(struct net_device 
 			ver_str[i] = readb(xl_mmio + MMIO_MACDATA) ; 
 		}
 		ver_str[i] = '\0' ; 
-		printk(KERN_INFO "%s: Microcode version String: %s \n",dev->name,ver_str); 
+		printk(KERN_INFO "%s: Microcode version String: %s\n",dev->name,ver_str); 
 	} 	
 	
 	/*
@@ -961,7 +961,7 @@ static void xl_rx(struct net_device *dev
 			skb = dev_alloc_skb(xl_priv->pkt_buf_sz) ; 
 
 			if (skb==NULL) { /* Still need to fix the rx ring */
-				printk(KERN_WARNING "%s: dev_alloc_skb failed in rx, single buffer \n",dev->name) ; 
+				printk(KERN_WARNING "%s: dev_alloc_skb failed in rx, single buffer\n",dev->name) ; 
 				adv_rx_ring(dev) ; 
 				xl_priv->xl_stats.rx_dropped++ ; 
 				writel(ACK_INTERRUPT | UPCOMPACK | LATCH_ACK , xl_mmio + MMIO_COMMAND) ; 
@@ -1070,7 +1070,7 @@ static irqreturn_t xl_interrupt(int irq,
 	 */
 	if (intstatus == 0x0001) {  
 		writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ;
-		printk(KERN_INFO "%s: 00001 int received \n",dev->name) ;  
+		printk(KERN_INFO "%s: 00001 int received\n",dev->name) ;  
 	} else {  
 		if (intstatus &	(HOSTERRINT | SRBRINT | ARBCINT | UPCOMPINT | DNCOMPINT | HARDERRINT | (1<<8) | TXUNDERRUN | ASBFINT)) { 
 			
@@ -1081,9 +1081,9 @@ static irqreturn_t xl_interrupt(int irq,
 			 */
 
 			if (intstatus & HOSTERRINT) {
-				printk(KERN_WARNING "%s: Host Error, performing global reset, intstatus = %04x \n",dev->name,intstatus) ; 
+				printk(KERN_WARNING "%s: Host Error, performing global reset, intstatus = %04x\n",dev->name,intstatus) ; 
 				writew( GLOBAL_RESET, xl_mmio + MMIO_COMMAND ) ;
-				printk(KERN_WARNING "%s: Resetting hardware: \n", dev->name); 
+				printk(KERN_WARNING "%s: Resetting hardware:\n", dev->name); 
 				netif_stop_queue(dev) ;
 				xl_freemem(dev) ; 
 				free_irq(dev->irq,dev); 	
@@ -1106,7 +1106,7 @@ static irqreturn_t xl_interrupt(int irq,
 					Must put a timeout check here ! */
 					/* Empty Loop */
 				} 
-				printk(KERN_WARNING "%s: TX Underrun received \n",dev->name) ;
+				printk(KERN_WARNING "%s: TX Underrun received\n",dev->name) ;
 				writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
 			} /* TxUnderRun */
 	
@@ -1135,13 +1135,13 @@ static irqreturn_t xl_interrupt(int irq,
 				macstatus = readw(xl_mmio + MMIO_MACDATA) ; 
 				printk(KERN_WARNING "%s: MacStatusError, details: ", dev->name);
 				if (macstatus & (1<<14)) 
-					printk(KERN_WARNING "tchk error: Unrecoverable error \n") ; 
+					printk(KERN_WARNING "tchk error: Unrecoverable error\n") ; 
 				if (macstatus & (1<<3))
-					printk(KERN_WARNING "eint error: Internal watchdog timer expired \n") ;
+					printk(KERN_WARNING "eint error: Internal watchdog timer expired\n") ;
 				if (macstatus & (1<<2))
-					printk(KERN_WARNING "aint error: Host tried to perform invalid operation \n") ; 
+					printk(KERN_WARNING "aint error: Host tried to perform invalid operation\n") ; 
 				printk(KERN_WARNING "Instatus = %02x, macstatus = %02x\n",intstatus,macstatus) ; 
-				printk(KERN_WARNING "%s: Resetting hardware: \n", dev->name); 
+				printk(KERN_WARNING "%s: Resetting hardware:\n", dev->name); 
 				netif_stop_queue(dev) ;
 				xl_freemem(dev) ; 
 				free_irq(dev->irq,dev); 
@@ -1153,7 +1153,7 @@ static irqreturn_t xl_interrupt(int irq,
 				return IRQ_HANDLED;
 			}
 		} else { 
-			printk(KERN_WARNING "%s: Received Unknown interrupt : %04x \n", dev->name, intstatus) ;
+			printk(KERN_WARNING "%s: Received Unknown interrupt : %04x\n", dev->name, intstatus) ;
 			writel(ACK_INTERRUPT | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 	
 		}
 	} 
@@ -1328,11 +1328,11 @@ static int xl_close(struct net_device *d
 
 	writel(MEM_BYTE_READ | 0xd0000 | xl_priv->srb, xl_mmio + MMIO_MAC_ACCESS_CMD);
 	if (readb(xl_mmio + MMIO_MACDATA) != CLOSE_NIC) { 
-		printk(KERN_INFO "%s: CLOSE_NIC did not get a CLOSE_NIC response \n",dev->name) ; 
+		printk(KERN_INFO "%s: CLOSE_NIC did not get a CLOSE_NIC response\n",dev->name) ; 
 	} else { 
 		writel((MEM_BYTE_READ | 0xd0000 | xl_priv->srb) +2, xl_mmio + MMIO_MAC_ACCESS_CMD) ;
 		if (readb(xl_mmio + MMIO_MACDATA)==0) { 
-			printk(KERN_INFO "%s: Adapter has been closed \n",dev->name) ;
+			printk(KERN_INFO "%s: Adapter has been closed\n",dev->name) ;
 			writew(ACK_INTERRUPT | SRBRACK | LATCH_ACK, xl_mmio + MMIO_COMMAND) ; 
 
 			xl_freemem(dev) ; 
@@ -1426,11 +1426,11 @@ static void xl_srb_bh(struct net_device 
 		printk(KERN_INFO "%s: Command: %d - Invalid Command code\n",dev->name,srb_cmd) ; 
 		break ; 
 	case 4:
-		printk(KERN_INFO "%s: Command: %d - Adapter is closed, must be open for this command \n",dev->name,srb_cmd) ; 
+		printk(KERN_INFO "%s: Command: %d - Adapter is closed, must be open for this command\n",dev->name,srb_cmd) ; 
 		break ;
 	
 	case 6:
-		printk(KERN_INFO "%s: Command: %d - Options Invalid for command \n",dev->name,srb_cmd) ;
+		printk(KERN_INFO "%s: Command: %d - Options Invalid for command\n",dev->name,srb_cmd) ;
 		break ;
 
 	case 0: /* Successful command execution */ 
@@ -1451,11 +1451,11 @@ static void xl_srb_bh(struct net_device 
 			break ; 
 		case SET_FUNC_ADDRESS:
 			if(xl_priv->xl_message_level) 
-				printk(KERN_INFO "%s: Functional Address Set \n",dev->name) ;  
+				printk(KERN_INFO "%s: Functional Address Set\n",dev->name) ;  
 			break ; 
 		case CLOSE_NIC:
 			if(xl_priv->xl_message_level)
-				printk(KERN_INFO "%s: Received CLOSE_NIC interrupt in interrupt handler \n",dev->name) ; 	
+				printk(KERN_INFO "%s: Received CLOSE_NIC interrupt in interrupt handler\n",dev->name) ; 	
 			break ; 
 		case SET_MULTICAST_MODE:
 			if(xl_priv->xl_message_level)
@@ -1464,9 +1464,9 @@ static void xl_srb_bh(struct net_device 
 		case SET_RECEIVE_MODE:
 			if(xl_priv->xl_message_level) {  
 				if (xl_priv->xl_copy_all_options == 0x0004) 
-					printk(KERN_INFO "%s: Entering promiscuous mode \n", dev->name) ; 
+					printk(KERN_INFO "%s: Entering promiscuous mode\n", dev->name) ; 
 				else
-					printk(KERN_INFO "%s: Entering normal receive mode \n",dev->name) ; 
+					printk(KERN_INFO "%s: Entering normal receive mode\n",dev->name) ; 
 			}
 			break ; 
  
@@ -1542,20 +1542,20 @@ static void xl_arb_cmd(struct net_device
 			xl_freemem(dev) ; 
 			free_irq(dev->irq,dev);
 			
-			printk(KERN_WARNING "%s: Adapter has been closed \n", dev->name) ; 
+			printk(KERN_WARNING "%s: Adapter has been closed\n", dev->name) ; 
 		} /* If serious error */
 		
 		if (xl_priv->xl_message_level) { 
 			if (lan_status_diff & LSC_SIG_LOSS) 
-					printk(KERN_WARNING "%s: No receive signal detected \n", dev->name) ; 
+					printk(KERN_WARNING "%s: No receive signal detected\n", dev->name) ; 
 			if (lan_status_diff & LSC_HARD_ERR)
-					printk(KERN_INFO "%s: Beaconing \n",dev->name);
+					printk(KERN_INFO "%s: Beaconing\n",dev->name);
 			if (lan_status_diff & LSC_SOFT_ERR)
-					printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n",dev->name);
+					printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
 			if (lan_status_diff & LSC_TRAN_BCN) 
 					printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name);
 			if (lan_status_diff & LSC_SS) 
-					printk(KERN_INFO "%s: Single Station on the ring \n", dev->name);
+					printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
 			if (lan_status_diff & LSC_RING_REC)
 					printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name);
 			if (lan_status_diff & LSC_FDX_MODE)
@@ -1564,7 +1564,7 @@ static void xl_arb_cmd(struct net_device
 		
 		if (lan_status_diff & LSC_CO) { 
 				if (xl_priv->xl_message_level) 
-					printk(KERN_INFO "%s: Counter Overflow \n", dev->name);
+					printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
 				/* Issue READ.LOG command */
 				xl_srb_cmd(dev, READ_LOG) ; 	
 		}
@@ -1580,7 +1580,7 @@ static void xl_arb_cmd(struct net_device
 	}  /* Lan.change.status */
 	else if ( arb_cmd == RECEIVE_DATA) { /* Received.Data */
 #if XL_DEBUG
-		printk(KERN_INFO "Received.Data \n") ; 
+		printk(KERN_INFO "Received.Data\n") ; 
 #endif 		
 		writel( ((MEM_WORD_READ | 0xD0000 | xl_priv->arb) + 6), xl_mmio + MMIO_MAC_ACCESS_CMD) ;
 		xl_priv->mac_buffer = ntohs(readw(xl_mmio + MMIO_MACDATA)) ;
@@ -1616,7 +1616,7 @@ static void xl_arb_cmd(struct net_device
 		xl_asb_cmd(dev) ; 
 		
 	} else {
-		printk(KERN_WARNING "%s: Received unknown arb (xl_priv) command: %02x \n",dev->name,arb_cmd) ; 
+		printk(KERN_WARNING "%s: Received unknown arb (xl_priv) command: %02x\n",dev->name,arb_cmd) ; 
 	}
 
 	/* Acknowledge the arb interrupt */
@@ -1673,13 +1673,13 @@ static void xl_asb_bh(struct net_device 
 	ret_code = readb(xl_mmio + MMIO_MACDATA) ; 
 	switch (ret_code) { 
 		case 0x01:
-			printk(KERN_INFO "%s: ASB Command, unrecognized command code \n",dev->name) ;
+			printk(KERN_INFO "%s: ASB Command, unrecognized command code\n",dev->name) ;
 			break ;
 		case 0x26:
-			printk(KERN_INFO "%s: ASB Command, unexpected receive buffer \n", dev->name) ; 
+			printk(KERN_INFO "%s: ASB Command, unexpected receive buffer\n", dev->name) ; 
 			break ; 
 		case 0x40:
-			printk(KERN_INFO "%s: ASB Command, Invalid Station ID \n", dev->name) ; 
+			printk(KERN_INFO "%s: ASB Command, Invalid Station ID\n", dev->name) ; 
 			break ;  
 	}
 	xl_priv->asb_queued = 0 ; 
Index: linux-kj/drivers/net/tokenring/lanstreamer.c
===================================================================
--- linux-kj.orig/drivers/net/tokenring/lanstreamer.c	2005-09-21 01:23:34.000000000 +0400
+++ linux-kj/drivers/net/tokenring/lanstreamer.c	2005-09-21 01:35:53.000000000 +0400
@@ -359,7 +359,7 @@ static int __devinit streamer_init_one(s
 	pcr |= PCI_COMMAND_SERR;
 	pci_write_config_word (pdev, PCI_COMMAND, pcr);
 
-	printk("%s \n", version);
+	printk("%s\n", version);
 	printk("%s: %s. I/O at %hx, MMIO at %p, using irq %d\n",dev->name,
 		streamer_priv->streamer_card_name,
 		(unsigned int) dev->base_addr,
@@ -658,7 +658,7 @@ static int streamer_open(struct net_devi
 #if STREAMER_DEBUG
 		writew(readw(streamer_mmio + LAPWWO),
 		       streamer_mmio + LAPA);
-		printk("srb open request: \n");
+		printk("srb open request:\n");
 		for (i = 0; i < 16; i++) {
 			printk("%x:", ntohs(readw(streamer_mmio + LAPDINC)));
 		}
@@ -706,7 +706,7 @@ static int streamer_open(struct net_devi
 		if (srb_word != 0) {
 			if (srb_word == 0x07) {
 				if (!streamer_priv->streamer_ring_speed && open_finished) {	/* Autosense , first time around */
-					printk(KERN_WARNING "%s: Retrying at different ring speed \n",
+					printk(KERN_WARNING "%s: Retrying at different ring speed\n",
 					       dev->name);
 					open_finished = 0;
 				} else {
@@ -722,7 +722,7 @@ static int streamer_open(struct net_devi
 					    && ((error_code & 0x0f) == 0x0d)) 
 					{
 						printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n", dev->name);
-						printk(KERN_WARNING "%s: Please try again with a specified ring speed \n", dev->name);
+						printk(KERN_WARNING "%s: Please try again with a specified ring speed\n", dev->name);
 						free_irq(dev->irq, dev);
 						return -EIO;
 					}
@@ -928,7 +928,7 @@ static void streamer_rx(struct net_devic
 
 		if (rx_desc->status & 0x7E830000) {	/* errors */
 			if (streamer_priv->streamer_message_level) {
-				printk(KERN_WARNING "%s: Rx Error %x \n",
+				printk(KERN_WARNING "%s: Rx Error %x\n",
 				       dev->name, rx_desc->status);
 			}
 		} else {	/* received without errors */
@@ -941,7 +941,7 @@ static void streamer_rx(struct net_devic
 
 			if (skb == NULL) 
 			{
-				printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n",	dev->name);
+				printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n",	dev->name);
 				streamer_priv->streamer_stats.rx_dropped++;
 			} else {	/* we allocated an skb OK */
 				skb->dev = dev;
@@ -1368,7 +1368,7 @@ static void streamer_srb_bh(struct net_d
 		case 0x00:
 		        break;
 		case 0x01:
-			printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name);
+			printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name);
 			break;
 		case 0x04:
 			printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1396,13 +1396,13 @@ static void streamer_srb_bh(struct net_d
 		case 0x00:
 		        break;
 		case 0x01:
-			printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name);
+			printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
 			break;
 		case 0x04:
 			printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
 			break;
 		case 0x39:	/* Must deal with this if individual multicast addresses used */
-			printk(KERN_INFO "%s: Group address not found \n", dev->name);
+			printk(KERN_INFO "%s: Group address not found\n", dev->name);
 			break;
 		default:
 			break;
@@ -1418,10 +1418,10 @@ static void streamer_srb_bh(struct net_d
 		switch (srb_word) {
 		case 0x00:
 			if (streamer_priv->streamer_message_level)
-				printk(KERN_INFO "%s: Functional Address Mask Set \n", dev->name);
+				printk(KERN_INFO "%s: Functional Address Mask Set\n", dev->name);
 			break;
 		case 0x01:
-			printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name);
+			printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
 			break;
 		case 0x04:
 			printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1452,7 +1452,7 @@ static void streamer_srb_bh(struct net_d
 			}
 			break;
 		case 0x01:
-			printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name);
+			printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
 			break;
 		case 0x04:
 			printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1471,7 +1471,7 @@ static void streamer_srb_bh(struct net_d
 				printk(KERN_INFO "%s: Read Source Routing Counters issued\n", dev->name);
 			break;
 		case 0x01:
-			printk(KERN_WARNING "%s: Unrecognized srb command \n", dev->name);
+			printk(KERN_WARNING "%s: Unrecognized srb command\n", dev->name);
 			break;
 		case 0x04:
 			printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n", dev->name);
@@ -1567,7 +1567,7 @@ static void streamer_arb_cmd(struct net_
 					     (streamer_mmio + LAPDINC)));
 			}
 
-			printk("next %04x, fs %02x, len %04x \n", next,
+			printk("next %04x, fs %02x, len %04x\n", next,
 			       status, len);
 		}
 #endif
@@ -1603,16 +1603,16 @@ static void streamer_arb_cmd(struct net_
 		} while (next_ptr && (buff_off = next_ptr));
 
 #if STREAMER_NETWORK_MONITOR
-		printk(KERN_WARNING "%s: Received MAC Frame, details: \n",
+		printk(KERN_WARNING "%s: Received MAC Frame, details:\n",
 		       dev->name);
 		mac_hdr = (struct trh_hdr *) mac_frame->data;
 		printk(KERN_WARNING
-		       "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n",
+		       "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
 		       dev->name, mac_hdr->daddr[0], mac_hdr->daddr[1],
 		       mac_hdr->daddr[2], mac_hdr->daddr[3],
 		       mac_hdr->daddr[4], mac_hdr->daddr[5]);
 		printk(KERN_WARNING
-		       "%s: MAC Frame Srce. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n",
+		       "%s: MAC Frame Srce. Addr: %02x:%02x:%02x:%02x:%02x:%02x\n",
 		       dev->name, mac_hdr->saddr[0], mac_hdr->saddr[1],
 		       mac_hdr->saddr[2], mac_hdr->saddr[3],
 		       mac_hdr->saddr[4], mac_hdr->saddr[5]);
@@ -1685,15 +1685,15 @@ drop_frame:
 		/* If serious error */
 		if (streamer_priv->streamer_message_level) {
 			if (lan_status_diff & LSC_SIG_LOSS)
-				printk(KERN_WARNING "%s: No receive signal detected \n", dev->name);
+				printk(KERN_WARNING "%s: No receive signal detected\n", dev->name);
 			if (lan_status_diff & LSC_HARD_ERR) 
-				printk(KERN_INFO "%s: Beaconing \n", dev->name);
+				printk(KERN_INFO "%s: Beaconing\n", dev->name);
 			if (lan_status_diff & LSC_SOFT_ERR)
-				printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n", dev->name);
+				printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n", dev->name);
 			if (lan_status_diff & LSC_TRAN_BCN)
 				printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n", dev->name);
 			if (lan_status_diff & LSC_SS)
-				printk(KERN_INFO "%s: Single Station on the ring \n", dev->name);
+				printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
 			if (lan_status_diff & LSC_RING_REC)
 				printk(KERN_INFO "%s: Ring recovery ongoing\n", dev->name);
 			if (lan_status_diff & LSC_FDX_MODE)
@@ -1702,7 +1702,7 @@ drop_frame:
 
 		if (lan_status_diff & LSC_CO) {
 			if (streamer_priv->streamer_message_level)
-				printk(KERN_INFO "%s: Counter Overflow \n", dev->name);
+				printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
 
 			/* Issue READ.LOG command */
 
@@ -1732,7 +1732,7 @@ drop_frame:
 		streamer_priv->streamer_lan_status = lan_status;
 	} /* Lan.change.status */
 	else
-		printk(KERN_WARNING "%s: Unknown arb command \n", dev->name);
+		printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
 }
 
 static void streamer_asb_bh(struct net_device *dev)
@@ -1763,10 +1763,10 @@ static void streamer_asb_bh(struct net_d
 		rc=ntohs(readw(streamer_mmio+LAPD)) >> 8;
 		switch (rc) {
 		case 0x01:
-			printk(KERN_WARNING "%s: Unrecognized command code \n", dev->name);
+			printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
 			break;
 		case 0x26:
-			printk(KERN_WARNING "%s: Unrecognized buffer address \n", dev->name);
+			printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
 			break;
 		case 0xFF:
 			/* Valid response, everything should be ok again */
@@ -1898,10 +1898,10 @@ static int sprintf_info(char *buffer, st
 		    ntohs(spt.acc_priority), ntohs(spt.auth_source_class),
 		    ntohs(spt.att_code));
 
-	size += sprintf(buffer + size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n", dev->name);
+	size += sprintf(buffer + size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl :\n", dev->name);
 
 	size += sprintf(buffer + size,
-		    "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
+		    "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     :\n",
 		    dev->name, spt.source_addr[0], spt.source_addr[1],
 		    spt.source_addr[2], spt.source_addr[3],
 		    spt.source_addr[4], spt.source_addr[5],
@@ -1909,11 +1909,11 @@ static int sprintf_info(char *buffer, st
 		    ntohs(spt.lan_status), ntohs(spt.local_ring),
 		    ntohs(spt.mon_error), ntohs(spt.frame_correl));
 
-	size += sprintf(buffer + size, "%6s: Beacon Details :  Tx  :  Rx  : NAUN Node Address : NAUN Node Phys : \n",
+	size += sprintf(buffer + size, "%6s: Beacon Details :  Tx  :  Rx  : NAUN Node Address : NAUN Node Phys :\n",
 		    dev->name);
 
 	size += sprintf(buffer + size,
-		    "%6s:                :  %02x  :  %02x  : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x    : \n",
+		    "%6s:                :  %02x  :  %02x  : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x    :\n",
 		    dev->name, ntohs(spt.beacon_transmit),
 		    ntohs(spt.beacon_receive), spt.beacon_naun[0],
 		    spt.beacon_naun[1], spt.beacon_naun[2],
Index: linux-kj/drivers/net/tokenring/olympic.c
===================================================================
--- linux-kj.orig/drivers/net/tokenring/olympic.c	2005-09-21 01:25:28.000000000 +0400
+++ linux-kj/drivers/net/tokenring/olympic.c	2005-09-21 01:35:53.000000000 +0400
@@ -305,7 +305,7 @@ static int __devinit olympic_init(struct
     	olympic_priv=(struct olympic_private *)dev->priv;
 	olympic_mmio=olympic_priv->olympic_mmio;
 
-	printk("%s \n", version);
+	printk("%s\n", version);
 	printk("%s. I/O at %hx, MMIO at %p, LAP at %p, using irq %d\n", olympic_priv->olympic_card_name, (unsigned int) dev->base_addr,olympic_priv->olympic_mmio, olympic_priv->olympic_lap, dev->irq);
 
 	writel(readl(olympic_mmio+BCTL) | BCTL_SOFTRESET,olympic_mmio+BCTL);
@@ -473,7 +473,7 @@ static int olympic_open(struct net_devic
 #if OLYMPIC_DEBUG
 	printk("LAPWWO: %x, LAPA: %x\n",readw(olympic_mmio+LAPWWO), readl(olympic_mmio+LAPA));
 	printk("SISR Mask = %04x\n", readl(olympic_mmio+SISR_MASK));
-	printk("Before the open command \n");
+	printk("Before the open command\n");
 #endif	
 	do {
 		memset_io(init_srb,0,SRB_COMMAND_SIZE);
@@ -525,7 +525,7 @@ static int olympic_open(struct net_devic
             			break;
         		}
 			if ((jiffies-t) > 10*HZ) { 
-				printk(KERN_WARNING "%s: SRB timed out. \n",dev->name) ; 
+				printk(KERN_WARNING "%s: SRB timed out.\n",dev->name) ; 
 				olympic_priv->srb_queued=0;
 				break ; 
 			} 
@@ -554,7 +554,7 @@ static int olympic_open(struct net_devic
 			break;
 		case 0x07:
 			if (!olympic_priv->olympic_ring_speed && open_finished) { /* Autosense , first time around */
-				printk(KERN_WARNING "%s: Retrying at different ring speed \n", dev->name); 
+				printk(KERN_WARNING "%s: Retrying at different ring speed\n", dev->name); 
 				open_finished = 0 ;  
 				continue;
 			}
@@ -563,7 +563,7 @@ static int olympic_open(struct net_devic
 
 			if (!olympic_priv->olympic_ring_speed && ((err & 0x0f) == 0x0d)) { 
 				printk(KERN_WARNING "%s: Tried to autosense ring speed with no monitors present\n",dev->name);
-				printk(KERN_WARNING "%s: Please try again with a specified ring speed \n",dev->name);
+				printk(KERN_WARNING "%s: Please try again with a specified ring speed\n",dev->name);
 			} else {
 				printk(KERN_WARNING "%s: %s - %s\n", dev->name,
 					open_maj_error[(err & 0xf0) >> 4],
@@ -776,7 +776,7 @@ static void olympic_rx(struct net_device
 		olympic_priv->rx_status_last_received++ ;
 		olympic_priv->rx_status_last_received &= (OLYMPIC_RX_RING_SIZE -1);
 #if OLYMPIC_DEBUG
-		printk("rx status: %x rx len: %x \n", le32_to_cpu(rx_status->status_buffercnt), le32_to_cpu(rx_status->fragmentcnt_framelen));
+		printk("rx status: %x rx len: %x\n", le32_to_cpu(rx_status->status_buffercnt), le32_to_cpu(rx_status->fragmentcnt_framelen));
 #endif
 		length = le32_to_cpu(rx_status->fragmentcnt_framelen) & 0xffff;
 		buffer_cnt = le32_to_cpu(rx_status->status_buffercnt) & 0xffff; 
@@ -791,15 +791,15 @@ static void olympic_rx(struct net_device
 			if (l_status_buffercnt & 0x3B000000) {
 				if (olympic_priv->olympic_message_level) {
 					if (l_status_buffercnt & (1<<29))  /* Rx Frame Truncated */
-						printk(KERN_WARNING "%s: Rx Frame Truncated \n",dev->name);
+						printk(KERN_WARNING "%s: Rx Frame Truncated\n",dev->name);
 					if (l_status_buffercnt & (1<<28)) /*Rx receive overrun */
-						printk(KERN_WARNING "%s: Rx Frame Receive overrun \n",dev->name);
+						printk(KERN_WARNING "%s: Rx Frame Receive overrun\n",dev->name);
 					if (l_status_buffercnt & (1<<27)) /* No receive buffers */
-						printk(KERN_WARNING "%s: No receive buffers \n",dev->name);
+						printk(KERN_WARNING "%s: No receive buffers\n",dev->name);
 					if (l_status_buffercnt & (1<<25)) /* Receive frame error detect */
-						printk(KERN_WARNING "%s: Receive frame error detect \n",dev->name);
+						printk(KERN_WARNING "%s: Receive frame error detect\n",dev->name);
 					if (l_status_buffercnt & (1<<24)) /* Received Error Detect */
-						printk(KERN_WARNING "%s: Received Error Detect \n",dev->name);
+						printk(KERN_WARNING "%s: Received Error Detect\n",dev->name);
 				} 
 				olympic_priv->rx_ring_last_received += i ; 
 				olympic_priv->rx_ring_last_received &= (OLYMPIC_RX_RING_SIZE -1) ; 
@@ -813,7 +813,7 @@ static void olympic_rx(struct net_device
 				}
 
 				if (skb == NULL) {
-					printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers. \n",dev->name) ;
+					printk(KERN_WARNING "%s: Not enough memory to copy packet to upper layers.\n",dev->name) ;
 					olympic_priv->olympic_stats.rx_dropped++ ; 
 					/* Update counters even though we don't transfer the frame */
 					olympic_priv->rx_ring_last_received += i ; 
@@ -1116,7 +1116,7 @@ static int olympic_close(struct net_devi
         	}
 
 		if (t == 0) { 
-			printk(KERN_WARNING "%s: SRB timed out. May not be fatal. \n",dev->name) ; 
+			printk(KERN_WARNING "%s: SRB timed out. May not be fatal.\n",dev->name) ; 
 		} 
 		olympic_priv->srb_queued=0;
     	}
@@ -1255,7 +1255,7 @@ static void olympic_srb_bh(struct net_de
 				case 0x00:
 					break ; 
 				case 0x01:
-					printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+					printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name) ; 
 					break ;
 				case 0x04:
 					printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name); 
@@ -1282,13 +1282,13 @@ static void olympic_srb_bh(struct net_de
 				case 0x00:
 					break ; 
 				case 0x01:
-					printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+					printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name) ; 
 					break ; 
 				case 0x04:
 					printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
 					break ; 
 				case 0x39: /* Must deal with this if individual multicast addresses used */
-					printk(KERN_INFO "%s: Group address not found \n",dev->name); 
+					printk(KERN_INFO "%s: Group address not found\n",dev->name); 
 					break ;
 				default:
 					break ; 
@@ -1303,10 +1303,10 @@ static void olympic_srb_bh(struct net_de
 			switch (readb(srb+2)) { 
 				case 0x00:
 					if (olympic_priv->olympic_message_level)
-						printk(KERN_INFO "%s: Functional Address Mask Set \n",dev->name) ; 
+						printk(KERN_INFO "%s: Functional Address Mask Set\n",dev->name) ; 
 					break ;
 				case 0x01:
-					printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+					printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name) ; 
 					break ; 
 				case 0x04:
 					printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
@@ -1326,7 +1326,7 @@ static void olympic_srb_bh(struct net_de
 						printk(KERN_INFO "%s: Read Log issued\n",dev->name) ; 
 					break ; 
 				case 0x01:
-					printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+					printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name) ; 
 					break ; 
 				case 0x04:
 					printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
@@ -1344,7 +1344,7 @@ static void olympic_srb_bh(struct net_de
 						printk(KERN_INFO "%s: Read Source Routing Counters issued\n",dev->name) ; 
 					break ; 
 				case 0x01:
-					printk(KERN_WARNING "%s: Unrecognized srb command \n",dev->name) ; 
+					printk(KERN_WARNING "%s: Unrecognized srb command\n",dev->name) ; 
 					break ; 
 				case 0x04:
 					printk(KERN_WARNING "%s: Adapter must be open for this operation, doh!!\n",dev->name) ; 
@@ -1427,7 +1427,7 @@ static void olympic_arb_cmd(struct net_d
 			printk("Loc %d = %02x\n",i,readb(frame_data + i)); 
 		}
 
-		printk("next %04x, fs %02x, len %04x \n",readw(buf_ptr+offsetof(struct mac_receive_buffer,next)), readb(buf_ptr+offsetof(struct mac_receive_buffer,frame_status)), readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length))); 
+		printk("next %04x, fs %02x, len %04x\n",readw(buf_ptr+offsetof(struct mac_receive_buffer,next)), readb(buf_ptr+offsetof(struct mac_receive_buffer,frame_status)), readw(buf_ptr+offsetof(struct mac_receive_buffer,buffer_length))); 
 }
 #endif 
 		mac_frame = dev_alloc_skb(frame_len) ; 
@@ -1447,10 +1447,10 @@ static void olympic_arb_cmd(struct net_d
 
 		if (olympic_priv->olympic_network_monitor) { 
 			struct trh_hdr *mac_hdr ; 
-			printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name) ;
+			printk(KERN_WARNING "%s: Received MAC Frame, details:\n",dev->name) ;
 			mac_hdr = (struct trh_hdr *)mac_frame->data ; 
-			printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n", dev->name , mac_hdr->daddr[0], mac_hdr->daddr[1], mac_hdr->daddr[2], mac_hdr->daddr[3], mac_hdr->daddr[4], mac_hdr->daddr[5]) ; 
-			printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %02x:%02x:%02x:%02x:%02x:%02x \n", dev->name , mac_hdr->saddr[0], mac_hdr->saddr[1], mac_hdr->saddr[2], mac_hdr->saddr[3], mac_hdr->saddr[4], mac_hdr->saddr[5]) ; 
+			printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name , mac_hdr->daddr[0], mac_hdr->daddr[1], mac_hdr->daddr[2], mac_hdr->daddr[3], mac_hdr->daddr[4], mac_hdr->daddr[5]) ; 
+			printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %02x:%02x:%02x:%02x:%02x:%02x\n", dev->name , mac_hdr->saddr[0], mac_hdr->saddr[1], mac_hdr->saddr[2], mac_hdr->saddr[3], mac_hdr->saddr[4], mac_hdr->saddr[5]) ; 
 		}
 		mac_frame->dev = dev ; 
 		mac_frame->protocol = tr_type_trans(mac_frame,dev);
@@ -1511,20 +1511,20 @@ drop_frame:
 			writel(readl(olympic_mmio+BCTL)&~(3<<13),olympic_mmio+BCTL);
 			netif_stop_queue(dev);
 			olympic_priv->srb = readw(olympic_priv->olympic_lap + LAPWWO) ; 
-			printk(KERN_WARNING "%s: Adapter has been closed \n", dev->name) ; 
+			printk(KERN_WARNING "%s: Adapter has been closed\n", dev->name) ; 
 		} /* If serious error */
 		
 		if (olympic_priv->olympic_message_level) { 
 			if (lan_status_diff & LSC_SIG_LOSS) 
-					printk(KERN_WARNING "%s: No receive signal detected \n", dev->name) ; 
+					printk(KERN_WARNING "%s: No receive signal detected\n", dev->name) ; 
 			if (lan_status_diff & LSC_HARD_ERR)
-					printk(KERN_INFO "%s: Beaconing \n",dev->name);
+					printk(KERN_INFO "%s: Beaconing\n",dev->name);
 			if (lan_status_diff & LSC_SOFT_ERR)
-					printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame \n",dev->name);
+					printk(KERN_WARNING "%s: Adapter transmitted Soft Error Report Mac Frame\n",dev->name);
 			if (lan_status_diff & LSC_TRAN_BCN) 
 					printk(KERN_INFO "%s: We are tranmitting the beacon, aaah\n",dev->name);
 			if (lan_status_diff & LSC_SS) 
-					printk(KERN_INFO "%s: Single Station on the ring \n", dev->name);
+					printk(KERN_INFO "%s: Single Station on the ring\n", dev->name);
 			if (lan_status_diff & LSC_RING_REC)
 					printk(KERN_INFO "%s: Ring recovery ongoing\n",dev->name);
 			if (lan_status_diff & LSC_FDX_MODE)
@@ -1534,7 +1534,7 @@ drop_frame:
 		if (lan_status_diff & LSC_CO) { 
 					
 				if (olympic_priv->olympic_message_level) 
-					printk(KERN_INFO "%s: Counter Overflow \n", dev->name);
+					printk(KERN_INFO "%s: Counter Overflow\n", dev->name);
 					
 				/* Issue READ.LOG command */
 
@@ -1573,7 +1573,7 @@ drop_frame:
 	
 	}  /* Lan.change.status */
 	else
-		printk(KERN_WARNING "%s: Unknown arb command \n", dev->name);
+		printk(KERN_WARNING "%s: Unknown arb command\n", dev->name);
 }
 
 static void olympic_asb_bh(struct net_device *dev) 
@@ -1600,10 +1600,10 @@ static void olympic_asb_bh(struct net_de
 	if (olympic_priv->asb_queued == 2) { 
 		switch (readb(asb_block+2)) {
 			case 0x01:
-				printk(KERN_WARNING "%s: Unrecognized command code \n", dev->name);
+				printk(KERN_WARNING "%s: Unrecognized command code\n", dev->name);
 				break ;
 			case 0x26:
-				printk(KERN_WARNING "%s: Unrecognized buffer address \n", dev->name);
+				printk(KERN_WARNING "%s: Unrecognized buffer address\n", dev->name);
 				break ;
 			case 0xFF:
 				/* Valid response, everything should be ok again */
@@ -1699,10 +1699,10 @@ static int olympic_proc_info(char *buffe
 	  swab16(readw(opt+offsetof(struct olympic_parameters_table, auth_source_class))),
 	  swab16(readw(opt+offsetof(struct olympic_parameters_table, att_code))));
 
-	size += sprintf(buffer+size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n",
+	size += sprintf(buffer+size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl :\n",
 	  dev->name) ; 
 	
-	size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
+	size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x:%02x:%02x : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     :\n",
 	  dev->name,
 	  readb(opt+offsetof(struct olympic_parameters_table, source_addr)),
 	  readb(opt+offsetof(struct olympic_parameters_table, source_addr)+1),
@@ -1717,10 +1717,10 @@ static int olympic_proc_info(char *buffe
 	  swab16(readw(opt+offsetof(struct olympic_parameters_table, mon_error))),
 	  swab16(readw(opt+offsetof(struct olympic_parameters_table, frame_correl))));
 
-	size += sprintf(buffer+size, "%6s: Beacon Details :  Tx  :  Rx  : NAUN Node Address : NAUN Node Phys : \n",
+	size += sprintf(buffer+size, "%6s: Beacon Details :  Tx  :  Rx  : NAUN Node Address : NAUN Node Phys :\n",
 	  dev->name) ; 
 
-	size += sprintf(buffer+size, "%6s:                :  %02x  :  %02x  : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x    : \n",
+	size += sprintf(buffer+size, "%6s:                :  %02x  :  %02x  : %02x:%02x:%02x:%02x:%02x:%02x : %02x:%02x:%02x:%02x    :\n",
 	  dev->name,
 	  swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_transmit))),
 	  swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_receive))),
Index: linux-kj/drivers/net/tokenring/tms380tr.c
===================================================================
--- linux-kj.orig/drivers/net/tokenring/tms380tr.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/tokenring/tms380tr.c	2005-09-21 01:35:53.000000000 +0400
@@ -1390,7 +1390,7 @@ static int tms380tr_bringup_diags(struct
 			Status &= STS_MASK;
 
 			if(tms380tr_debug > 3)
-				printk(KERN_DEBUG " %04X \n", Status);
+				printk(KERN_DEBUG " %04X\n", Status);
 			/* BUD successfully completed */
 			if(Status == STS_INITIALIZE)
 				return (1);
@@ -1846,7 +1846,7 @@ static void tms380tr_chk_irq(struct net_
 			break;
 
 		case DMA_WRITE_ABORT:
-			printk(KERN_INFO "%s: DMA write operation aborted: \n",
+			printk(KERN_INFO "%s: DMA write operation aborted:\n",
 				dev->name);
 			switch (AdapterCheckBlock[1])
 			{
Index: linux-kj/drivers/net/tulip/de4x5.c
===================================================================
--- linux-kj.orig/drivers/net/tulip/de4x5.c	2005-09-21 01:23:36.000000000 +0400
+++ linux-kj/drivers/net/tulip/de4x5.c	2005-09-21 01:35:53.000000000 +0400
@@ -5119,7 +5119,7 @@ mii_get_phy(struct net_device *dev)
 	    lp->phy[k].spd.value = GENERIC_VALUE;  /* TX & T4, H/F Duplex    */
 	    lp->mii_cnt++;
 	    lp->active++;
-	    printk("%s: Using generic MII device control. If the board doesn't operate, \nplease mail the following dump to the author:\n", dev->name);
+	    printk("%s: Using generic MII device control. If the board doesn't operate,\nplease mail the following dump to the author:\n", dev->name);
 	    j = de4x5_debug;
 	    de4x5_debug |= DEBUG_MII;
 	    de4x5_dbg_mii(dev, k);
@@ -5413,7 +5413,7 @@ de4x5_dbg_open(struct net_device *dev)
 	    }
 	}
 	printk("...0x%8.8x\n", le32_to_cpu(lp->tx_ring[i].buf));
-	printk("Ring size: \nRX: %d\nTX: %d\n", 
+	printk("Ring size:\nRX: %d\nTX: %d\n", 
 	       (short)lp->rxRingSize, 
 	       (short)lp->txRingSize); 
     }
Index: linux-kj/drivers/net/tulip/xircom_cb.c
===================================================================
--- linux-kj.orig/drivers/net/tulip/xircom_cb.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/tulip/xircom_cb.c	2005-09-21 01:35:54.000000000 +0400
@@ -243,12 +243,12 @@ static int __devinit xircom_probe(struct
 	/* Allocate the send/receive buffers */
 	private->rx_buffer = pci_alloc_consistent(pdev,8192,&private->rx_dma_handle);
 	if (private->rx_buffer == NULL) {
- 		printk(KERN_ERR "xircom_probe: no memory for rx buffer \n");
+ 		printk(KERN_ERR "xircom_probe: no memory for rx buffer\n");
 		goto rx_buf_fail;
 	}	
 	private->tx_buffer = pci_alloc_consistent(pdev,8192,&private->tx_dma_handle);
 	if (private->tx_buffer == NULL) {
-		printk(KERN_ERR "xircom_probe: no memory for tx buffer \n");
+		printk(KERN_ERR "xircom_probe: no memory for tx buffer\n");
 		goto tx_buf_fail;
 	}
 
@@ -283,7 +283,7 @@ static int __devinit xircom_probe(struct
 		goto reg_fail;
 	}
 		
-	printk(KERN_INFO "%s: Xircom cardbus revision %i at irq %i \n", dev->name, chip_rev, pdev->irq);
+	printk(KERN_INFO "%s: Xircom cardbus revision %i at irq %i\n", dev->name, chip_rev, pdev->irq);
 	/* start the transmitter to get a heartbeat */
 	/* TODO: send 2 dummy packets here */
 	transceiver_voodoo(private);
@@ -345,8 +345,8 @@ static irqreturn_t xircom_interrupt(int 
 
 #ifdef DEBUG	
 	print_binary(status);
-	printk("tx status 0x%08x 0x%08x \n",card->tx_buffer[0],card->tx_buffer[4]);
-	printk("rx status 0x%08x 0x%08x \n",card->rx_buffer[0],card->rx_buffer[4]);
+	printk("tx status 0x%08x 0x%08x\n",card->tx_buffer[0],card->tx_buffer[4]);
+	printk("rx status 0x%08x 0x%08x\n",card->rx_buffer[0],card->rx_buffer[4]);
 #endif	
 	/* Handle shared irq and hotplug */
 	if (status == 0 || status == 0xffffffff) {
@@ -356,9 +356,9 @@ static irqreturn_t xircom_interrupt(int 
 
 	if (link_status_changed(card)) {
 		int newlink;
-		printk(KERN_DEBUG "xircom_cb: Link status has changed \n");
+		printk(KERN_DEBUG "xircom_cb: Link status has changed\n");
 		newlink = link_status(card);
-		printk(KERN_INFO  "xircom_cb: Link is %i mbit \n",newlink);
+		printk(KERN_INFO  "xircom_cb: Link is %i mbit\n",newlink);
 		if (newlink)
 			netif_carrier_on(dev);
 		else
@@ -453,7 +453,7 @@ static int xircom_open(struct net_device
 	struct xircom_private *xp = netdev_priv(dev);
 	int retval;
 	enter("xircom_open");
-	printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i \n",dev->name,dev->irq);
+	printk(KERN_INFO "xircom cardbus adaptor found, registering as %s, using irq %i\n",dev->name,dev->irq);
 	retval = request_irq(dev->irq, &xircom_interrupt, SA_SHIRQ, dev->name, dev);
 	if (retval) {
 		leave("xircom_open - No IRQ");
@@ -1197,7 +1197,7 @@ static void investigate_read_descriptor(
 			struct sk_buff *skb;
 
 			if (pkt_len > 1518) {
-				printk(KERN_ERR "xircom_cb: Packet length %i is bogus \n",pkt_len);
+				printk(KERN_ERR "xircom_cb: Packet length %i is bogus\n",pkt_len);
 				pkt_len = 1518;
 			}
 
@@ -1237,7 +1237,7 @@ static void investigate_write_descriptor
 		status = card->tx_buffer[4*descnr];
 #if 0		
 		if (status & 0x8000) {	/* Major error */
-			printk(KERN_ERR "Major transmit error status %x \n", status);
+			printk(KERN_ERR "Major transmit error status %x\n", status);
 			card->tx_buffer[4*descnr] = 0;
 			netif_wake_queue (dev);
 		}
Index: linux-kj/drivers/net/wan/sdla.c
===================================================================
--- linux-kj.orig/drivers/net/wan/sdla.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wan/sdla.c	2005-09-21 01:35:54.000000000 +0400
@@ -1358,7 +1358,7 @@ int sdla_set_config(struct net_device *d
 		return(-EINVAL);
 
 	if (!request_region(map->base_addr, SDLA_IO_EXTENTS, dev->name)){
-		printk(KERN_WARNING "SDLA: io-port 0x%04lx in use \n", dev->base_addr);
+		printk(KERN_WARNING "SDLA: io-port 0x%04lx in use\n", dev->base_addr);
 		return(-EINVAL);
 	}
 	base = map->base_addr;
Index: linux-kj/drivers/net/wan/sdla_chdlc.c
===================================================================
--- linux-kj.orig/drivers/net/wan/sdla_chdlc.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wan/sdla_chdlc.c	2005-09-21 01:35:54.000000000 +0400
@@ -425,7 +425,7 @@ int wpc_init (sdla_t* card, wandev_conf_
 
 	if ((card->u.c.comm_port == WANOPT_SEC && conf->interface == WANOPT_V35)&&
 	    card->hw.type != SDLA_S514){
-		printk(KERN_INFO "%s: ERROR - V35 Interface not supported on S508 %s port \n",
+		printk(KERN_INFO "%s: ERROR - V35 Interface not supported on S508 %s port\n",
 			card->devname, PORT(card->u.c.comm_port));
 		return -EIO;
 	}
Index: linux-kj/drivers/net/wan/sdla_fr.c
===================================================================
--- linux-kj.orig/drivers/net/wan/sdla_fr.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wan/sdla_fr.c	2005-09-21 01:35:54.000000000 +0400
@@ -928,7 +928,7 @@ static int new_if(struct wan_device* wan
 			conf->be = 0;
 		}
 
-		printk (KERN_INFO "%s: CIR enabled for DLCI %i \n",
+		printk (KERN_INFO "%s: CIR enabled for DLCI %i\n",
 				wandev->name,chan->dlci);
 		printk (KERN_INFO "%s:     CIR = %i ; BC = %i ; BE = %i\n",
 				wandev->name,chan->cir,chan->bc,chan->be);
@@ -4948,7 +4948,7 @@ static int check_dlci_config (sdla_t *ca
 		return 2;
 	}
 
-	printk(KERN_INFO "Disabled Communications \n");
+	printk(KERN_INFO "Disabled Communications\n");
 	
 	mbox->cmd.command = FR_READ_CONFIG;
 	mbox->cmd.length = 0;
@@ -4997,7 +4997,7 @@ static int check_dlci_config (sdla_t *ca
 		return 2;
 	}
 
-	printk(KERN_INFO "Enabling Communications \n");
+	printk(KERN_INFO "Enabling Communications\n");
 
 	for (dev = card->wandev.dev; dev;
 	     dev = *((struct net_device **)dev->priv)) {
Index: linux-kj/drivers/net/wan/sdla_ppp.c
===================================================================
--- linux-kj.orig/drivers/net/wan/sdla_ppp.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wan/sdla_ppp.c	2005-09-21 01:35:54.000000000 +0400
@@ -1884,7 +1884,7 @@ void event_intr (sdla_t *card)
 
 		case PPP_INTR_DROP_DTR:		/* DTR drop timeout expired  0x40 bit 6 */
 
-			NEX_PRINTK(KERN_INFO "DTR Drop Timeout Interrrupt \n"); 
+			NEX_PRINTK(KERN_INFO "DTR Drop Timeout Interrrupt\n"); 
 
 			if (card->u.p.ip_mode == WANOPT_PPP_PEER) { 
 				set_bit(0,&Read_connection_info);
Index: linux-kj/drivers/net/wan/sdla_x25.c
===================================================================
--- linux-kj.orig/drivers/net/wan/sdla_x25.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wan/sdla_x25.c	2005-09-21 01:35:54.000000000 +0400
@@ -2125,7 +2125,7 @@ static void timer_intr (sdla_t *card)
 	}
 
 	if(!card->u.x.timer_int_enabled){
-		//printk(KERN_INFO "Turning Timer Off \n");
+		//printk(KERN_INFO "Turning Timer Off\n");
                 status->imask &= ~INTR_ON_TIMER;	
 	}
 }
@@ -4219,7 +4219,7 @@ static void x25api_bh(struct net_device*
 				/* Sock full cannot send, queue us for another
                                  * try 
 				 */
-				printk(KERN_INFO "%s: BH: !!! Packet failed to send !!!!! \n",
+				printk(KERN_INFO "%s: BH: !!! Packet failed to send !!!!!\n",
 						card->devname);
 				atomic_set(&chan->common.receive_block,1);
 				return;
@@ -4664,7 +4664,7 @@ static int api_incoming_call (sdla_t* ca
 	skb->pkt_type = WAN_PACKET_ASYNC;
 
 	if (card->func(skb,card->sk) < 0){
-		printk(KERN_INFO "%s: MAJOR ERROR: Failed to send up place call \n",card->devname);
+		printk(KERN_INFO "%s: MAJOR ERROR: Failed to send up place call\n",card->devname);
                 dev_kfree_skb_any(skb);
 		return 1;
 	}
Index: linux-kj/drivers/net/wan/sdladrv.c
===================================================================
--- linux-kj.orig/drivers/net/wan/sdladrv.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wan/sdladrv.c	2005-09-21 01:35:54.000000000 +0400
@@ -2070,7 +2070,7 @@ static int find_s514_adapter(sdlahw_t* h
         }
         /* if more than one S514 card has been found, then the user must have */        /* defined a slot number so that the correct adapter is used */
         else if ((number_S514_cards > 1) && hw->auto_pci_cfg) {
-                printk(KERN_INFO "%s: Error, PCI Slot autodetect Failed! \n"
+                printk(KERN_INFO "%s: Error, PCI Slot autodetect Failed!\n"
 				 "%s:        More than one S514 adapter found.\n"
 				 "%s:        Disable the Autodetect feature and supply\n"
 				 "%s:        the PCISLOT numbers for each card.\n",
Index: linux-kj/drivers/net/wan/wanpipe_multppp.c
===================================================================
--- linux-kj.orig/drivers/net/wan/wanpipe_multppp.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wan/wanpipe_multppp.c	2005-09-21 01:35:54.000000000 +0400
@@ -315,7 +315,7 @@ int wsppp_init (sdla_t* card, wandev_con
 
 	if ((card->u.c.comm_port == WANOPT_SEC && conf->interface == WANOPT_V35)&&
 	    card->hw.type != SDLA_S514){
-		printk(KERN_INFO "%s: ERROR - V35 Interface not supported on S508 %s port \n",
+		printk(KERN_INFO "%s: ERROR - V35 Interface not supported on S508 %s port\n",
 			card->devname, PORT(card->u.c.comm_port));
 		return -EIO;
 	}
Index: linux-kj/drivers/net/wireless/airo.c
===================================================================
--- linux-kj.orig/drivers/net/wireless/airo.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wireless/airo.c	2005-09-21 01:35:54.000000000 +0400
@@ -7589,7 +7589,7 @@ static int flashpchar(struct airo_info *
 
 	/* timeout for busy clear wait */
 	if(waittime <= 0 ){
-		printk(KERN_INFO "flash putchar busywait timeout! \n");
+		printk(KERN_INFO "flash putchar busywait timeout!\n");
 		return -EBUSY;
 	}
 
Index: linux-kj/drivers/net/wireless/arlan-main.c
===================================================================
--- linux-kj.orig/drivers/net/wireless/arlan-main.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wireless/arlan-main.c	2005-09-21 01:35:54.000000000 +0400
@@ -160,7 +160,7 @@ int arlan_command(struct net_device *dev
 		priv->card_polling_interval = 1;
 
 	if (arlan_debug & ARLAN_DEBUG_CHAIN_LOCKS)
-		printk(KERN_DEBUG "arlan_command, %lx commandByte %x waiting %lx incoming %x \n",
+		printk(KERN_DEBUG "arlan_command, %lx commandByte %x waiting %lx incoming %x\n",
 		jiffies, READSHMB(arlan->commandByte),
 		       priv->waiting_command_mask, command_p);
 
@@ -204,7 +204,7 @@ int arlan_command(struct net_device *dev
 			{
 				if (udelayed * 40 > 1000000)
 				{
-					printk(KERN_ERR "%s long wait too long \n", dev->name);
+					printk(KERN_ERR "%s long wait too long\n", dev->name);
 					priv->waiting_command_mask |= ARLAN_COMMAND_RESET;
 					break;
 				}
@@ -213,7 +213,7 @@ int arlan_command(struct net_device *dev
 			{
 				if (udelayed * 40 > 1000)
 				{
-					printk(KERN_ERR "%s short wait too long \n", dev->name);
+					printk(KERN_ERR "%s short wait too long\n", dev->name);
 					goto bad_end;
 				}
 			}
@@ -288,7 +288,7 @@ int arlan_command(struct net_device *dev
 		arlan_drop_tx(dev);
 		if (priv->tx_command_given || priv->rx_command_given)
 		{
-			printk(KERN_ERR "%s: Reset under tx or rx command \n", dev->name);
+			printk(KERN_ERR "%s: Reset under tx or rx command\n", dev->name);
 		}
 		netif_stop_queue (dev);
 		if (arlan_debug & ARLAN_DEBUG_RESET)
@@ -327,7 +327,7 @@ int arlan_command(struct net_device *dev
 	{
 		if (priv->tx_command_given || priv->rx_command_given)
 		{
-			printk(KERN_ERR "%s: Reset under tx or rx command \n", dev->name);
+			printk(KERN_ERR "%s: Reset under tx or rx command\n", dev->name);
 		}
 		arlan_drop_tx(dev);
 		setInterruptEnable(dev);
@@ -355,7 +355,7 @@ int arlan_command(struct net_device *dev
 		{
 			priv->card_polling_interval = 1;
 			if (arlan_debug & ARLAN_DEBUG_TIMING)
-				printk(KERN_ERR "configure delayed \n");
+				printk(KERN_ERR "configure delayed\n");
 		}
 	}
 	else if (priv->waiting_command_mask & ARLAN_COMMAND_RX)
@@ -410,7 +410,7 @@ int arlan_command(struct net_device *dev
 			}
 		} 
 		else if (arlan_debug & ARLAN_DEBUG_CHAIN_LOCKS)
-			printk(KERN_ERR "tx command when tx chain locked \n");
+			printk(KERN_ERR "tx command when tx chain locked\n");
 	}
 	else if (priv->waiting_command_mask & ARLAN_COMMAND_NOOPINT)
 	{
@@ -460,13 +460,13 @@ card_busy_end:
 		priv->waiting_command_mask |= ARLAN_COMMAND_CLEAN_AND_RESET;
 
 	if (arlan_debug & ARLAN_DEBUG_CARD_STATE)
-		printk(KERN_ERR "%s arlan_command card busy end \n", dev->name);
+		printk(KERN_ERR "%s arlan_command card busy end\n", dev->name);
 	spin_unlock_irqrestore(&priv->lock, flags);
 	ARLAN_DEBUG_EXIT("arlan_command");
 	return 1;
 
 bad_end:
-	printk(KERN_ERR "%s arlan_command bad end \n", dev->name);
+	printk(KERN_ERR "%s arlan_command bad end\n", dev->name);
 
 	spin_unlock_irqrestore(&priv->lock, flags);
 	ARLAN_DEBUG_EXIT("arlan_command");
@@ -506,12 +506,12 @@ static inline void arlan_retransmit_now(
 		if (TXHEAD(dev).offset)
 		{
 			priv->txLast = 0;
-			IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to head \n");
+			IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to head\n");
 
 		}
 		else if (TXTAIL(dev).offset)
 		{
-			IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to tail \n");
+			IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk(KERN_DEBUG "TX buff switch to tail\n");
 			priv->txLast = 1;
 		}
 		else
@@ -525,7 +525,7 @@ static inline void arlan_retransmit_now(
 	priv->Conf->driverRetransmissions++;
 	priv->retransmissions++;
 
-	IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("Retransmit %d bytes \n", TXLAST(dev).length);
+	IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("Retransmit %d bytes\n", TXLAST(dev).length);
 
 	ARLAN_DEBUG_EXIT("arlan_retransmit_now");
 }
@@ -546,7 +546,7 @@ static void arlan_registration_timer(uns
 		priv->registrationLostCount++;
 		if (lostTime > 7000 && lostTime < 7200)
 		{
-			printk(KERN_NOTICE "%s registration Lost \n", dev->name);
+			printk(KERN_NOTICE "%s registration Lost\n", dev->name);
 		}
 		if (lostTime / priv->reRegisterExp > 2000)
 			arlan_command(dev, ARLAN_COMMAND_CLEAN_AND_CONF);
@@ -584,7 +584,7 @@ static void arlan_registration_timer(uns
 	if (!registrationBad(dev) && priv->ReTransmitRequested)
 	{
 		IFDEBUG(ARLAN_DEBUG_TX_CHAIN)
-			printk(KERN_ERR "Retransmit from timer \n");
+			printk(KERN_ERR "Retransmit from timer\n");
 		priv->ReTransmitRequested = 0;
 		arlan_retransmit_now(dev);
 	}
@@ -738,7 +738,7 @@ static int arlan_hw_tx(struct net_device
 
 
 	IFDEBUG(ARLAN_DEBUG_HEADER_DUMP)
-		printk(KERN_WARNING "%s Transmit t %2x:%2x:%2x:%2x:%2x:%2x f %2x:%2x:%2x:%2x:%2x:%2x \n", dev->name,
+		printk(KERN_WARNING "%s Transmit t %2x:%2x:%2x:%2x:%2x:%2x f %2x:%2x:%2x:%2x:%2x:%2x\n", dev->name,
 		   (unsigned char) buf[0], (unsigned char) buf[1], (unsigned char) buf[2], (unsigned char) buf[3],
 		   (unsigned char) buf[4], (unsigned char) buf[5], (unsigned char) buf[6], (unsigned char) buf[7],
 		   (unsigned char) buf[8], (unsigned char) buf[9], (unsigned char) buf[10], (unsigned char) buf[11]);
@@ -749,7 +749,7 @@ static int arlan_hw_tx(struct net_device
 
 	priv->tx_last_sent = jiffies;
 
-	IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("%s TX Qued %d bytes \n", dev->name, length);
+	IFDEBUG(ARLAN_DEBUG_TX_CHAIN) printk("%s TX Qued %d bytes\n", dev->name, length);
 
 	ARLAN_DEBUG_EXIT("arlan_hw_tx");
 
@@ -765,9 +765,9 @@ static int arlan_hw_config(struct net_de
 
 	ARLAN_DEBUG_ENTRY("arlan_hw_config");
 
-	printk(KERN_NOTICE "%s arlan configure called \n", dev->name);
+	printk(KERN_NOTICE "%s arlan configure called\n", dev->name);
 	if (arlan_EEPROM_bad)
-		printk(KERN_NOTICE "arlan configure with eeprom bad option \n");
+		printk(KERN_NOTICE "arlan configure with eeprom bad option\n");
 
 
 	WRITESHM(arlan->spreadingCode, conf->spreadingCode, u_char);
@@ -930,7 +930,7 @@ static int arlan_read_card_configuration
 	READSHM(tlx415, arlan->configStatus, u_char);
 	
 	if (tlx415 != 0xA5)
-		printk(KERN_INFO "%s tlx415 chip \n", dev->name);
+		printk(KERN_INFO "%s tlx415 chip\n", dev->name);
 	
 	conf->txClear = 0;
 	conf->txRetries = 1;
@@ -974,7 +974,7 @@ static int __init arlan_check_fingerprin
 	ARLAN_DEBUG_ENTRY("arlan_check_fingerprint");
 
 	if (!request_mem_region(paddr, ARLAN_SHMEM_SIZE, "arlan")) {
-		// printk(KERN_WARNING "arlan: memory region %lx excluded from probing \n",paddr);
+		// printk(KERN_WARNING "arlan: memory region %lx excluded from probing\n",paddr);
 		return -ENODEV;
 	}
 
@@ -987,7 +987,7 @@ static int __init arlan_check_fingerprin
 		return -ENODEV;
 	}
 
-//   printk(KERN_INFO "arlan found at 0x%x \n",memaddr);
+//   printk(KERN_INFO "arlan found at 0x%x\n",memaddr);
 	ARLAN_DEBUG_EXIT("arlan_check_fingerprint");
 
 	return 0;
@@ -1008,7 +1008,7 @@ static int arlan_change_mtu(struct net_d
 	conf->maxFrameSize = new_mtu + 48;
 
 	arlan_command(dev, ARLAN_COMMAND_CLEAN_AND_CONF);
-	printk(KERN_NOTICE "%s mtu changed to %d \n", dev->name, new_mtu);
+	printk(KERN_NOTICE "%s mtu changed to %d\n", dev->name, new_mtu);
 
 	ARLAN_DEBUG_EXIT("arlan_change_mtu");
 
@@ -1083,7 +1083,7 @@ static int __init arlan_probe_here(struc
 	if (arlan_check_fingerprint(memaddr))
 		return -ENODEV;
 
-	printk(KERN_NOTICE "%s: Arlan found at %x, \n ", dev->name, 
+	printk(KERN_NOTICE "%s: Arlan found at %x,\n ", dev->name, 
 	       (int) virt_to_phys((void*)memaddr));
 
 	ap->card = (void *) memaddr;
@@ -1178,7 +1178,7 @@ static int arlan_tx(struct sk_buff *skb,
 	buf = skb->data;
 
 	if (length + 0x12 > 0x800) {
-		printk(KERN_ERR "TX RING overflow \n");
+		printk(KERN_ERR "TX RING overflow\n");
 		netif_stop_queue (dev);
 	}
 
@@ -1411,7 +1411,7 @@ static void arlan_rx_interrupt(struct ne
 
 	if (pkt_len < 10 || pkt_len > 2048)
 	{
-		printk(KERN_WARNING "%s: got too short or long packet, len %d \n", dev->name, pkt_len);
+		printk(KERN_WARNING "%s: got too short or long packet, len %d\n", dev->name, pkt_len);
 		return;
 	}
 	if (rxOffset + pkt_len > 0x2000)
@@ -1446,8 +1446,8 @@ static void arlan_rx_interrupt(struct ne
 			struct sk_buff *skb;
 
 			DEBUGSHM(50, "arlan recv pkt offs=%d\n", arlan->rxOffset, u_short);
-			DEBUGSHM(1, "arlan rxFrmType = %d \n", arlan->rxFrmType, u_char);
-			DEBUGSHM(1, KERN_INFO "arlan rx scrambled = %d \n", arlan->scrambled, u_char);
+			DEBUGSHM(1, "arlan rxFrmType = %d\n", arlan->rxFrmType, u_char);
+			DEBUGSHM(1, KERN_INFO "arlan rx scrambled = %d\n", arlan->scrambled, u_char);
 
 			/* here we do multicast filtering to avoid slow 8-bit memcopy */
 #ifdef ARLAN_MULTICAST
@@ -1464,14 +1464,14 @@ static void arlan_rx_interrupt(struct ne
 				{
 					if (mdebug)
 						if (hw_dst_addr[1] == 0x00)
-							printk(KERN_ERR "%s mcast 0x0100 \n", dev->name);
+							printk(KERN_ERR "%s mcast 0x0100\n", dev->name);
 						else if (hw_dst_addr[1] == 0x40)
-							printk(KERN_ERR "%s m/bcast 0x0140 \n", dev->name);
+							printk(KERN_ERR "%s m/bcast 0x0140\n", dev->name);
 					while (dmi)
 					{							if (dmi->dmi_addrlen == 6)
 						{
 							if (arlan_debug & ARLAN_DEBUG_HEADER_DUMP)
-								printk(KERN_ERR "%s mcl %2x:%2x:%2x:%2x:%2x:%2x \n", dev->name,
+								printk(KERN_ERR "%s mcl %2x:%2x:%2x:%2x:%2x:%2x\n", dev->name,
 										 dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
 										 dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
 							for (i = 0; i < 6; i++)
@@ -1533,7 +1533,7 @@ static void arlan_rx_interrupt(struct ne
 					for (i = 0; i <= 22; i++)
 						printk("%02x:", (u_char) skbtmp[i + 12]);
 					printk(KERN_ERR "\n");
-					printk(KERN_WARNING "arlan kernel pkt type trans %x \n", skb->protocol);
+					printk(KERN_WARNING "arlan kernel pkt type trans %x\n", skb->protocol);
 				}
 			netif_rx(skb);
 			dev->last_rx = jiffies;
@@ -1565,7 +1565,7 @@ static void arlan_process_interrupt(stru
 	if (test_and_set_bit(0, (void *) &priv->interrupt_processing_active))
 	{
 		if (arlan_debug & ARLAN_DEBUG_CHAIN_LOCKS)
-			printk(KERN_ERR "interrupt chain reentering \n");
+			printk(KERN_ERR "interrupt chain reentering\n");
 		goto end_int_process;
 	}
 	while ((rxStatus || txStatus || priv->interrupt_ack_requested)
@@ -1578,7 +1578,7 @@ static void arlan_process_interrupt(stru
 		arlan_command(dev, ARLAN_COMMAND_INT_ENABLE);
 		
 		IFDEBUG(ARLAN_DEBUG_INTERRUPT)
-			printk(KERN_ERR "%s:  got IRQ rx %x tx %x comm %x rxOff %x rxLen %x \n",
+			printk(KERN_ERR "%s:  got IRQ rx %x tx %x comm %x rxOff %x rxLen %x\n",
 					dev->name, rxStatus, txStatus, READSHMB(arlan->commandByte),
 					rxOffset, pkt_len);
 
@@ -1591,7 +1591,7 @@ static void arlan_process_interrupt(stru
 										    dev->name, txStatus, rxStatus);
 			} else {
 				IFDEBUG(ARLAN_DEBUG_INTERRUPT)
-					printk(KERN_INFO "%s irq $%d test OK \n", dev->name, dev->irq);
+					printk(KERN_INFO "%s irq $%d test OK\n", dev->name, dev->irq);
 
 			}
 			priv->interrupt_ack_requested = 0;
@@ -1821,7 +1821,7 @@ struct net_device * __init arlan_probe(i
 	}
 
 	if (lastFoundAt == 0xbe000)
-		printk(KERN_ERR "arlan: No Arlan devices found \n");
+		printk(KERN_ERR "arlan: No Arlan devices found\n");
 
  not_found:
 	free_netdev(dev);
Index: linux-kj/drivers/net/wireless/arlan-proc.c
===================================================================
--- linux-kj.orig/drivers/net/wireless/arlan-proc.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wireless/arlan-proc.c	2005-09-21 01:35:54.000000000 +0400
@@ -33,7 +33,7 @@
 	if (nn > 399 ) tmpLn = 399; \
 	memcpy(tmpStr,(char *) priva->conf->var,tmpLn);\
 	tmpStr[tmpLn] = 0; \
-	pos += sprintf(arlan_drive_info+pos, "%s\t=\t%s \n",#var,priva->conf->var);\
+	pos += sprintf(arlan_drive_info+pos, "%s\t=\t%s\n",#var,priva->conf->var);\
 	}
 
 #define SARLUC(var)  	SARLG(u_char, var)
@@ -207,7 +207,7 @@ static void arlan_print_diagnostic_info(
 	printk(KERN_INFO "%s\n", arlan_diagnostic_info_string(dev));
 
 	if (diagnosticInfo != 0xff)
-		printk("%s arlan: Diagnostic Offset %d \n", dev->name, diagnosticOffset);
+		printk("%s arlan: Diagnostic Offset %d\n", dev->name, diagnosticOffset);
 
 	printk("arlan: LAN CODE ID = ");
 	for (i = 0; i < 6; i++)
@@ -278,7 +278,7 @@ static int arlan_hw_test_memory(struct n
 		READSHM(res, arlan_mem[i], char);
 		if (res != pattern++)
 		{
-			printk(KERN_ERR "Arlan driver memory test 1 failed \n");
+			printk(KERN_ERR "Arlan driver memory test 1 failed\n");
 			return -1;
 		}
 	}
@@ -294,7 +294,7 @@ static int arlan_hw_test_memory(struct n
 		READSHM(res, arlan_mem[i], char);
 		if (res != ~(pattern++))
 		{
-			printk(KERN_ERR "Arlan driver memory test 2 failed \n");
+			printk(KERN_ERR "Arlan driver memory test 2 failed\n");
 			return -1;
 		}
 	}
@@ -340,7 +340,7 @@ static int arlan_setup_card_by_book(stru
 		if (arlan_hw_test_memory(dev))
 			return -1;
 
-	DEBUGSHM(4, "arlan configuredStatus = %d \n", arlan->configuredStatusFlag, u_char);
+	DEBUGSHM(4, "arlan configuredStatus = %d\n", arlan->configuredStatusFlag, u_char);
 	DEBUGSHM(4, "arlan driver diagnostic: 0x%2x\n", arlan->diagnosticInfo, u_char);
 
 	/* issue nop command - no interrupt */
@@ -415,11 +415,11 @@ static int arlan_sysctl_info(ctl_table *
 	{
 		printk("wrirte: ");
 		for (i = 0; i < 100; i++)
-			printk("adi %x \n", arlan_drive_info[i]);
+			printk("adi %x\n", arlan_drive_info[i]);
 	}
 	if (ctl->procname == NULL || arlan_drive_info == NULL)
 	{
-		printk(KERN_WARNING " procname is NULL in sysctl_table or arlan_drive_info is NULL \n at arlan module\n ");
+		printk(KERN_WARNING " procname is NULL in sysctl_table or arlan_drive_info is NULL\n at arlan module\n ");
 		return -1;
 	}
 	devnum = ctl->procname[5] - '0';
@@ -432,7 +432,7 @@ static int arlan_sysctl_info(ctl_table *
 	{
 		if (ctl->procname)
 			pos += sprintf(arlan_drive_info + pos, "\t%s\n\n", ctl->procname);
-		pos += sprintf(arlan_drive_info + pos, "No device found here \n");
+		pos += sprintf(arlan_drive_info + pos, "No device found here\n");
 		goto final;
 	}
 	else
@@ -447,17 +447,17 @@ static int arlan_sysctl_info(ctl_table *
 
 	memcpy_fromio(priva->conf, priva->card, sizeof(struct arlan_shmem));
 
-	pos = sprintf(arlan_drive_info, "Arlan  info \n");
+	pos = sprintf(arlan_drive_info, "Arlan  info\n");
 	/* Header Signature */
 	SARLSTR(textRegion, 48);
 	SARLUC(resetFlag);
-	pos += sprintf(arlan_drive_info + pos, "diagnosticInfo\t=\t%s \n", arlan_diagnostic_info_string(dev));
+	pos += sprintf(arlan_drive_info + pos, "diagnosticInfo\t=\t%s\n", arlan_diagnostic_info_string(dev));
 	SARLUC(diagnosticInfo);
 	SARLUS(diagnosticOffset);
 	SARLUCN(_1, 12);
 	SARLUCN(lanCardNodeId, 6);
 	SARLUCN(broadcastAddress, 6);
-	pos += sprintf(arlan_drive_info + pos, "hardwareType =\t  %s \n", arlan_hardware_type_string(dev));
+	pos += sprintf(arlan_drive_info + pos, "hardwareType =\t  %s\n", arlan_hardware_type_string(dev));
 	SARLUC(hardwareType);
 	SARLUC(majorHardwareVersion);
 	SARLUC(minorHardwareVersion);
@@ -651,7 +651,7 @@ static int arlan_sysctl_info161719(ctl_t
 	devnum = ctl->procname[5] - '0';
 	if (arlan_device[devnum] == NULL)
 	{
-		pos += sprintf(arlan_drive_info + pos, "No device found here \n");
+		pos += sprintf(arlan_drive_info + pos, "No device found here\n");
 		goto final;
 	}
 	else
@@ -685,7 +685,7 @@ static int arlan_sysctl_infotxRing(ctl_t
 	devnum = ctl->procname[5] - '0';
 	if (arlan_device[devnum] == NULL)
 	{
-		  pos += sprintf(arlan_drive_info + pos, "No device found here \n");
+		  pos += sprintf(arlan_drive_info + pos, "No device found here\n");
 		  goto final;
 	}
 	else
@@ -714,7 +714,7 @@ static int arlan_sysctl_inforxRing(ctl_t
 	devnum = ctl->procname[5] - '0';
 	if (arlan_device[devnum] == NULL)
 	{
-		  pos += sprintf(arlan_drive_info + pos, "No device found here \n");
+		  pos += sprintf(arlan_drive_info + pos, "No device found here\n");
 		  goto final;
 	} else
 		priva = arlan_device[devnum]->priv;
@@ -742,7 +742,7 @@ static int arlan_sysctl_info18(ctl_table
 	devnum = ctl->procname[5] - '0';
 	if (arlan_device[devnum] == NULL)
 	{
-		pos += sprintf(arlan_drive_info + pos, "No device found here \n");
+		pos += sprintf(arlan_drive_info + pos, "No device found here\n");
 		goto final;
 	}
 	else
Index: linux-kj/drivers/net/wireless/prism54/islpci_dev.c
===================================================================
--- linux-kj.orig/drivers/net/wireless/prism54/islpci_dev.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wireless/prism54/islpci_dev.c	2005-09-21 01:35:54.000000000 +0400
@@ -225,14 +225,14 @@ islpci_interrupt(int irq, void *config, 
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
 		DEBUG(SHOW_FUNCTION_CALLS,
-		      "IRQ: Identification register 0x%p 0x%x \n", device, reg);
+		      "IRQ: Identification register 0x%p 0x%x\n", device, reg);
 #endif
 
 		/* check for each bit in the register separately */
 		if (reg & ISL38XX_INT_IDENT_UPDATE) {
 #if VERBOSE > SHOW_ERROR_MESSAGES
 			/* Queue has been updated */
-			DEBUG(SHOW_TRACING, "IRQ: Update flag \n");
+			DEBUG(SHOW_TRACING, "IRQ: Update flag\n");
 
 			DEBUG(SHOW_QUEUE_INDEXES,
 			      "CB drv Qs: [%i][%i][%i][%i][%i][%i]\n",
@@ -298,7 +298,7 @@ islpci_interrupt(int irq, void *config, 
 						ISL38XX_CB_RX_DATA_LQ) != 0) {
 #if VERBOSE > SHOW_ERROR_MESSAGES
 				DEBUG(SHOW_TRACING,
-				      "Received frame in Data Low Queue \n");
+				      "Received frame in Data Low Queue\n");
 #endif
 				islpci_eth_receive(priv);
 			}
@@ -323,7 +323,7 @@ islpci_interrupt(int irq, void *config, 
 			/* Device has been initialized */
 #if VERBOSE > SHOW_ERROR_MESSAGES
 			DEBUG(SHOW_TRACING,
-			      "IRQ: Init flag, device initialized \n");
+			      "IRQ: Init flag, device initialized\n");
 #endif
 			wake_up(&priv->reset_done);
 		}
@@ -331,7 +331,7 @@ islpci_interrupt(int irq, void *config, 
 		if (reg & ISL38XX_INT_IDENT_SLEEP) {
 			/* Device intends to move to powersave state */
 #if VERBOSE > SHOW_ERROR_MESSAGES
-			DEBUG(SHOW_TRACING, "IRQ: Sleep flag \n");
+			DEBUG(SHOW_TRACING, "IRQ: Sleep flag\n");
 #endif
 			isl38xx_handle_sleep_request(priv->control_block,
 						     &powerstate,
@@ -341,7 +341,7 @@ islpci_interrupt(int irq, void *config, 
 		if (reg & ISL38XX_INT_IDENT_WAKEUP) {
 			/* Device has been woken up to active state */
 #if VERBOSE > SHOW_ERROR_MESSAGES
-			DEBUG(SHOW_TRACING, "IRQ: Wakeup flag \n");
+			DEBUG(SHOW_TRACING, "IRQ: Wakeup flag\n");
 #endif
 
 			isl38xx_handle_wakeup(priv->control_block,
@@ -637,7 +637,7 @@ islpci_alloc_memory(islpci_private *priv
 	      ioremap(pci_resource_start(priv->pdev, 0),
 		      ISL38XX_PCI_MEM_SIZE))) {
 		/* error in remapping the PCI device memory address range */
-		printk(KERN_ERR "PCI memory remapping failed \n");
+		printk(KERN_ERR "PCI memory remapping failed\n");
 		return -1;
 	}
 
@@ -897,7 +897,7 @@ islpci_setup(struct pci_dev *pdev)
 
 	if (register_netdev(ndev)) {
 		DEBUG(SHOW_ERROR_MESSAGES,
-		      "ERROR: register_netdev() failed \n");
+		      "ERROR: register_netdev() failed\n");
 		goto do_islpci_free_memory;
 	}
 
Index: linux-kj/drivers/net/wireless/prism54/islpci_eth.c
===================================================================
--- linux-kj.orig/drivers/net/wireless/prism54/islpci_eth.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wireless/prism54/islpci_eth.c	2005-09-21 01:35:54.000000000 +0400
@@ -91,7 +91,7 @@ islpci_eth_transmit(struct sk_buff *skb,
 	int err = 0;
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit \n");
+	DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_transmit\n");
 #endif
 
 	/* lock the driver code */
@@ -150,7 +150,7 @@ islpci_eth_transmit(struct sk_buff *skb,
 			}
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
-			DEBUG(SHOW_TRACING, "memmove %p %p %i \n", skb->data,
+			DEBUG(SHOW_TRACING, "memmove %p %p %i\n", skb->data,
 			      src, skb->len);
 #endif
 		} else {
@@ -330,7 +330,7 @@ islpci_eth_receive(islpci_private *priv)
 	int discard = 0;
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive \n");
+	DEBUG(SHOW_FUNCTION_CALLS, "islpci_eth_receive\n");
 #endif
 
 	/* the device has written an Ethernet frame in the data area
@@ -443,7 +443,7 @@ islpci_eth_receive(islpci_private *priv)
 		skb = dev_alloc_skb(MAX_FRAGMENT_SIZE_RX + 2);
 		if (unlikely(skb == NULL)) {
 			/* error allocating an sk_buff structure elements */
-			DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb \n");
+			DEBUG(SHOW_ERROR_MESSAGES, "Error allocating skb\n");
 			break;
 		}
 		skb_reserve(skb, (4 - (long) skb->data) & 0x03);
Index: linux-kj/drivers/net/wireless/prism54/islpci_mgt.c
===================================================================
--- linux-kj.orig/drivers/net/wireless/prism54/islpci_mgt.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wireless/prism54/islpci_mgt.c	2005-09-21 01:35:54.000000000 +0400
@@ -114,7 +114,7 @@ islpci_mgmt_rx_fill(struct net_device *n
 	u32 curr = le32_to_cpu(cb->driver_curr_frag[ISL38XX_CB_RX_MGMTQ]);
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill \n");
+	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgmt_rx_fill\n");
 #endif
 
 	while (curr - priv->index_mgmt_rx < ISL38XX_CB_MGMT_QSIZE) {
@@ -212,7 +212,7 @@ islpci_mgt_transmit(struct net_device *n
 	{
 		pimfor_header_t *h = buf.mem;
 		DEBUG(SHOW_PIMFOR_FRAMES,
-		      "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x \n",
+		      "PIMFOR: op %i, oid 0x%08lx, device %i, flags 0x%x length 0x%x\n",
 		      h->operation, oid, h->device_id, h->flags, length);
 
 		/* display the buffer contents for debugging */
@@ -280,7 +280,7 @@ islpci_mgt_receive(struct net_device *nd
 	u32 curr_frag;
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
-	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive \n");
+	DEBUG(SHOW_FUNCTION_CALLS, "islpci_mgt_receive\n");
 #endif
 
 	/* Only once per interrupt, determine fragment range to
@@ -339,7 +339,7 @@ islpci_mgt_receive(struct net_device *nd
 
 #if VERBOSE > SHOW_ERROR_MESSAGES
 		DEBUG(SHOW_PIMFOR_FRAMES,
-		      "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x \n",
+		      "PIMFOR: op %i, oid 0x%08x, device %i, flags 0x%x length 0x%x\n",
 		      header->operation, header->oid, header->device_id,
 		      header->flags, header->length);
 
Index: linux-kj/drivers/net/wireless/ray_cs.c
===================================================================
--- linux-kj.orig/drivers/net/wireless/ray_cs.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/net/wireless/ray_cs.c	2005-09-21 01:35:54.000000000 +0400
@@ -625,7 +625,7 @@ static int ray_init(struct net_device *d
     local->fw_ver = local->startup_res.firmware_version[0];
     local->fw_bld = local->startup_res.firmware_version[1];
     local->fw_var = local->startup_res.firmware_version[2];
-    DEBUG(1,"ray_init firmware version %d.%d \n",local->fw_ver, local->fw_bld);
+    DEBUG(1,"ray_init firmware version %d.%d\n",local->fw_ver, local->fw_bld);
 
     local->tib_length = 0x20;
     if ((local->fw_ver == 5) && (local->fw_bld >= 30))
@@ -2311,7 +2311,7 @@ static void rx_data(struct net_device *d
             if (rx_len < (ETH_HLEN + RX_MAC_HEADER_LENGTH) ||
                 rx_len > (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + FCS_LEN)) 
             {
-                DEBUG(0,"ray_cs invalid packet length %d received \n",rx_len);
+                DEBUG(0,"ray_cs invalid packet length %d received\n",rx_len);
                 return;
             }
         }
@@ -2319,7 +2319,7 @@ static void rx_data(struct net_device *d
             if (rx_len < (ETH_HLEN + RX_MAC_HEADER_LENGTH) ||
                 rx_len > (dev->mtu + RX_MAC_HEADER_LENGTH + ETH_HLEN + FCS_LEN))
             {
-                DEBUG(0,"ray_cs invalid packet length %d received \n",rx_len);
+                DEBUG(0,"ray_cs invalid packet length %d received\n",rx_len);
                 return;
             }
         }
@@ -2816,9 +2816,9 @@ static int ray_cs_proc_read(char *buf, c
 	    pfh = (struct freq_hop_element *)p;
 	    len += sprintf(buf + len, "Hop dwell            = %d Kus\n",
 			   pfh->dwell_time[0] + 256 * pfh->dwell_time[1]);
-	    len += sprintf(buf + len, "Hop set              = %d \n", pfh->hop_set);
-	    len += sprintf(buf + len, "Hop pattern          = %d \n", pfh->hop_pattern);
-	    len += sprintf(buf + len, "Hop index            = %d \n", pfh->hop_index);
+	    len += sprintf(buf + len, "Hop set              = %d\n", pfh->hop_set);
+	    len += sprintf(buf + len, "Hop pattern          = %d\n", pfh->hop_pattern);
+	    len += sprintf(buf + len, "Hop index            = %d\n", pfh->hop_index);
 	    p += p[1] + 2;
 	}
 	else {
Index: linux-kj/drivers/parisc/eisa_enumerator.c
===================================================================
--- linux-kj.orig/drivers/parisc/eisa_enumerator.c	2005-09-21 01:19:32.000000000 +0400
+++ linux-kj/drivers/parisc/eisa_enumerator.c	2005-09-21 01:35:54.000000000 +0400
@@ -460,7 +460,7 @@ static int init_slot(int slot, struct ee
 			       slot, id_string);
 			
 			print_eisa_id(id_string, es->eisa_slot_id);
-			printk(" expected %s \n", id_string);
+			printk(" expected %s\n", id_string);
 		
 			return -1;	
 			
Index: linux-kj/drivers/parisc/superio.c
===================================================================
--- linux-kj.orig/drivers/parisc/superio.c	2005-09-21 01:19:31.000000000 +0400
+++ linux-kj/drivers/parisc/superio.c	2005-09-21 01:35:54.000000000 +0400
@@ -159,7 +159,7 @@ superio_init(struct superio_device *sio)
 	/* ...then properly fixup the USB to point at suckyio PIC */
 	sio->usb_pdev->irq = superio_fixup_irq(sio->usb_pdev);
 
-	printk (KERN_INFO "SuperIO: Found NS87560 Legacy I/O device at %s (IRQ %i) \n",
+	printk (KERN_INFO "SuperIO: Found NS87560 Legacy I/O device at %s (IRQ %i)\n",
 		pci_name(pdev),pdev->irq);
 
 	pci_read_config_dword (pdev, SIO_SP1BAR, &sio->sp1_base);
Index: linux-kj/drivers/parport/parport_amiga.c
===================================================================
--- linux-kj.orig/drivers/parport/parport_amiga.c	2005-09-21 01:19:33.000000000 +0400
+++ linux-kj/drivers/parport/parport_amiga.c	2005-09-21 01:35:54.000000000 +0400
@@ -80,7 +80,7 @@ static void amiga_write_control(struct p
 	
 static unsigned char amiga_read_control( struct parport *p)
 {
-	DPRINTK(KERN_DEBUG "read_control \n");
+	DPRINTK(KERN_DEBUG "read_control\n");
 	return control_amiga_to_pc(0);
 }
 
Index: linux-kj/drivers/parport/parport_mfc3.c
===================================================================
--- linux-kj.orig/drivers/parport/parport_mfc3.c	2005-09-21 01:19:33.000000000 +0400
+++ linux-kj/drivers/parport/parport_mfc3.c	2005-09-21 01:35:54.000000000 +0400
@@ -133,7 +133,7 @@ DPRINTK(KERN_DEBUG "write_control %02x\n
 	
 static unsigned char mfc3_read_control( struct parport *p)
 {
-DPRINTK(KERN_DEBUG "read_control \n");
+DPRINTK(KERN_DEBUG "read_control\n");
 	return control_mfc3_to_pc(pia(p)->ppra & 0xe0);
 }
 
Index: linux-kj/drivers/pci/hotplug/cpqphp.h
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/cpqphp.h	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/cpqphp.h	2005-09-21 01:35:54.000000000 +0400
@@ -669,7 +669,7 @@ static inline int cpq_get_latch_status(s
 	u8 hp_slot;
 
 	hp_slot = slot->device - ctrl->slot_device_offset;
-	dbg("%s: slot->device = %d, ctrl->slot_device_offset = %d \n",
+	dbg("%s: slot->device = %d, ctrl->slot_device_offset = %d\n",
 	    __FUNCTION__, slot->device, ctrl->slot_device_offset);
 
 	status = (readl(ctrl->hpc_reg + INT_INPUT_CLEAR) & (0x01L << hp_slot));
Index: linux-kj/drivers/pci/hotplug/cpqphp_core.c
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/cpqphp_core.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/cpqphp_core.c	2005-09-21 01:35:54.000000000 +0400
@@ -1148,7 +1148,7 @@ static int cpqhpc_probe(struct pci_dev *
 	 * Finish setting up the hot plug ctrl device
 	 */
 	ctrl->slot_device_offset = readb(ctrl->hpc_reg + SLOT_MASK) >> 4;
-	dbg("NumSlots %d \n", ctrl->slot_device_offset);
+	dbg("NumSlots %d\n", ctrl->slot_device_offset);
 
 	ctrl->next_event = 0;
 
@@ -1165,7 +1165,7 @@ static int cpqhpc_probe(struct pci_dev *
 	writel(0xFFFFFFFFL, ctrl->hpc_reg + INT_MASK);
 
 	/* set up the interrupt */
-	dbg("HPC interrupt = %d \n", ctrl->interrupt);
+	dbg("HPC interrupt = %d\n", ctrl->interrupt);
 	if (request_irq(ctrl->interrupt, cpqhp_ctrl_intr,
 			SA_SHIRQ, MY_NAME, ctrl)) {
 		err("Can't get irq %d for the hotplug pci controller\n",
@@ -1282,7 +1282,7 @@ static int one_time_init(void)
 	if (retval)
 		goto error;
 
-	dbg("Initialize + Start the notification mechanism \n");
+	dbg("Initialize + Start the notification mechanism\n");
 
 	retval = cpqhp_event_start_thread();
 	if (retval)
Index: linux-kj/drivers/pci/hotplug/cpqphp_pci.c
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/cpqphp_pci.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/cpqphp_pci.c	2005-09-21 01:35:54.000000000 +0400
@@ -1320,7 +1320,7 @@ int cpqhp_find_available_resources(struc
 
 			dbg("found io_node(base, length) = %x, %x\n",
 					io_node->base, io_node->length);
-			dbg("populated slot =%d \n", populated_slot);
+			dbg("populated slot =%d\n", populated_slot);
 			if (!populated_slot) {
 				io_node->next = ctrl->io_head;
 				ctrl->io_head = io_node;
@@ -1343,7 +1343,7 @@ int cpqhp_find_available_resources(struc
 
 			dbg("found mem_node(base, length) = %x, %x\n",
 					mem_node->base, mem_node->length);
-			dbg("populated slot =%d \n", populated_slot);
+			dbg("populated slot =%d\n", populated_slot);
 			if (!populated_slot) {
 				mem_node->next = ctrl->mem_head;
 				ctrl->mem_head = mem_node;
@@ -1366,7 +1366,7 @@ int cpqhp_find_available_resources(struc
 			p_mem_node->length = pre_mem_length << 16;
 			dbg("found p_mem_node(base, length) = %x, %x\n",
 					p_mem_node->base, p_mem_node->length);
-			dbg("populated slot =%d \n", populated_slot);
+			dbg("populated slot =%d\n", populated_slot);
 
 			if (!populated_slot) {
 				p_mem_node->next = ctrl->p_mem_head;
@@ -1389,7 +1389,7 @@ int cpqhp_find_available_resources(struc
 			bus_node->length = max_bus - secondary_bus + 1;
 			dbg("found bus_node(base, length) = %x, %x\n",
 					bus_node->base, bus_node->length);
-			dbg("populated slot =%d \n", populated_slot);
+			dbg("populated slot =%d\n", populated_slot);
 			if (!populated_slot) {
 				bus_node->next = ctrl->bus_head;
 				ctrl->bus_head = bus_node;
Index: linux-kj/drivers/pci/hotplug/ibmphp_hpc.c
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/ibmphp_hpc.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/ibmphp_hpc.c	2005-09-21 01:35:54.000000000 +0400
@@ -156,7 +156,7 @@ static u8 i2c_ctrl_read (struct controll
 	unsigned long ultemp;
 	unsigned long data;	// actual data HILO format
 
-	debug_polling ("%s - Entry WPGBbar[%p] index[%x] \n", __FUNCTION__, WPGBbar, index);
+	debug_polling ("%s - Entry WPGBbar[%p] index[%x]\n", __FUNCTION__, WPGBbar, index);
 
 	//--------------------------------------------------------------------
 	// READ - step 1
@@ -179,7 +179,7 @@ static u8 i2c_ctrl_read (struct controll
 		ultemp = ultemp << 8;
 		data |= ultemp;
 	} else {
-		err ("this controller type is not supported \n");
+		err ("this controller type is not supported\n");
 		return HPC_ERROR;
 	}
 
@@ -290,7 +290,7 @@ static u8 i2c_ctrl_write (struct control
 		ultemp = ultemp << 8;
 		data |= ultemp;
 	} else {
-		err ("this controller type is not supported \n");
+		err ("this controller type is not supported\n");
 		return HPC_ERROR;
 	}
 
@@ -1101,21 +1101,21 @@ void __exit ibmphp_hpc_stop_poll_thread 
 	debug ("%s - Entry\n", __FUNCTION__);
 
 	ibmphp_shutdown = TRUE;
-	debug ("before locking operations \n");
+	debug ("before locking operations\n");
 	ibmphp_lock_operations ();
-	debug ("after locking operations \n");
+	debug ("after locking operations\n");
 	
 	// wait for poll thread to exit
-	debug ("before sem_exit down \n");
+	debug ("before sem_exit down\n");
 	down (&sem_exit);
-	debug ("after sem_exit down \n");
+	debug ("after sem_exit down\n");
 
 	// cleanup
-	debug ("before free_hpc_access \n");
+	debug ("before free_hpc_access\n");
 	free_hpc_access ();
-	debug ("after free_hpc_access \n");
+	debug ("after free_hpc_access\n");
 	ibmphp_unlock_operations ();
-	debug ("after unlock operations \n");
+	debug ("after unlock operations\n");
 	up (&sem_exit);
 	debug ("after sem exit up\n");
 
Index: linux-kj/drivers/pci/hotplug/pciehp_hpc.c
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/pciehp_hpc.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/pciehp_hpc.c	2005-09-21 01:35:54.000000000 +0400
@@ -352,7 +352,7 @@ static int hpc_check_lnk_status(struct c
 	dbg("%s: lnk_status = %x\n", __FUNCTION__, lnk_status);
 	if ( (lnk_status & LNK_TRN) || (lnk_status & LNK_TRN_ERR) || 
 		!(lnk_status & NEG_LINK_WD)) {
-		err("%s : Link Training Error occurs \n", __FUNCTION__);
+		err("%s : Link Training Error occurs\n", __FUNCTION__);
 		retval = -1;
 		return retval;
 	}
@@ -539,7 +539,7 @@ static int hpc_set_attention_status(stru
 	u16 slot_ctrl;
 	int rc = 0;
 
-	dbg("%s: \n", __FUNCTION__);
+	dbg("%s:\n", __FUNCTION__);
 	if (!php_ctlr) {
 		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
 		return -1;
@@ -587,7 +587,7 @@ static void hpc_set_green_led_on(struct 
 	u16 slot_ctrl;
 	int rc = 0;
        	
-	dbg("%s: \n", __FUNCTION__);	
+	dbg("%s:\n", __FUNCTION__);	
 	if (!php_ctlr) {
 		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
 		return ;
@@ -622,7 +622,7 @@ static void hpc_set_green_led_off(struct
 	u16 slot_ctrl;
 	int rc = 0;
 
-	dbg("%s: \n", __FUNCTION__);	
+	dbg("%s:\n", __FUNCTION__);	
 	if (!php_ctlr) {
 		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
 		return ;
@@ -658,7 +658,7 @@ static void hpc_set_green_led_blink(stru
 	u16 slot_ctrl;
 	int rc = 0; 
 	
-	dbg("%s: \n", __FUNCTION__);	
+	dbg("%s:\n", __FUNCTION__);	
 	if (!php_ctlr) {
 		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
 		return ;
@@ -715,7 +715,7 @@ int pcie_get_ctlr_slot_config(struct con
 	}
 	
 	*physical_slot_num = slot_cap >> 19;
-	dbg("%s: PSN %d \n", __FUNCTION__, *physical_slot_num);
+	dbg("%s: PSN %d\n", __FUNCTION__, *physical_slot_num);
 	
 	*ctrlcap = slot_cap & 0x0000007f;
 
@@ -780,7 +780,7 @@ static int hpc_power_on_slot(struct slot
 	int retval = 0;
 
 	DBG_ENTER_ROUTINE 
-	dbg("%s: \n", __FUNCTION__);	
+	dbg("%s:\n", __FUNCTION__);	
 
 	if (!php_ctlr) {
 		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
@@ -829,7 +829,7 @@ static int hpc_power_off_slot(struct slo
 	int retval = 0;
 
 	DBG_ENTER_ROUTINE 
-	dbg("%s: \n", __FUNCTION__);	
+	dbg("%s:\n", __FUNCTION__);	
 
 	if (!php_ctlr) {
 		err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
Index: linux-kj/drivers/pci/hotplug/pciehp_pci.c
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/pciehp_pci.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/pciehp_pci.c	2005-09-21 01:35:54.000000000 +0400
@@ -303,7 +303,7 @@ int pciehp_save_config(struct controller
 				 */
 
 				while ((function < max_functions)&&(!stop_it)) {
-					dbg("%s: In while loop \n", __FUNCTION__);
+					dbg("%s: In while loop\n", __FUNCTION__);
 					rc = pci_bus_read_config_dword(pci_bus,
 							PCI_DEVFN(device, function),
 							PCI_VENDOR_ID, &ID);
Index: linux-kj/drivers/pci/hotplug/sgi_hotplug.c
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/sgi_hotplug.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/sgi_hotplug.c	2005-09-21 01:35:54.000000000 +0400
@@ -300,7 +300,7 @@ static int sn_slot_disable(struct hotplu
 
 	if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) {
 		dev_dbg(slot->pci_bus->self,
-			"L1 failure %d with message \n%s\n",
+			"L1 failure %d with message\n%s\n",
 			resp.resp_sub_errno, resp.resp_l1_msg);
 		return -EPERM;
 	}
Index: linux-kj/drivers/pci/hotplug/shpchprm_legacy.c
===================================================================
--- linux-kj.orig/drivers/pci/hotplug/shpchprm_legacy.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/pci/hotplug/shpchprm_legacy.c	2005-09-21 01:35:54.000000000 +0400
@@ -233,7 +233,7 @@ int shpchprm_find_available_resources(st
 			populated_slot = 0;
 			bridged_slot = 0;
 		}
-		dbg("slot populated =%s \n", populated_slot?"yes":"no");
+		dbg("slot populated =%s\n", populated_slot?"yes":"no");
 
 		/* If we've got a valid IO base, use it */
 
Index: linux-kj/drivers/pcmcia/i82092.c
===================================================================
--- linux-kj.orig/drivers/pcmcia/i82092.c	2005-09-21 01:19:32.000000000 +0400
+++ linux-kj/drivers/pcmcia/i82092.c	2005-09-21 01:35:54.000000000 +0400
@@ -150,7 +150,7 @@ static int __devinit i82092aa_pci_probe(
 	pci_write_config_byte(dev, 0x50, configbyte); /* PCI Interrupt Routing Register */
 
 	/* Register the interrupt handler */
-	dprintk(KERN_DEBUG "Requesting interrupt %i \n",dev->irq);
+	dprintk(KERN_DEBUG "Requesting interrupt %i\n",dev->irq);
 	if ((ret = request_irq(dev->irq, i82092aa_interrupt, SA_SHIRQ, "i82092aa", i82092aa_interrupt))) {
 		printk(KERN_ERR "i82092aa: Failed to register IRQ %d, aborting\n", dev->irq);
 		goto err_out_free_res;
@@ -330,7 +330,7 @@ static irqreturn_t i82092aa_interrupt(in
 	while (1) {
 		loopcount++;
 		if (loopcount>20) {
-			printk(KERN_ERR "i82092aa: infinite eventloop in interrupt \n");
+			printk(KERN_ERR "i82092aa: infinite eventloop in interrupt\n");
 			break;
 		}
 		
@@ -584,7 +584,7 @@ static int i82092aa_set_socket(struct pc
 		reg |= I365_PWR_AUTO;	/* automatic power mngmnt */
 	}
 	if (state->flags & SS_OUTPUT_ENA) {
-		printk("Power Enabled \n");
+		printk("Power Enabled\n");
 		reg |= I365_PWR_OUT;	/* enable power */
 	}
 	
@@ -674,7 +674,7 @@ static int i82092aa_set_io_map(struct pc
 	if (indirect_read(sock, I365_ADDRWIN) & I365_ENA_IO(map))
 		indirect_resetbit(sock, I365_ADDRWIN, I365_ENA_IO(map));
 
-/*	printk("set_io_map: Setting range to %x - %x \n",io->start,io->stop);  */
+/*	printk("set_io_map: Setting range to %x - %x\n",io->start,io->stop);  */
 	
 	/* write the new values */
 	indirect_write16(sock,I365_IO(map)+I365_W_START,io->start);            	
@@ -717,7 +717,7 @@ static int i82092aa_set_mem_map(struct p
 	if ( (mem->card_start > 0x3ffffff) || (region.start > region.end) ||
 	     (mem->speed > 1000) ) {
 		leave("i82092aa_set_mem_map: invalid address / speed");
-		printk("invalid mem map for socket %i : %lx to %lx with a start of %x \n",sock,region.start, region.end, mem->card_start);
+		printk("invalid mem map for socket %i : %lx to %lx with a start of %x\n",sock,region.start, region.end, mem->card_start);
 		return -EINVAL;
 	}
 	
@@ -726,7 +726,7 @@ static int i82092aa_set_mem_map(struct p
 	              indirect_resetbit(sock, I365_ADDRWIN, I365_ENA_MEM(map));
 	                 
 	                 
-/* 	printk("set_mem_map: Setting map %i range to %x - %x on socket %i, speed is %i, active = %i \n",map, region.start,region.end,sock,mem->speed,mem->flags & MAP_ACTIVE);  */
+/* 	printk("set_mem_map: Setting map %i range to %x - %x on socket %i, speed is %i, active = %i\n",map, region.start,region.end,sock,mem->speed,mem->flags & MAP_ACTIVE);  */
 
 	/* write the start address */
 	base = I365_MEM(map);
Index: linux-kj/drivers/pcmcia/m32r_cfc.c
===================================================================
--- linux-kj.orig/drivers/pcmcia/m32r_cfc.c	2005-09-21 01:19:32.000000000 +0400
+++ linux-kj/drivers/pcmcia/m32r_cfc.c	2005-09-21 01:35:54.000000000 +0400
@@ -158,7 +158,7 @@ void pcc_ioread_word(int sock, unsigned 
 		printk("m32r_cfc: ioread_word :illigal size %u : %#lx\n", size,
 			port);
 	if (size == 9)
-		printk("m32r_cfc: ioread_word :insw \n");
+		printk("m32r_cfc: ioread_word :insw\n");
 
 	addr = pcc_port2addr(port, 2);
 	if (!addr) {
@@ -214,7 +214,7 @@ void pcc_iowrite_word(int sock, unsigned
 		printk("m32r_cfc: iowrite_word :illigal size %u : %#lx\n",
 			size, port);
 	if(size == 9)
-		printk("m32r_cfc: iowrite_word :outsw \n");
+		printk("m32r_cfc: iowrite_word :outsw\n");
 
 	addr = pcc_port2addr(port, 2);
 	if (!addr) {
Index: linux-kj/drivers/s390/block/dasd_proc.c
===================================================================
--- linux-kj.orig/drivers/s390/block/dasd_proc.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/s390/block/dasd_proc.c	2005-09-21 01:35:54.000000000 +0400
@@ -230,7 +230,7 @@ dasd_statistics_read(char *page, char **
 	str = dasd_statistics_array(str, prof->dasd_io_time2ps, shift);
 	str += sprintf(str, "Histogram of I/O time between irq and end\n");
 	str = dasd_statistics_array(str, prof->dasd_io_time3, shift);
-	str += sprintf(str, "# of req in chanq at enqueuing (1..32) \n");
+	str += sprintf(str, "# of req in chanq at enqueuing (1..32)\n");
 	str = dasd_statistics_array(str, prof->dasd_io_nr_req, shift);
 	len = str - page;
 #else
Index: linux-kj/drivers/s390/block/xpram.c
===================================================================
--- linux-kj.orig/drivers/s390/block/xpram.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/s390/block/xpram.c	2005-09-21 01:35:54.000000000 +0400
@@ -81,7 +81,7 @@ module_param_array(sizes, int, NULL, 0);
 MODULE_PARM_DESC(devs, "number of devices (\"partitions\"), " \
 		 "the default is " __MODULE_STRING(XPRAM_DEVS) "\n");
 MODULE_PARM_DESC(sizes, "list of device (partition) sizes " \
-		 "the defaults are 0s \n" \
+		 "the defaults are 0s\n" \
 		 "All devices with size 0 equally partition the "
 		 "remaining space on the expanded strorage not "
 		 "claimed by explicit sizes\n");
@@ -386,7 +386,7 @@ static int __init xpram_setup_sizes(unsi
 			mem_auto_no++;
 	}
 	
-	PRINT_INFO("  number of devices (partitions): %d \n", xpram_devs);
+	PRINT_INFO("  number of devices (partitions): %d\n", xpram_devs);
 	for (i = 0; i < xpram_devs; i++) {
 		if (xpram_sizes[i])
 			PRINT_INFO("  size of partition %d: %u kB\n",
Index: linux-kj/drivers/s390/char/tape_core.c
===================================================================
--- linux-kj.orig/drivers/s390/char/tape_core.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/char/tape_core.c	2005-09-21 01:35:54.000000000 +0400
@@ -845,9 +845,9 @@ tape_dump_sense(struct tape_device* devi
 		PRINT_INFO("OP	  : %s\n", tape_op_verbose[request->op]);
 
 	sptr = (unsigned int *) irb->ecw;
-	PRINT_INFO("Sense data: %08X %08X %08X %08X \n",
+	PRINT_INFO("Sense data: %08X %08X %08X %08X\n",
 		   sptr[0], sptr[1], sptr[2], sptr[3]);
-	PRINT_INFO("Sense data: %08X %08X %08X %08X \n",
+	PRINT_INFO("Sense data: %08X %08X %08X %08X\n",
 		   sptr[4], sptr[5], sptr[6], sptr[7]);
 	PRINT_INFO("--------------------------------------------------\n");
 }
Index: linux-kj/drivers/s390/char/vmlogrdr.c
===================================================================
--- linux-kj.orig/drivers/s390/char/vmlogrdr.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/char/vmlogrdr.c	2005-09-21 01:35:54.000000000 +0400
@@ -388,7 +388,7 @@ vmlogrdr_open (struct inode *inode, stru
 					logptr->iucv_handle, NULL);
 	if (connect_rc) {
 		printk (KERN_ERR "vmlogrdr: iucv connection to %s "
-			"failed with rc %i \n", logptr->system_service,
+			"failed with rc %i\n", logptr->system_service,
 			connect_rc);
 		goto not_connected;
 	}
Index: linux-kj/drivers/s390/cio/blacklist.c
===================================================================
--- linux-kj.orig/drivers/s390/cio/blacklist.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/cio/blacklist.c	2005-09-21 01:35:54.000000000 +0400
@@ -267,7 +267,7 @@ blacklist_parse_proc_parameters (char *b
 		 */
 		blacklist_parse_parameters (buf + 4, add);
 	} else {
-		printk (KERN_WARNING "cio_ignore: Parse error; \n"
+		printk (KERN_WARNING "cio_ignore: Parse error;\n"
 			KERN_WARNING "try using 'free all|<devno-range>,"
 				     "<devno-range>,...'\n"
 			KERN_WARNING "or 'add <devno-range>,"
Index: linux-kj/drivers/s390/cio/device_status.c
===================================================================
--- linux-kj.orig/drivers/s390/cio/device_status.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/cio/device_status.c	2005-09-21 01:35:54.000000000 +0400
@@ -62,7 +62,7 @@ ccw_device_path_notoper(struct ccw_devic
 	stsch (sch->irq, &sch->schib);
 
 	CIO_MSG_EVENT(0, "%s(%04x) - path(s) %02x are "
-		      "not operational \n", __FUNCTION__, sch->irq,
+		      "not operational\n", __FUNCTION__, sch->irq,
 		      sch->schib.pmcw.pnom);
 
 	sch->lpm &= ~sch->schib.pmcw.pnom;
Index: linux-kj/drivers/s390/net/claw.c
===================================================================
--- linux-kj.orig/drivers/s390/net/claw.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/net/claw.c	2005-09-21 01:35:54.000000000 +0400
@@ -317,7 +317,7 @@ claw_probe(struct ccwgroup_device *cgdev
 	if (privptr == NULL) {
 		probe_error(cgdev);
 		put_device(&cgdev->dev);
-		printk(KERN_WARNING "Out of memory %s %s Exit Line %d \n",
+		printk(KERN_WARNING "Out of memory %s %s Exit Line %d\n",
 			cgdev->cdev[0]->dev.bus_id,__FUNCTION__,__LINE__);
 		CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM);
 		return -ENOMEM;
@@ -328,7 +328,7 @@ claw_probe(struct ccwgroup_device *cgdev
         if ((privptr->p_mtc_envelope==NULL) || (privptr->p_env==NULL)) {
                 probe_error(cgdev);
 		put_device(&cgdev->dev);
-		printk(KERN_WARNING "Out of memory %s %s Exit Line %d \n",
+		printk(KERN_WARNING "Out of memory %s %s Exit Line %d\n",
 			cgdev->cdev[0]->dev.bus_id,__FUNCTION__,__LINE__);
 		CLAW_DBF_TEXT_(2,setup,"probex%d",-ENOMEM);
                 return -ENOMEM;
@@ -347,7 +347,7 @@ claw_probe(struct ccwgroup_device *cgdev
 	if (rc) {
 		probe_error(cgdev);
 		put_device(&cgdev->dev);
-		printk(KERN_WARNING "add_files failed %s %s Exit Line %d \n",
+		printk(KERN_WARNING "add_files failed %s %s Exit Line %d\n",
 			cgdev->cdev[0]->dev.bus_id,__FUNCTION__,__LINE__);
 		CLAW_DBF_TEXT_(2,setup,"probex%d",rc);
 		return rc;
@@ -486,7 +486,7 @@ claw_change_mtu(struct net_device *dev, 
 	struct claw_privbk  *privptr=dev->priv;
 	int buff_size;
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__);
 #endif
 #ifdef DEBUGMSG
         printk(KERN_INFO "variable dev =\n");
@@ -530,12 +530,12 @@ claw_open(struct net_device *dev)
         struct ccwbk *p_buf;
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(4,trace,"open");
 	if (!dev | (dev->name[0] == 0x00)) {
 		CLAW_DBF_TEXT(2,trace,"BadDev");
-	 	printk(KERN_WARNING "claw: Bad device at open failing \n");
+	 	printk(KERN_WARNING "claw: Bad device at open failing\n");
 		return -ENODEV;
 	}
 	privptr = (struct claw_privbk *)dev->priv;
@@ -704,7 +704,7 @@ claw_irq_handler(struct ccw_device *cdev
 
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s enter  \n",__FUNCTION__);
+        printk(KERN_INFO "%s enter\n",__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(4,trace,"clawirq");
         /* Bypass all 'unsolicited interrupts' */
@@ -861,7 +861,7 @@ claw_irq_handler(struct ccw_device *cdev
                                         privptr->stats.rx_errors++;
                                         printk(KERN_INFO "%s: Restart is "
 						"required after remote "
-						"side recovers \n",
+						"side recovers\n",
 						dev->name);
                                 }
 #ifdef FUNCTRACE
@@ -1009,7 +1009,7 @@ claw_irq_tasklet ( unsigned long data )
 	p_ch = (struct chbk *) data;
         dev = (struct net_device *)p_ch->ndev;
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__);
 #endif
 #ifdef DEBUGMSG
         printk(KERN_INFO "%s: variable p_ch =\n",dev->name);
@@ -1056,7 +1056,7 @@ claw_release(struct net_device *dev)
         if (!privptr)
                 return 0;
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(4,trace,"release");
 #ifdef DEBUGMSG
@@ -1243,7 +1243,7 @@ claw_write_next ( struct chbk * p_ch )
 	int	rc;
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",p_ch->ndev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",p_ch->ndev->name,__FUNCTION__);
         printk(KERN_INFO "%s: variable p_ch =\n",p_ch->ndev->name);
         dumpit((char *) p_ch, sizeof(struct chbk));
 #endif
@@ -1320,7 +1320,7 @@ pages_to_order_of_mag(int num_of_pages)
 	int	order_of_mag=1;		/* assume 2 pages */
 	int	nump=2;
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s Enter pages = %d \n",__FUNCTION__,num_of_pages);
+        printk(KERN_INFO "%s Enter pages = %d\n",__FUNCTION__,num_of_pages);
 #endif
 	CLAW_DBF_TEXT_(5,trace,"pages%d",num_of_pages);
 	if (num_of_pages == 1)   {return 0; }  /* magnitude of 0 = 1 page */
@@ -1357,7 +1357,7 @@ add_claw_reads(struct net_device *dev, s
         struct ccwbk*  p_buf;
 #endif
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__);
 #endif
 #ifdef DEBUGMSG
         printk(KERN_INFO "dev\n");
@@ -1407,9 +1407,9 @@ add_claw_reads(struct net_device *dev, s
 
         if ( privptr-> p_read_active_first ==NULL ) {
 #ifdef DEBUGMSG
-                printk(KERN_INFO "%s:%s p_read_active_frist == NULL \n",
+                printk(KERN_INFO "%s:%s p_read_active_frist == NULL\n",
 			dev->name,__FUNCTION__);
-                printk(KERN_INFO "%s:%s Read active first/last changed \n",
+                printk(KERN_INFO "%s:%s Read active first/last changed\n",
 			dev->name,__FUNCTION__);
 #endif
                 privptr-> p_read_active_first= p_first;  /*    set new first */
@@ -1418,7 +1418,7 @@ add_claw_reads(struct net_device *dev, s
         else {
 
 #ifdef DEBUGMSG
-                printk(KERN_INFO "%s:%s Read in progress \n",
+                printk(KERN_INFO "%s:%s Read in progress\n",
 		dev->name,__FUNCTION__);
 #endif
                 /* set up TIC ccw  */
@@ -1458,14 +1458,14 @@ add_claw_reads(struct net_device *dev, s
                 privptr->p_read_active_last=p_last;
         } /* end of if ( privptr-> p_read_active_first ==NULL)  */
 #ifdef IOTRACE
-        printk(KERN_INFO "%s:%s  dump p_last CCW BK \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s  dump p_last CCW BK\n",dev->name,__FUNCTION__);
         dumpit((char *)p_last, sizeof(struct ccwbk));
-        printk(KERN_INFO "%s:%s  dump p_end CCW BK \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s  dump p_end CCW BK\n",dev->name,__FUNCTION__);
         dumpit((char *)p_end, sizeof(struct endccw));
 
-        printk(KERN_INFO "%s:%s dump p_first CCW BK \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s dump p_first CCW BK\n",dev->name,__FUNCTION__);
         dumpit((char *)p_first, sizeof(struct ccwbk));
-        printk(KERN_INFO "%s:%s Dump Active CCW chain \n",
+        printk(KERN_INFO "%s:%s Dump Active CCW chain\n",
 		dev->name,__FUNCTION__);
         p_buf=privptr->p_read_active_first;
         while (p_buf!=NULL) {
@@ -1490,7 +1490,7 @@ static void inline
 ccw_check_return_code(struct ccw_device *cdev, int return_code)
 {
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s: %s() > enter  \n",
+        printk(KERN_INFO "%s: %s() > enter\n",
 		cdev->dev.bus_id,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(4,trace,"ccwret");
@@ -1510,11 +1510,11 @@ ccw_check_return_code(struct ccw_device 
 					"for IO ENODEV\n", cdev->dev.bus_id);
                                 break;
                         case -EIO:
-                                printk(KERN_EMERG "%s: Status pending... EIO \n",
+                                printk(KERN_EMERG "%s: Status pending... EIO\n",
 					cdev->dev.bus_id);
                                 break;
 			case -EINVAL:
-                                printk(KERN_EMERG "%s: Invalid Dev State EINVAL \n",
+                                printk(KERN_EMERG "%s: Invalid Dev State EINVAL\n",
 					cdev->dev.bus_id);
                                 break;
                         default:
@@ -1714,11 +1714,11 @@ find_link(struct net_device *dev, char *
 	int    rc=0;
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s > enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s > enter\n",dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(2,setup,"findlink");
 #ifdef DEBUGMSG
-        printk(KERN_INFO "%s: variable dev = \n",dev->name);
+        printk(KERN_INFO "%s: variable dev =\n",dev->name);
         dumpit((char *) dev, sizeof(struct net_device));
         printk(KERN_INFO "%s: variable host_name = %s\n",dev->name, host_name);
         printk(KERN_INFO "%s: variable ws_name = %s\n",dev->name, ws_name);
@@ -1795,7 +1795,7 @@ claw_hw_tx(struct sk_buff *skb, struct n
         p_ch=(struct chbk *)&privptr->channel[WRITE];
 	p_env =privptr->p_env;
 #ifdef IOTRACE
-        printk(KERN_INFO "%s: %s() dump sk_buff  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s: %s() dump sk_buff\n",dev->name,__FUNCTION__);
         dumpit((char *)skb ,sizeof(struct sk_buff));
 #endif
 	claw_free_wrt_buf(dev);	/* Clean up free chain if posible */
@@ -1885,7 +1885,7 @@ claw_hw_tx(struct sk_buff *skb, struct n
 
         while (len_of_data > 0) {
 #ifdef DEBUGMSG
-                printk(KERN_INFO "%s: %s() length-of-data is %ld \n",
+                printk(KERN_INFO "%s: %s() length-of-data is %ld\n",
 			dev->name ,__FUNCTION__,len_of_data);
                 dumpit((char *)pDataAddress ,64);
 #endif
@@ -1921,7 +1921,7 @@ claw_hw_tx(struct sk_buff *skb, struct n
                 }
                 p_last_ccw=p_this_ccw;      /* save new last block */
 #ifdef IOTRACE
-		printk(KERN_INFO "%s: %s() > CCW and Buffer %ld bytes long \n",
+		printk(KERN_INFO "%s: %s() > CCW and Buffer %ld bytes long\n",
 			dev->name,__FUNCTION__,bytesInThisBuffer);
                 dumpit((char *)p_this_ccw, sizeof(struct ccwbk));
                 dumpit((char *)p_this_ccw->p_buffer, 64);
@@ -2006,7 +2006,7 @@ claw_hw_tx(struct sk_buff *skb, struct n
 
 
 #ifdef IOTRACE
-        printk(KERN_INFO "%s: %s() >  Dump Active CCW chain \n",
+        printk(KERN_INFO "%s: %s() >  Dump Active CCW chain\n",
 		dev->name,__FUNCTION__);
         p_buf=privptr->p_write_active_first;
         while (p_buf!=NULL) {
@@ -2037,7 +2037,7 @@ Done2:
 	claw_clearbit_busy(TB_TX,dev);
 Done:
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s: %s() > exit on line %d, rc = %d \n",
+        printk(KERN_INFO "%s: %s() > exit on line %d, rc = %d\n",
 		dev->name,__FUNCTION__,__LINE__, rc);
 #endif
 	return(rc);
@@ -2072,7 +2072,7 @@ init_ccw_bk(struct net_device *dev)
         addr_t   real_TIC_address;
         int i,j;
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s: %s() enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s: %s() enter\n",dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(4,trace,"init_ccw");
 #ifdef DEBUGMSG
@@ -2286,7 +2286,7 @@ init_ccw_bk(struct net_device *dev)
         p_endccw->read2_nop2.cda          = 0;
 
 #ifdef IOTRACE
-        printk(KERN_INFO "%s: %s() dump claw ending CCW BK \n",
+        printk(KERN_INFO "%s: %s() dump claw ending CCW BK\n",
 		dev->name,__FUNCTION__);
         dumpit((char *)p_endccw, sizeof(struct endccw));
 #endif
@@ -2297,7 +2297,7 @@ init_ccw_bk(struct net_device *dev)
         */
 
 #ifdef DEBUGMSG
-        printk(KERN_INFO "%s: %s()  Begin build a chain of CCW buffer \n",
+        printk(KERN_INFO "%s: %s()  Begin build a chain of CCW buffer\n",
 		dev->name,__FUNCTION__);
 #endif
         p_buff=privptr->p_buff_ccw;
@@ -2316,7 +2316,7 @@ init_ccw_bk(struct net_device *dev)
         }
 #ifdef DEBUGMSG
         printk(KERN_INFO "%s: %s() "
-		"End build a chain of CCW buffer \n",
+		"End build a chain of CCW buffer\n",
 			dev->name,__FUNCTION__);
         p_buf=p_free_chain;
         while (p_buf!=NULL) {
@@ -2331,7 +2331,7 @@ init_ccw_bk(struct net_device *dev)
         */
 #ifdef DEBUGMSG
         printk(KERN_INFO "%s: %s() "
-		"Begin initialize ClawSignalBlock \n",
+		"Begin initialize ClawSignalBlock\n",
 		dev->name,__FUNCTION__);
 #endif
         if (privptr->p_claw_signal_blk==NULL) {
@@ -2380,7 +2380,7 @@ init_ccw_bk(struct net_device *dev)
 			ccw_pages_required * PAGE_SIZE);
 #ifdef DEBUGMSG
                 printk(KERN_INFO "%s: %s() Begin build claw write free "
-			"chain \n",dev->name,__FUNCTION__);
+			"chain\n",dev->name,__FUNCTION__);
 #endif
                 privptr->p_write_free_chain=NULL;
 
@@ -2476,7 +2476,7 @@ init_ccw_bk(struct net_device *dev)
 
 
 #ifdef DEBUGMSG
-        printk(KERN_INFO "%s:%s  End build claw write free chain \n",
+        printk(KERN_INFO "%s:%s  End build claw write free chain\n",
 	dev->name,__FUNCTION__);
         p_buf=privptr->p_write_free_chain;
         while (p_buf!=NULL) {
@@ -2519,7 +2519,7 @@ init_ccw_bk(struct net_device *dev)
                 *
                 */
 #ifdef DEBUGMSG
-                printk(KERN_INFO "%s: %s() Begin build claw read free chain \n",
+                printk(KERN_INFO "%s: %s() Begin build claw read free chain\n",
 			dev->name,__FUNCTION__);
 #endif
                 p_buff=privptr->p_buff_read;
@@ -2600,7 +2600,7 @@ init_ccw_bk(struct net_device *dev)
           else {  /* read Size >= PAGE_SIZE  */
 
 #ifdef DEBUGMSG
-        printk(KERN_INFO "%s: %s() Begin build claw read free chain \n",
+        printk(KERN_INFO "%s: %s() Begin build claw read free chain\n",
 		dev->name,__FUNCTION__);
 #endif
                 for (i=0 ; i< privptr->p_env->read_buffers ; i++) {
@@ -2705,7 +2705,7 @@ init_ccw_bk(struct net_device *dev)
           }     /*  read_size >= PAGE_SIZE   */
         }       /*  pBuffread = NULL */
 #ifdef DEBUGMSG
-        printk(KERN_INFO "%s: %s() >  End build claw read free chain \n",
+        printk(KERN_INFO "%s: %s() >  End build claw read free chain\n",
 		dev->name,__FUNCTION__);
         p_buf=p_first_CCWB;
         while (p_buf!=NULL) {
@@ -2734,7 +2734,7 @@ probe_error( struct ccwgroup_device *cgd
 {
   struct claw_privbk *privptr;
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s enter  \n",__FUNCTION__);
+        printk(KERN_INFO "%s enter\n",__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(4,trace,"proberr");
 #ifdef DEBUGMSG
@@ -2786,7 +2786,7 @@ claw_process_control( struct net_device 
         int rc;
         struct chbk *p_ch = NULL;
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s: %s() > enter  \n",
+        printk(KERN_INFO "%s: %s() > enter\n",
 		dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(2,setup,"clw_cntl");
@@ -2853,7 +2853,7 @@ claw_process_control( struct net_device 
                                 printk(KERN_INFO "%s:  Host name mismatch\n",
 					dev->name);
 				printk(KERN_INFO "%s: Received :%s: "
-					"expected :%s: \n",
+					"expected :%s:\n",
 					dev->name,
 					p_sysval->host_name,
 					temp_host_name);
@@ -2867,7 +2867,7 @@ claw_process_control( struct net_device 
                                 printk(KERN_INFO "%s: WS name mismatch\n",
 					dev->name);
 				 printk(KERN_INFO "%s: Received :%s: "
-                                        "expected :%s: \n",
+                                        "expected :%s:\n",
                                         dev->name,
                                         p_sysval->WS_name,
 					temp_ws_name);
@@ -2939,7 +2939,7 @@ claw_process_control( struct net_device 
                                         break;
                                 default:
                                         printk(KERN_INFO "%s: Sys Validate "
-						"error code=%d \n",
+						"error code=%d\n",
 						 dev->name, p_ctlbk->rc );
                                         break;
                         }
@@ -2958,7 +2958,7 @@ claw_process_control( struct net_device 
                         if (privptr->active_link_ID!=0 ) {
                                 claw_snd_disc(dev, p_ctlbk);
                                 printk(KERN_INFO "%s: Conn Req error : "
-					"already logical link is active \n",
+					"already logical link is active\n",
 					dev->name);
                         }
                         if (p_ctlbk->linkid!=1 ) {
@@ -3006,7 +3006,7 @@ claw_process_control( struct net_device 
                                 p_connect->WS_name);
 
                         if (p_ctlbk->rc !=0 ) {
-                                printk(KERN_INFO "%s: Conn Resp error: rc=%d \n",
+                                printk(KERN_INFO "%s: Conn Resp error: rc=%d\n",
 					dev->name, p_ctlbk->rc);
                                 return 1;
                         }
@@ -3042,7 +3042,7 @@ claw_process_control( struct net_device 
                         }
                         else {
                                 printk(KERN_INFO "%s: Conn confirm: "
-					"unexpected linkid=%d \n",
+					"unexpected linkid=%d\n",
 					dev->name, p_ctlbk->linkid);
                                 claw_snd_disc(dev, p_ctlbk);
                         }
@@ -3065,7 +3065,7 @@ claw_process_control( struct net_device 
 				dev->name);
                         break;
                 default:
-                        printk(KERN_INFO "%s:  Unexpected command code=%d \n",
+                        printk(KERN_INFO "%s:  Unexpected command code=%d\n",
 				dev->name,  p_ctlbk->command);
                         break;
         }
@@ -3095,11 +3095,11 @@ claw_send_control(struct net_device *dev
         struct sk_buff 			*skb;
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s > enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s > enter\n",dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(2,setup,"sndcntl");
 #ifdef DEBUGMSG
-	printk(KERN_INFO "%s: Sending Control Packet \n",dev->name);
+	printk(KERN_INFO "%s: Sending Control Packet\n",dev->name);
         printk(KERN_INFO "%s: variable type = 0x%X, link = "
 		"%d, correlator = %d, rc = %d\n",
                 dev->name,type, link, correlator, rc);
@@ -3168,7 +3168,7 @@ claw_send_control(struct net_device *dev
 	memcpy(skb_put(skb, sizeof(struct clawctl)),
 		p_ctl, sizeof(struct clawctl));
 #ifdef IOTRACE
-	 printk(KERN_INFO "%s: outbnd claw cntl data \n",dev->name);
+	 printk(KERN_INFO "%s: outbnd claw cntl data\n",dev->name);
         dumpit((char *)p_ctl,sizeof(struct clawctl));
 #endif
 	if (privptr->p_env->packing >= PACK_SEND)
@@ -3195,7 +3195,7 @@ claw_snd_conn_req(struct net_device *dev
         struct clawctl 	   *p_ctl;
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(2,setup,"snd_conn");
 #ifdef  DEBUGMSG
@@ -3381,7 +3381,7 @@ unpack_read(struct net_device *dev )
 	int     p=0;
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s enter\n",dev->name,__FUNCTION__);
 #endif
 	CLAW_DBF_TEXT(4,trace,"unpkread");
         p_first_ccw=NULL;
@@ -3394,10 +3394,10 @@ unpack_read(struct net_device *dev )
         i=0;
 	while (p_this_ccw!=NULL && p_this_ccw->header.flag!=CLAW_PENDING) {
 #ifdef IOTRACE
-		printk(KERN_INFO "%s p_this_ccw \n",dev->name);
+		printk(KERN_INFO "%s p_this_ccw\n",dev->name);
                 dumpit((char*)p_this_ccw, sizeof(struct ccwbk));
                 printk(KERN_INFO "%s Inbound p_this_ccw->p_buffer(64)"
-			" pk=%d \n",dev->name,p_env->packing);
+			" pk=%d\n",dev->name,p_env->packing);
                 dumpit((char *)p_this_ccw->p_buffer, 64 );
 #endif
 		pack_off = 0;
@@ -3449,7 +3449,7 @@ unpack_read(struct net_device *dev )
                         }
 #ifdef DEBUGMSG
                         printk(KERN_INFO "%s:%s goto next "
-				"frame from MoretoComeSkip \n",
+				"frame from MoretoComeSkip\n",
 				dev->name,__FUNCTION__);
 #endif
                         goto NextFrame;
@@ -3459,7 +3459,7 @@ unpack_read(struct net_device *dev )
                         claw_process_control(dev, p_this_ccw);
 #ifdef DEBUGMSG
                         printk(KERN_INFO "%s:%s goto next "
-				"frame from claw_process_control \n",
+				"frame from claw_process_control\n",
 				dev->name,__FUNCTION__);
 #endif
 			CLAW_DBF_TEXT(4,trace,"UnpkCntl");
@@ -3482,7 +3482,7 @@ unpack_next:
 		}
                 if (privptr->mtc_logical_link<0) {
 #ifdef DEBUGMSG
-                printk(KERN_INFO "%s: %s mtc_logical_link < 0  \n",
+                printk(KERN_INFO "%s: %s mtc_logical_link < 0\n",
 			dev->name,__FUNCTION__);
 #endif
 
@@ -3500,7 +3500,7 @@ unpack_next:
                         /*      error     */
 #ifdef DEBUGMSG
                         printk(KERN_INFO "%s: %s > goto next "
-				"frame from MoretoComeSkip \n",
+				"frame from MoretoComeSkip\n",
 				dev->name,
 				__FUNCTION__);
                         printk(KERN_INFO "      bytes_to_mov %d > (MAX_ENVELOPE_"
@@ -3519,13 +3519,13 @@ unpack_next:
                         	p_this_ccw->p_buffer, bytes_to_mov);
 		}
 #ifdef DEBUGMSG
-                printk(KERN_INFO "%s: %s() received data \n",
+                printk(KERN_INFO "%s: %s() received data\n",
 			dev->name,__FUNCTION__);
 		if (p_env->packing == DO_PACKED)
 			dumpit((char *)p_packd+sizeof(struct clawph),32);
 		else
 	                dumpit((char *)p_this_ccw->p_buffer, 32);
-		printk(KERN_INFO "%s: %s() bytelength %d \n",
+		printk(KERN_INFO "%s: %s() bytelength %d\n",
 			dev->name,__FUNCTION__,bytes_to_mov);
 #endif
                 if (mtc_this_frm==0) {
@@ -3544,7 +3544,7 @@ unpack_next:
                                 netif_rx(skb);
 #ifdef DEBUGMSG
                                 printk(KERN_INFO "%s: %s() netif_"
-					"rx(skb) completed \n",
+					"rx(skb) completed\n",
 					dev->name,__FUNCTION__);
 #endif
                         }
@@ -3589,7 +3589,7 @@ NextFrame:
         /*      check validity                  */
 
 #ifdef IOTRACE
-        printk(KERN_INFO "%s:%s processed frame is %d \n",
+        printk(KERN_INFO "%s:%s processed frame is %d\n",
 		dev->name,__FUNCTION__,i);
         printk(KERN_INFO "%s:%s  F:%lx L:%lx\n",
 		dev->name,
@@ -3625,7 +3625,7 @@ claw_strt_read (struct net_device *dev, 
         p_ch=&privptr->channel[READ];
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "%s:%s Enter  \n",dev->name,__FUNCTION__);
+        printk(KERN_INFO "%s:%s Enter\n",dev->name,__FUNCTION__);
         printk(KERN_INFO "%s: variable lock = %d, dev =\n",dev->name, lock);
         dumpit((char *) dev, sizeof(struct net_device));
 #endif
@@ -3723,7 +3723,7 @@ claw_strt_out_IO( struct net_device *dev
         if (test_and_set_bit(0, (void *)&p_ch->IO_active) == 0) {
                 parm = (unsigned long) p_ch;
 #ifdef DEBUGMSG
-                printk(KERN_INFO "%s:%s do_io \n" ,dev->name,__FUNCTION__);
+                printk(KERN_INFO "%s:%s do_io\n" ,dev->name,__FUNCTION__);
                 dumpit((char *)p_first_ccw, sizeof(struct ccwbk));
 #endif
 		CLAW_DBF_TEXT(2,trace,"StWrtIO");
@@ -3769,7 +3769,7 @@ claw_free_wrt_buf( struct net_device *de
         p_first_ccw=NULL;
         p_last_ccw=NULL;
 #ifdef IOTRACE
-        printk(KERN_INFO "%s:  Dump current CCW chain \n",dev->name  );
+        printk(KERN_INFO "%s:  Dump current CCW chain\n",dev->name  );
         p_buf=privptr->p_write_active_first;
         while (p_buf!=NULL) {
                 dumpit((char *)p_buf, sizeof(struct ccwbk));
@@ -3817,7 +3817,7 @@ claw_free_wrt_buf( struct net_device *de
 #endif
         }
 #ifdef IOTRACE
-        printk(KERN_INFO "%s: Dump arranged CCW chain \n",dev->name  );
+        printk(KERN_INFO "%s: Dump arranged CCW chain\n",dev->name  );
         p_buf=privptr->p_write_active_first;
         while (p_buf!=NULL) {
                 dumpit((char *)p_buf, sizeof(struct ccwbk));
@@ -4088,7 +4088,7 @@ claw_shutdown_device(struct ccwgroup_dev
 	if (ndev) {
 		/* Close the device */
 		printk(KERN_INFO
-			"%s: shuting down \n",ndev->name);
+			"%s: shuting down\n",ndev->name);
 		if (ndev->flags & IFF_RUNNING)
 			ret = claw_release(ndev);
 		ndev->flags &=~IFF_RUNNING;
@@ -4414,7 +4414,7 @@ claw_init(void)
 
 
 #ifdef FUNCTRACE
-        printk(KERN_INFO "claw: %s() enter \n",__FUNCTION__);
+        printk(KERN_INFO "claw: %s() enter\n",__FUNCTION__);
 #endif
 	ret = claw_register_debug_facility();
 	if (ret) {
@@ -4430,7 +4430,7 @@ claw_init(void)
 			__FUNCTION__,ret);
 	}
 #ifdef FUNCTRACE
-        printk(KERN_INFO "claw: %s() exit \n",__FUNCTION__);
+        printk(KERN_INFO "claw: %s() exit\n",__FUNCTION__);
 #endif
 	return ret;
 }
Index: linux-kj/drivers/s390/net/ctcmain.c
===================================================================
--- linux-kj.orig/drivers/s390/net/ctcmain.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/net/ctcmain.c	2005-09-21 01:35:54.000000000 +0400
@@ -549,7 +549,7 @@ ccw_check_return_code(struct channel *ch
 			fsm_event(ch->fsm, CH_EVENT_IO_ENODEV, ch);
 			break;
 		case -EIO:
-			ctc_pr_emerg("%s (%s): Status pending... \n",
+			ctc_pr_emerg("%s (%s): Status pending...\n",
 				     ch->id, msg);
 			fsm_event(ch->fsm, CH_EVENT_IO_EIO, ch);
 			break;
Index: linux-kj/drivers/s390/net/ctctty.c
===================================================================
--- linux-kj.orig/drivers/s390/net/ctctty.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/net/ctctty.c	2005-09-21 01:35:54.000000000 +0400
@@ -972,7 +972,7 @@ ctc_tty_open(struct tty_struct *tty, str
 	retval = ctc_tty_block_til_ready(tty, filp, info);
 	if (retval) {
 #ifdef CTC_DEBUG_MODEM_OPEN
-		printk(KERN_DEBUG "ctc_tty_open return after ctc_tty_block_til_ready \n");
+		printk(KERN_DEBUG "ctc_tty_open return after ctc_tty_block_til_ready\n");
 #endif
 		return retval;
 	}
Index: linux-kj/drivers/s390/net/qeth_main.c
===================================================================
--- linux-kj.orig/drivers/s390/net/qeth_main.c	2005-09-21 01:19:16.000000000 +0400
+++ linux-kj/drivers/s390/net/qeth_main.c	2005-09-21 01:35:54.000000000 +0400
@@ -5568,7 +5568,7 @@ qeth_layer2_send_setgroupmac_cb(struct q
 	/* MAC already registered, needed in couple/uncouple case */
 	if (cmd->hdr.return_code == 0x2005) {
 		PRINT_WARN("Group MAC %02x:%02x:%02x:%02x:%02x:%02x " \
-			  "already existing on %s \n",
+			  "already existing on %s\n",
 			  mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
 			  QETH_CARD_IFNAME(card));
 		cmd->hdr.return_code = 0;
@@ -6621,7 +6621,7 @@ qeth_start_ipa_ip_fragmentation(struct q
 			   "assist on %s: 0x%x\n",
 			   QETH_CARD_IFNAME(card), rc);
 	} else
-		PRINT_INFO("Hardware IP fragmentation enabled \n");
+		PRINT_INFO("Hardware IP fragmentation enabled\n");
 	return rc;
 }
 
@@ -6670,7 +6670,7 @@ qeth_start_ipa_vlan(struct qeth_card *ca
 			   "assist on %s: 0x%x\n",
 			   QETH_CARD_IFNAME(card), rc);
 	} else {
-		PRINT_INFO("VLAN enabled \n");
+		PRINT_INFO("VLAN enabled\n");
 		card->dev->features |=
 			NETIF_F_HW_VLAN_FILTER |
 			NETIF_F_HW_VLAN_TX |
@@ -6752,7 +6752,7 @@ qeth_softsetup_ipv6(struct qeth_card *ca
 			   QETH_CARD_IFNAME(card), rc);
 		return rc;
 	}
-	PRINT_INFO("IPV6 enabled \n");
+	PRINT_INFO("IPV6 enabled\n");
 	return 0;
 }
 
@@ -6805,7 +6805,7 @@ qeth_start_ipa_broadcast(struct qeth_car
 		goto out;
 	}
 	card->info.broadcast_capable = QETH_BROADCAST_WITH_ECHO;
-	PRINT_INFO("Broadcast enabled \n");
+	PRINT_INFO("Broadcast enabled\n");
 	rc = qeth_send_simple_setassparms(card, IPA_FILTERING,
 					  IPA_CMD_ASS_ENABLE, 1);
 	if (rc) {
@@ -6874,7 +6874,7 @@ qeth_start_ipa_checksum(struct qeth_card
 	}
 	rc = qeth_send_checksum_command(card);
 	if (!rc) {
-		PRINT_INFO("HW Checksumming (inbound) enabled \n");
+		PRINT_INFO("HW Checksumming (inbound) enabled\n");
 	}
 	return rc;
 }
Index: linux-kj/drivers/scsi/53c7xx.c
===================================================================
--- linux-kj.orig/drivers/scsi/53c7xx.c	2005-09-21 01:19:20.000000000 +0400
+++ linux-kj/drivers/scsi/53c7xx.c	2005-09-21 01:35:54.000000000 +0400
@@ -1270,7 +1270,7 @@ ncr53c7xx_init (Scsi_Host_Template *tpnt
     }
 
     if (!ok) {
-	printk ("scsi%d : not initializing, no I/O or memory mapping known \n",
+	printk ("scsi%d : not initializing, no I/O or memory mapping known\n",
 	    instance->host_no);
 	scsi_unregister (instance);
 	return -1;
@@ -4388,7 +4388,7 @@ abort_connected (struct Scsi_Host *host)
 	return 0;
     }
 
-    printk ("scsi%d : DANGER : abort_connected() called \n",
+    printk ("scsi%d : DANGER : abort_connected() called\n",
 	host->host_no);
 
 #ifdef NEW_ABORT
@@ -5896,7 +5896,7 @@ disable (struct Scsi_Host *host) {
 	    nuke_list->result = DID_ERROR << 16;
 	    nuke_list->scsi_done(nuke_list);
     }
-    printk ("scsi%d : done. \n", host->host_no);
+    printk ("scsi%d : done.\n", host->host_no);
     printk (KERN_ALERT "scsi%d : disabled.  Unload and reload\n",
     	host->host_no);
     return 0;
Index: linux-kj/drivers/scsi/BusLogic.c
===================================================================
--- linux-kj.orig/drivers/scsi/BusLogic.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/BusLogic.c	2005-09-21 01:35:54.000000000 +0400
@@ -2290,7 +2290,7 @@ static int __init BusLogic_init(void)
 			 */
 			release_region(HostAdapter->IO_Address, HostAdapter->AddressCount);
 			if (!request_region(HostAdapter->IO_Address, HostAdapter->AddressCount, HostAdapter->FullModelName)) {
-				printk(KERN_WARNING "BusLogic: Release and re-register of " "port 0x%04lx failed \n", (unsigned long) HostAdapter->IO_Address);
+				printk(KERN_WARNING "BusLogic: Release and re-register of " "port 0x%04lx failed\n", (unsigned long) HostAdapter->IO_Address);
 				BusLogic_DestroyCCBs(HostAdapter);
 				BusLogic_ReleaseResources(HostAdapter);
 				list_del(&HostAdapter->host_list);
Index: linux-kj/drivers/scsi/NCR5380.c
===================================================================
--- linux-kj.orig/drivers/scsi/NCR5380.c	2005-09-21 01:19:21.000000000 +0400
+++ linux-kj/drivers/scsi/NCR5380.c	2005-09-21 01:35:54.000000000 +0400
@@ -97,7 +97,7 @@
 
 #if (NDEBUG & NDEBUG_LISTS)
 #define LIST(x,y) {printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); if ((x)==(y)) udelay(5); }
-#define REMOVE(w,x,y,z) {printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, (void*)(w), (void*)(x), (void*)(y), (void*)(z)); if ((x)==(y)) udelay(5); }
+#define REMOVE(w,x,y,z) {printk("LINE:%d   Removing: %p->%p  %p->%p\n", __LINE__, (void*)(w), (void*)(x), (void*)(y), (void*)(z)); if ((x)==(y)) udelay(5); }
 #else
 #define LIST(x,y)
 #define REMOVE(w,x,y,z)
Index: linux-kj/drivers/scsi/NCR53C9x.c
===================================================================
--- linux-kj.orig/drivers/scsi/NCR53C9x.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/NCR53C9x.c	2005-09-21 01:35:54.000000000 +0400
@@ -1844,7 +1844,7 @@ static int esp_do_data(struct NCR_ESP *e
 				while (!((esp->sreg=esp_read(eregs->esp_status)) & ESP_STAT_INTR) && --timeout)
 					udelay(2);
 				if (timeout == 0)
-					printk("DRQ datain timeout! \n");
+					printk("DRQ datain timeout!\n");
 
 				newphase = esp->sreg & ESP_STAT_PMASK;
 
@@ -1895,7 +1895,7 @@ static int esp_do_data(struct NCR_ESP *e
 				while (!((esp->sreg=esp_read(eregs->esp_status)) & ESP_STAT_INTR) && --timeout)
 					udelay(2);
 				if (timeout == 0)
-					printk("DRQ dataout timeout!  \n");
+					printk("DRQ dataout timeout!\n");
 
 				newphase = esp->sreg & ESP_STAT_PMASK;
 
@@ -1921,7 +1921,7 @@ static int esp_do_data(struct NCR_ESP *e
 			ESPDATA(("ir %x ... ", esp->ireg));
 
 			if (hmuch == 0)
-				ESPDATA(("done! \n"));
+				ESPDATA(("done!\n"));
 
 #if 0
 			local_irq_restore(flags);
Index: linux-kj/drivers/scsi/aha1542.c
===================================================================
--- linux-kj.orig/drivers/scsi/aha1542.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/aha1542.c	2005-09-21 01:35:54.000000000 +0400
@@ -362,7 +362,7 @@ static int __init aha1542_test_port(int 
 
 	/* Reset the adapter. I ought to make a hard reset, but it's not really necessary */
 
-	/*  DEB(printk("aha1542_test_port called \n")); */
+	/*  DEB(printk("aha1542_test_port called\n")); */
 
 	/* In case some other card was probing here, reset interrupts */
 	aha1542_intr_reset(bse);	/* reset interrupts, so they don't block */
@@ -538,7 +538,7 @@ static void aha1542_intr_handle(struct S
 
 		if (!SCtmp || !SCtmp->scsi_done) {
 			printk(KERN_WARNING "aha1542_intr_handle: Unexpected interrupt\n");
-			printk(KERN_WARNING "tarstat=%x, hastat=%x idlun=%x ccb#=%d \n", ccb[mbo].tarstat,
+			printk(KERN_WARNING "tarstat=%x, hastat=%x idlun=%x ccb#=%d\n", ccb[mbo].tarstat,
 			       ccb[mbo].hastat, ccb[mbo].idlun, mbo);
 			return;
 		}
@@ -1035,7 +1035,7 @@ static int __init aha1542_detect(Scsi_Ho
 	int count = 0;
 	int indx;
 
-	DEB(printk("aha1542_detect: \n"));
+	DEB(printk("aha1542_detect:\n"));
 
 	tpnt->proc_name = "aha1542";
 
@@ -1283,7 +1283,7 @@ fail:
 					}
 			}
 
-			DEB(printk(" *** NOW RUNNING MY OWN TEST *** \n"));
+			DEB(printk(" *** NOW RUNNING MY OWN TEST ***\n"));
 
 			for (i = 0; i < 4; ++i) {
 				unsigned char cmd[10];
Index: linux-kj/drivers/scsi/aha1740.c
===================================================================
--- linux-kj.orig/drivers/scsi/aha1740.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/aha1740.c	2005-09-21 01:35:54.000000000 +0400
@@ -593,7 +593,7 @@ static int aha1740_probe (struct device 
 	struct aha1740_hostdata *host;
 	struct eisa_device *edev = to_eisa_device (dev);
 
-	DEB(printk("aha1740_probe: \n"));
+	DEB(printk("aha1740_probe:\n"));
 	
 	slotbase = edev->base_addr + EISA_VENDOR_ID_OFFSET;
 	if (!request_region(slotbase, SLOTSIZE, "aha1740")) /* See if in use */
Index: linux-kj/drivers/scsi/atari_NCR5380.c
===================================================================
--- linux-kj.orig/drivers/scsi/atari_NCR5380.c	2005-09-21 01:19:20.000000000 +0400
+++ linux-kj/drivers/scsi/atari_NCR5380.c	2005-09-21 01:35:54.000000000 +0400
@@ -80,7 +80,7 @@
   { printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); \
     if ((x)==(y)) udelay(5); }
 #define REMOVE(w,x,y,z) \
-  { printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, \
+  { printk("LINE:%d   Removing: %p->%p  %p->%p\n", __LINE__, \
 	   (void*)(w), (void*)(x), (void*)(y), (void*)(z)); \
     if ((x)==(y)) udelay(5); }
 #else
Index: linux-kj/drivers/scsi/atp870u.c
===================================================================
--- linux-kj.orig/drivers/scsi/atp870u.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/atp870u.c	2005-09-21 01:35:54.000000000 +0400
@@ -1290,7 +1290,7 @@ TCM_ID:
 
 TCM_5:			/* isolation complete..  */
 /*    mbuf[32]=0;
-	printk(" \n%x %x %x %s\n ",assignid_map,mbuf[0],mbuf[1],&mbuf[2]); */
+	printk("\n%x %x %x %s\n ",assignid_map,mbuf[0],mbuf[1],&mbuf[2]); */
 	i = 15;
 	j = mbuf[0];
 	if ((j & 0x20) != 0) {	/* bit5=1:ID upto 7      */
@@ -3109,7 +3109,7 @@ static int atp870u_abort(struct scsi_cmn
 
 	dev = (struct atp_unit *)&host->hostdata;
 	c=SCpnt->device->channel;
-	printk(" atp870u: abort Channel = %x \n", c);
+	printk(" atp870u: abort Channel = %x\n", c);
 	printk("working=%x last_cmd=%x ", dev->working[c], dev->last_cmd[c]);
 	printk(" quhdu=%x quendu=%x ", dev->quhd[c], dev->quend[c]);
 	tmport = dev->ioport[c];
Index: linux-kj/drivers/scsi/ch.c
===================================================================
--- linux-kj.orig/drivers/scsi/ch.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/ch.c	2005-09-21 01:35:54.000000000 +0400
@@ -978,7 +978,7 @@ static int __init init_ch_module(void)
 {
 	int rc;
 	
-	printk(KERN_INFO "SCSI Media Changer driver v" VERSION " \n");
+	printk(KERN_INFO "SCSI Media Changer driver v" VERSION "\n");
         ch_sysfs_class = class_create(THIS_MODULE, "scsi_changer");
         if (IS_ERR(ch_sysfs_class)) {
 		rc = PTR_ERR(ch_sysfs_class);
Index: linux-kj/drivers/scsi/cpqfcTSinit.c
===================================================================
--- linux-kj.orig/drivers/scsi/cpqfcTSinit.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/cpqfcTSinit.c	2005-09-21 01:35:54.000000000 +0400
@@ -1483,7 +1483,7 @@ int cpqfcTS_queuecommand(Scsi_Cmnd *Cmnd
 
 int cpqfcTS_abort(Scsi_Cmnd *Cmnd)
 {
-//	printk(" cpqfcTS_abort called?? \n");
+//	printk(" cpqfcTS_abort called??\n");
  	return 0;
 }
  
@@ -1609,7 +1609,7 @@ int cpqfcTS_TargetDeviceReset( Scsi_Devi
 // Scsi_Request, etc.
 // For now, so people don't fall into a hole...
 
-  // printk("   ENTERING cpqfcTS_TargetDeviceReset() - flag=%d \n",reset_flags);
+  // printk("   ENTERING cpqfcTS_TargetDeviceReset() - flag=%d\n",reset_flags);
 
   if (ScsiDev->host->eh_active) return FAILED;
 
@@ -1668,7 +1668,7 @@ int cpqfcTS_TargetDeviceReset( Scsi_Devi
   scsi_put_command(SCpnt);
   SCpnt = NULL;
 
-  // printk("   LEAVING cpqfcTS_TargetDeviceReset() - return SUCCESS \n");
+  // printk("   LEAVING cpqfcTS_TargetDeviceReset() - return SUCCESS\n");
   return SUCCESS;
 }
 
@@ -1685,7 +1685,7 @@ int cpqfcTS_eh_device_reset(Scsi_Cmnd *C
 {
   int retval;
   Scsi_Device *SDpnt = Cmnd->device;
-  // printk("   ENTERING cpqfcTS_eh_device_reset() \n");
+  // printk("   ENTERING cpqfcTS_eh_device_reset()\n");
   spin_unlock_irq(Cmnd->device->host->host_lock);
   retval = cpqfcTS_TargetDeviceReset( SDpnt, 0);
   spin_lock_irq(Cmnd->device->host->host_lock);
Index: linux-kj/drivers/scsi/cpqfcTSworker.c
===================================================================
--- linux-kj.orig/drivers/scsi/cpqfcTSworker.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/cpqfcTSworker.c	2005-09-21 01:35:54.000000000 +0400
@@ -2688,7 +2688,7 @@ static void ScsiReportLunsDone(Scsi_Cmnd
   ULONG x_ID = 0xFFFFFFFF;
   UCHAR *ucBuff = Cmnd->request_buffer;
 
-//  printk("cpqfcTS: ReportLunsDone \n");
+//  printk("cpqfcTS: ReportLunsDone\n");
   // first, we need to find the Exchange for this command,
   // so we can find the fcPort struct to make the indicated
   // changes.
Index: linux-kj/drivers/scsi/dpt_i2o.c
===================================================================
--- linux-kj.orig/drivers/scsi/dpt_i2o.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/dpt_i2o.c	2005-09-21 01:35:54.000000000 +0400
@@ -1416,11 +1416,11 @@ static int adpt_i2o_parse_lct(adpt_hba* 
 			scsi_id = buf[1];
 			scsi_lun = (buf[2]>>8 )&0xff;
 			if(bus_no >= MAX_CHANNEL) {	// Something wrong skip it
-				printk(KERN_WARNING"%s: Channel number %d out of range \n", pHba->name, bus_no);
+				printk(KERN_WARNING"%s: Channel number %d out of range\n", pHba->name, bus_no);
 				continue;
 			}
 			if (scsi_id >= MAX_ID){
-				printk(KERN_WARNING"%s: SCSI ID %d out of range \n", pHba->name, bus_no);
+				printk(KERN_WARNING"%s: SCSI ID %d out of range\n", pHba->name, bus_no);
 				continue;
 			}
 			if(bus_no > pHba->top_scsi_channel){
@@ -2435,7 +2435,7 @@ static s32 adpt_i2o_reparse_lct(adpt_hba
 				adpt_i2o_install_device(pHba, d);
 	
 				if(bus_no >= MAX_CHANNEL) {	// Something wrong skip it
-					printk(KERN_WARNING"%s: Channel number %d out of range \n", pHba->name, bus_no);
+					printk(KERN_WARNING"%s: Channel number %d out of range\n", pHba->name, bus_no);
 					continue;
 				}
 				pDev = pHba->channel[bus_no].device[scsi_id];	
@@ -2769,7 +2769,7 @@ static s32 adpt_i2o_status_get(adpt_hba*
 			kmalloc(sizeof(i2o_status_block),GFP_KERNEL|ADDR32);
 		if(pHba->status_block == NULL) {
 			printk(KERN_ERR
-			"dpti%d: Get Status Block failed; Out of memory. \n", 
+			"dpti%d: Get Status Block failed; Out of memory.\n", 
 			pHba->unit);
 			return -ENOMEM;
 		}
Index: linux-kj/drivers/scsi/eata_pio.c
===================================================================
--- linux-kj.orig/drivers/scsi/eata_pio.c	2005-09-21 01:19:20.000000000 +0400
+++ linux-kj/drivers/scsi/eata_pio.c	2005-09-21 01:35:54.000000000 +0400
@@ -860,7 +860,7 @@ static void find_pio_EISA(struct get_con
 			pal3 = inb((u16) base - 6);
 
 			if (((pal1 == 0x12) && (pal2 == 0x14)) || ((pal1 == 0x38) && (pal2 == 0xa3) && (pal3 == 0x82)) || ((pal1 == 0x06) && (pal2 == 0x94) && (pal3 == 0x24))) {
-				DBG(DBG_PROBE, printk(KERN_NOTICE "EISA EATA id tags found: " "%x %x %x \n", (int) pal1, (int) pal2, (int) pal3));
+				DBG(DBG_PROBE, printk(KERN_NOTICE "EISA EATA id tags found: " "%x %x %x\n", (int) pal1, (int) pal2, (int) pal3));
 #endif
 				if (get_pio_conf_PIO(base, buf)) {
 					DBG(DBG_PROBE && DBG_EISA, print_pio_config(buf));
Index: linux-kj/drivers/scsi/gdth.c
===================================================================
--- linux-kj.orig/drivers/scsi/gdth.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/gdth.c	2005-09-21 01:35:54.000000000 +0400
@@ -4188,7 +4188,7 @@ static int __init gdth_detect(Scsi_Host_
         return 0;
     }
 
-    printk("GDT-HA: Storage RAID Controller Driver. Version: %s \n",GDTH_VERSION_STR);
+    printk("GDT-HA: Storage RAID Controller Driver. Version: %s\n",GDTH_VERSION_STR);
     /* initializations */
     gdth_polling = TRUE; b = 0;
     gdth_clear_events();
Index: linux-kj/drivers/scsi/initio.c
===================================================================
--- linux-kj.orig/drivers/scsi/initio.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/initio.c	2005-09-21 01:35:54.000000000 +0400
@@ -780,7 +780,7 @@ static int init_tulip(HCS * pCurHcb, SCB
 	       pCurHcb->HCS_BIOS, pCurHcb->HCS_SCSI_ID);
 /*------------------- reset SCSI Bus ---------------------------*/
 	if (pCurHcb->HCS_Config & HCC_SCSI_RESET) {
-		printk("i91u: Reset SCSI Bus ... \n");
+		printk("i91u: Reset SCSI Bus ...\n");
 		tul_reset_scsi(pCurHcb, seconds);
 	}
 	TUL_WR(pCurHcb->HCS_Base + TUL_SCFG1, 0x17);
Index: linux-kj/drivers/scsi/ips.c
===================================================================
--- linux-kj.orig/drivers/scsi/ips.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/ips.c	2005-09-21 01:35:54.000000000 +0400
@@ -6788,7 +6788,7 @@ ips_version_check(ips_ha_t * ha, int int
 	/* printk(KERN_WARNING "Adapter's BIOS Version  = %s\n", BiosVersion);          */
 	/* printk(KERN_WARNING "BIOS Compatible Version = %s\n", IPS_COMPAT_BIOS);      */
 	/* printk(KERN_WARNING "Adapter's Firmware Version  = %s\n", FirmwareVersion);  */
-	/* printk(KERN_WARNING "Firmware Compatible Version = %s \n", Compatable[ ha->nvram->adapter_type ]); */
+	/* printk(KERN_WARNING "Firmware Compatible Version = %s\n", Compatable[ ha->nvram->adapter_type ]); */
 
 	MatchError = 0;
 
Index: linux-kj/drivers/scsi/libata-core.c
===================================================================
--- linux-kj.orig/drivers/scsi/libata-core.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/libata-core.c	2005-09-21 01:35:54.000000000 +0400
@@ -1084,7 +1084,7 @@ static inline void ata_dump_id(struct at
 		"53==0x%04x  "
 		"63==0x%04x  "
 		"64==0x%04x  "
-		"75==0x%04x  \n",
+		"75==0x%04x\n",
 		dev->id[49],
 		dev->id[53],
 		dev->id[63],
@@ -1094,7 +1094,7 @@ static inline void ata_dump_id(struct at
 		"81==0x%04x  "
 		"82==0x%04x  "
 		"83==0x%04x  "
-		"84==0x%04x  \n",
+		"84==0x%04x\n",
 		dev->id[80],
 		dev->id[81],
 		dev->id[82],
Index: linux-kj/drivers/scsi/lpfc/lpfc_scsi.c
===================================================================
--- linux-kj.orig/drivers/scsi/lpfc/lpfc_scsi.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/lpfc/lpfc_scsi.c	2005-09-21 01:35:54.000000000 +0400
@@ -335,7 +335,7 @@ lpfc_handle_fcp_err(struct lpfc_scsi_buf
 	} else if (resp_info & RESID_OVER) {
 		lpfc_printf_log(phba, KERN_WARNING, LOG_FCP,
 				"%d:0720 FCP command x%x residual "
-				"overrun error. Data: x%x x%x \n",
+				"overrun error. Data: x%x x%x\n",
 				phba->brd_no, cmnd->cmnd[0],
 				cmnd->request_bufflen, cmnd->resid);
 		host_status = DID_ERROR;
Index: linux-kj/drivers/scsi/lpfc/lpfc_sli.c
===================================================================
--- linux-kj.orig/drivers/scsi/lpfc/lpfc_sli.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/lpfc/lpfc_sli.c	2005-09-21 01:35:54.000000000 +0400
@@ -742,7 +742,7 @@ lpfc_sli_process_unsol_iocb(struct lpfc_
 				KERN_WARNING,
 				LOG_SLI,
 				"%d:0313 Ring %d handler: unexpected Rctl x%x "
-				"Type x%x received \n",
+				"Type x%x received\n",
 				phba->brd_no,
 				pring->ringno,
 				Rctl,
Index: linux-kj/drivers/scsi/mac_esp.c
===================================================================
--- linux-kj.orig/drivers/scsi/mac_esp.c	2005-09-21 01:19:21.000000000 +0400
+++ linux-kj/drivers/scsi/mac_esp.c	2005-09-21 01:35:54.000000000 +0400
@@ -325,7 +325,7 @@ int mac_esp_detect(Scsi_Host_Template * 
 	  if (chipspresent >= setup_num_esps)
 	    chipspresent = setup_num_esps;
 	  else
-	    printk("mac_esp_detect: num_hosts detected %d setup %d \n",
+	    printk("mac_esp_detect: num_hosts detected %d setup %d\n",
 		   chipspresent, setup_num_esps);
 	}
 
Index: linux-kj/drivers/scsi/qla1280.c
===================================================================
--- linux-kj.orig/drivers/scsi/qla1280.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/qla1280.c	2005-09-21 01:35:54.000000000 +0400
@@ -1766,7 +1766,7 @@ qla1280_chip_diag(struct scsi_qla_host *
 	int status = 0;
 	int cnt;
 	uint16_t data;
-	dprintk(3, "qla1280_chip_diag: testing device at 0x%p \n", &reg->id_l);
+	dprintk(3, "qla1280_chip_diag: testing device at 0x%p\n", &reg->id_l);
 
 	dprintk(1, "scsi(%ld): Verifying chip\n", ha->host_no);
 
@@ -2198,7 +2198,7 @@ qla1280_set_defaults(struct scsi_qla_hos
 	struct nvram *nv = &ha->nvram;
 	int bus, target;
 
-	dprintk(1, "Using defaults for NVRAM: \n");
+	dprintk(1, "Using defaults for NVRAM:\n");
 	memset(nv, 0, sizeof(struct nvram));
 
 	/* nv->cntr_flags_1.disable_loading_risc_code = 1; */
@@ -3125,7 +3125,7 @@ qla1280_64bit_start_scsi(struct scsi_qla
 					cpu_to_le32(sg_dma_len(sg)));
 			}
 			dprintk(5, "qla1280_64bit_start_scsi: Scatter/gather "
-				"command packet data - b %i, t %i, l %i \n",
+				"command packet data - b %i, t %i, l %i\n",
 				SCSI_BUS_32(cmd), SCSI_TCN_32(cmd),
 				SCSI_LUN_32(cmd));
 			qla1280_dump_buffer(5, (char *)pkt,
@@ -3186,7 +3186,7 @@ qla1280_64bit_start_scsi(struct scsi_qla
 				}
 				dprintk(5, "qla1280_64bit_start_scsi: "
 					"continuation packet data - b %i, t "
-					"%i, l %i \n", SCSI_BUS_32(cmd),
+					"%i, l %i\n", SCSI_BUS_32(cmd),
 					SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
 				qla1280_dump_buffer(5, (char *)pkt,
 						    REQUEST_ENTRY_SIZE);
@@ -3210,14 +3210,14 @@ qla1280_64bit_start_scsi(struct scsi_qla
 
 			dprintk(5, "qla1280_64bit_start_scsi: No scatter/"
 				"gather command packet data - b %i, t %i, "
-				"l %i \n", SCSI_BUS_32(cmd), SCSI_TCN_32(cmd),
+				"l %i\n", SCSI_BUS_32(cmd), SCSI_TCN_32(cmd),
 				SCSI_LUN_32(cmd));
 			qla1280_dump_buffer(5, (char *)pkt,
 					    REQUEST_ENTRY_SIZE);
 		}
 	} else {	/* No data transfer */
 		dprintk(5, "qla1280_64bit_start_scsi: No data, command "
-			"packet data - b %i, t %i, l %i \n",
+			"packet data - b %i, t %i, l %i\n",
 			SCSI_BUS_32(cmd), SCSI_TCN_32(cmd), SCSI_LUN_32(cmd));
 		qla1280_dump_buffer(5, (char *)pkt, REQUEST_ENTRY_SIZE);
 	}
@@ -3317,7 +3317,7 @@ qla1280_32bit_start_scsi(struct scsi_qla
 			cmd->cmnd[0]);
 		seg_cnt = 1;
 	} else {
-		/* dprintk(1, "No data transfer \n"); */
+		/* dprintk(1, "No data transfer\n"); */
 		seg_cnt = 0;
 	}
 
@@ -3482,7 +3482,7 @@ qla1280_32bit_start_scsi(struct scsi_qla
 		}
 	} else {	/* No data transfer at all */
 		dprintk(5, "qla1280_32bit_start_scsi: No data, command "
-			"packet data - \n");
+			"packet data -\n");
 		qla1280_dump_buffer(5, (char *)pkt, REQUEST_ENTRY_SIZE);
 	}
 	dprintk(5, "qla1280_32bit_start_scsi: First IOCB block:\n");
@@ -3671,7 +3671,7 @@ qla1280_isr(struct scsi_qla_host *ha, st
 
 	if (mailbox[0] & BIT_0) {
 		/* Get mailbox data. */
-		/* dprintk(1, "qla1280_isr: In Get mailbox data \n"); */
+		/* dprintk(1, "qla1280_isr: In Get mailbox data\n"); */
 
 		wptr = &mailbox[0];
 		*wptr++ = RD_REG_WORD(&reg->mailbox0);
@@ -3779,7 +3779,7 @@ qla1280_isr(struct scsi_qla_host *ha, st
 			break;
 
 		default:
-			/* dprintk(1, "qla1280_isr: default case of switch MB \n"); */
+			/* dprintk(1, "qla1280_isr: default case of switch MB\n"); */
 			if (mailbox[0] < MBA_ASYNC_EVENT) {
 				wptr = &mailbox[0];
 				memcpy((uint16_t *) ha->mailbox_out, wptr,
@@ -4336,10 +4336,10 @@ __qla1280_print_scsi_cmd(struct scsi_cmn
 	/* if (cmd->use_sg)
 	   {
 	   sg = (struct scatterlist *) cmd->request_buffer;
-	   printk("  SG buffer: \n");
+	   printk("  SG buffer:\n");
 	   qla1280_dump_buffer(1, (char *)sg, (cmd->use_sg*sizeof(struct scatterlist)));
 	   } */
-	printk("  tag=%d, transfersize=0x%x \n",
+	printk("  tag=%d, transfersize=0x%x\n",
 	       cmd->tag, cmd->transfersize);
 	printk("  Pid=%li, SP=0x%p\n", cmd->pid, CMD_SP(cmd));
 	printk(" underflow size = 0x%x, direction=0x%x\n",
Index: linux-kj/drivers/scsi/qla2xxx/qla_dbg.c
===================================================================
--- linux-kj.orig/drivers/scsi/qla2xxx/qla_dbg.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/qla2xxx/qla_dbg.c	2005-09-21 01:35:54.000000000 +0400
@@ -1930,17 +1930,17 @@ qla2x00_dump_regs(scsi_qla_host_t *ha)
 	struct device_reg_2xxx __iomem *reg = &ha->iobase->isp;
 
 	printk("Mailbox registers:\n");
-	printk("scsi(%ld): mbox 0 0x%04x \n",
+	printk("scsi(%ld): mbox 0 0x%04x\n",
 	    ha->host_no, RD_MAILBOX_REG(ha, reg, 0));
-	printk("scsi(%ld): mbox 1 0x%04x \n",
+	printk("scsi(%ld): mbox 1 0x%04x\n",
 	    ha->host_no, RD_MAILBOX_REG(ha, reg, 1));
-	printk("scsi(%ld): mbox 2 0x%04x \n",
+	printk("scsi(%ld): mbox 2 0x%04x\n",
 	    ha->host_no, RD_MAILBOX_REG(ha, reg, 2));
-	printk("scsi(%ld): mbox 3 0x%04x \n",
+	printk("scsi(%ld): mbox 3 0x%04x\n",
 	    ha->host_no, RD_MAILBOX_REG(ha, reg, 3));
-	printk("scsi(%ld): mbox 4 0x%04x \n",
+	printk("scsi(%ld): mbox 4 0x%04x\n",
 	    ha->host_no, RD_MAILBOX_REG(ha, reg, 4));
-	printk("scsi(%ld): mbox 5 0x%04x \n",
+	printk("scsi(%ld): mbox 5 0x%04x\n",
 	    ha->host_no, RD_MAILBOX_REG(ha, reg, 5));
 }
 
Index: linux-kj/drivers/scsi/qla2xxx/qla_init.c
===================================================================
--- linux-kj.orig/drivers/scsi/qla2xxx/qla_init.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/qla2xxx/qla_init.c	2005-09-21 01:35:54.000000000 +0400
@@ -1189,7 +1189,7 @@ qla2x00_fw_ready(scsi_qla_host_t *ha)
 				ha->device_flags &= ~DFLG_NO_CABLE;
 			}
 			if (fw_state == FSTATE_READY) {
-				DEBUG(printk("scsi(%ld): F/W Ready - OK \n",
+				DEBUG(printk("scsi(%ld): F/W Ready - OK\n",
 				    ha->host_no));
 
 				qla2x00_get_retry_cnt(ha, &ha->retry_count,
Index: linux-kj/drivers/scsi/qla2xxx/qla_mbx.c
===================================================================
--- linux-kj.orig/drivers/scsi/qla2xxx/qla_mbx.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/qla2xxx/qla_mbx.c	2005-09-21 01:35:54.000000000 +0400
@@ -126,7 +126,7 @@ qla2x00_mailbox_command(scsi_qla_host_t 
 	}
 
 #if defined(QL_DEBUG_LEVEL_1)
-	printk("%s(%ld): Loaded MBX registers (displayed in bytes) = \n",
+	printk("%s(%ld): Loaded MBX registers (displayed in bytes) =\n",
 	    __func__, ha->host_no);
 	qla2x00_dump_buffer((uint8_t *)mcp->mb, 16);
 	printk("\n");
Index: linux-kj/drivers/scsi/qlogicfc.c
===================================================================
--- linux-kj.orig/drivers/scsi/qlogicfc.c	2005-09-21 01:24:39.000000000 +0400
+++ linux-kj/drivers/scsi/qlogicfc.c	2005-09-21 01:35:54.000000000 +0400
@@ -1827,14 +1827,14 @@ static int isp2x00_reset_hardware(struct
 
 
 #if DEBUG_ISP2x00
-	printk("qlogicfc%d : mbox 0 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX0));
-	printk("qlogicfc%d : mbox 1 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX1));
-	printk("qlogicfc%d : mbox 2 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX2));
-	printk("qlogicfc%d : mbox 3 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX3));
-	printk("qlogicfc%d : mbox 4 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX4));
-	printk("qlogicfc%d : mbox 5 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX5));
-	printk("qlogicfc%d : mbox 6 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX6));
-	printk("qlogicfc%d : mbox 7 0x%04x \n", hostdata->host_id,  inw(host->io_port + MBOX7));
+	printk("qlogicfc%d : mbox 0 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX0));
+	printk("qlogicfc%d : mbox 1 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX1));
+	printk("qlogicfc%d : mbox 2 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX2));
+	printk("qlogicfc%d : mbox 3 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX3));
+	printk("qlogicfc%d : mbox 4 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX4));
+	printk("qlogicfc%d : mbox 5 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX5));
+	printk("qlogicfc%d : mbox 6 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX6));
+	printk("qlogicfc%d : mbox 7 0x%04x\n", hostdata->host_id,  inw(host->io_port + MBOX7));
 #endif				/* DEBUG_ISP2x00 */
 
 	DEBUG(printk("qlogicfc%d : verifying checksum\n", hostdata->host_id));
Index: linux-kj/drivers/scsi/qlogicisp.c
===================================================================
--- linux-kj.orig/drivers/scsi/qlogicisp.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/qlogicisp.c	2005-09-21 01:35:54.000000000 +0400
@@ -1225,12 +1225,12 @@ static int isp1020_reset_hardware(struct
 	isp_outw(0, host, ISP_CFG1);
 
 #if DEBUG_ISP1020
-	printk("qlogicisp : mbox 0 0x%04x \n", isp_inw(host, MBOX0));
-	printk("qlogicisp : mbox 1 0x%04x \n", isp_inw(host, MBOX1));
-	printk("qlogicisp : mbox 2 0x%04x \n", isp_inw(host, MBOX2));
-	printk("qlogicisp : mbox 3 0x%04x \n", isp_inw(host, MBOX3));
-	printk("qlogicisp : mbox 4 0x%04x \n", isp_inw(host, MBOX4));
-	printk("qlogicisp : mbox 5 0x%04x \n", isp_inw(host, MBOX5));
+	printk("qlogicisp : mbox 0 0x%04x\n", isp_inw(host, MBOX0));
+	printk("qlogicisp : mbox 1 0x%04x\n", isp_inw(host, MBOX1));
+	printk("qlogicisp : mbox 2 0x%04x\n", isp_inw(host, MBOX2));
+	printk("qlogicisp : mbox 3 0x%04x\n", isp_inw(host, MBOX3));
+	printk("qlogicisp : mbox 4 0x%04x\n", isp_inw(host, MBOX4));
+	printk("qlogicisp : mbox 5 0x%04x\n", isp_inw(host, MBOX5));
 #endif /* DEBUG_ISP1020 */
 
 	param[0] = MBOX_NO_OP;
Index: linux-kj/drivers/scsi/script_asm.pl
===================================================================
--- linux-kj.orig/drivers/scsi/script_asm.pl	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/script_asm.pl	2005-09-21 01:35:54.000000000 +0400
@@ -521,7 +521,7 @@ print STDERR "Parsing register to regist
 	    $force = ($op !~ /TO/i); 
 
 
-print STDERR "Forcing register source \n" if ($force && $debug);
+print STDERR "Forcing register source\n" if ($force && $debug);
 
 	    if (!$force && $src =~ 
 		/^($register)\s+(-|$operator)\s+($value)\s*$/i) {
@@ -793,7 +793,7 @@ print STDERR "Parsing $instruction\n" if
 
 @undefined = keys %forward;
 if ($#undefined >= 0) {
-    print STDERR "Undefined symbols : \n";
+    print STDERR "Undefined symbols :\n";
     foreach $undef (@undefined) {
 	print STDERR "$undef in $forward{$undef}\n";
     }
@@ -822,7 +822,7 @@ foreach $i (@absolute) {
 }
 
 foreach $external (@external) {
-print STDERR "checking external $external \n" if ($debug_external);
+print STDERR "checking external $external\n" if ($debug_external);
     if ($symbol_references{$external} ne undef) {
 	for $reference (split(/\s+/,$symbol_references{$external})) {
 	    $reference =~ /(REL|ABS),(.*),(.*)/;
Index: linux-kj/drivers/scsi/scsi.c
===================================================================
--- linux-kj.orig/drivers/scsi/scsi.c	2005-09-21 01:19:20.000000000 +0400
+++ linux-kj/drivers/scsi/scsi.c	2005-09-21 01:35:54.000000000 +0400
@@ -559,7 +559,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
 		 */
 		scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);
 
-		SCSI_LOG_MLQUEUE(3, printk("queuecommand : device blocked \n"));
+		SCSI_LOG_MLQUEUE(3, printk("queuecommand : device blocked\n"));
 
 		/*
 		 * NOTE: rtn is still zero here because we don't need the
Index: linux-kj/drivers/scsi/scsicam.c
===================================================================
--- linux-kj.orig/drivers/scsi/scsicam.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/scsicam.c	2005-09-21 01:35:54.000000000 +0400
@@ -122,7 +122,7 @@ int scsi_partsize(unsigned char *buf, un
 			if (!p->sys_ind)
 				continue;
 #ifdef DEBUG
-			printk("scsicam_bios_param : partition %d has system \n",
+			printk("scsicam_bios_param : partition %d has system\n",
 			       i);
 #endif
 			cyl = p->cyl + ((p->sector & 0xc0) << 2);
Index: linux-kj/drivers/scsi/sd.c
===================================================================
--- linux-kj.orig/drivers/scsi/sd.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/sd.c	2005-09-21 01:35:54.000000000 +0400
@@ -1136,7 +1136,7 @@ repeat:
 
 	if (the_result && !longrc) {
 		printk(KERN_NOTICE "%s : READ CAPACITY failed.\n"
-		       "%s : status=%x, message=%02x, host=%d, driver=%02x \n",
+		       "%s : status=%x, message=%02x, host=%d, driver=%02x\n",
 		       diskname, diskname,
 		       status_byte(the_result),
 		       msg_byte(the_result),
@@ -1146,7 +1146,7 @@ repeat:
 		if (driver_byte(the_result) & DRIVER_SENSE)
 			scsi_print_sense_hdr("sd", &sshdr);
 		else
-			printk("%s : sense not available. \n", diskname);
+			printk("%s : sense not available.\n", diskname);
 
 		/* Set dirty bit for removable devices if not ready -
 		 * sometimes drives will not report this properly. */
@@ -1163,7 +1163,7 @@ repeat:
 	} else if (the_result && longrc) {
 		/* READ CAPACITY(16) has been failed */
 		printk(KERN_NOTICE "%s : READ CAPACITY(16) failed.\n"
-		       "%s : status=%x, message=%02x, host=%d, driver=%02x \n",
+		       "%s : status=%x, message=%02x, host=%d, driver=%02x\n",
 		       diskname, diskname,
 		       status_byte(the_result),
 		       msg_byte(the_result),
@@ -1687,7 +1687,7 @@ static void sd_shutdown(struct device *d
 	if (!sdkp->WCE)
 		return;
 
-	printk(KERN_NOTICE "Synchronizing SCSI cache for disk %s: \n",
+	printk(KERN_NOTICE "Synchronizing SCSI cache for disk %s:\n",
 			sdkp->disk->disk_name);
 	sd_sync_cache(sdp);
 }	
Index: linux-kj/drivers/scsi/seagate.c
===================================================================
--- linux-kj.orig/drivers/scsi/seagate.c	2005-09-21 01:19:19.000000000 +0400
+++ linux-kj/drivers/scsi/seagate.c	2005-09-21 01:35:54.000000000 +0400
@@ -784,7 +784,7 @@ static int internal_command (unsigned ch
 
 	switch (reselect) {
 	case RECONNECT_NOW:
-		DPRINTK (PHASE_RESELECT, "scsi%d : phase RESELECT \n", hostno);
+		DPRINTK (PHASE_RESELECT, "scsi%d : phase RESELECT\n", hostno);
 		/*
 		 *	At this point, we should find the logical or of our ID
 		 *	and the original target's ID on the BUS, with BSY, SEL,
@@ -869,7 +869,7 @@ static int internal_command (unsigned ch
 		 */
 connect_loop:
 #endif
-		DPRINTK (PHASE_BUS_FREE, "scsi%d : phase = BUS FREE \n", hostno);
+		DPRINTK (PHASE_BUS_FREE, "scsi%d : phase = BUS FREE\n", hostno);
 
 		/*
 		 *    BUS FREE PHASE
@@ -982,7 +982,7 @@ connect_loop:
 			if (STATUS & STAT_BSY)
 				break;
 			if (TIMEOUT) {
-				DPRINTK (PHASE_SELECTION, "scsi%d : NO CONNECT with target %d, stat = %x \n", hostno, target, STATUS);
+				DPRINTK (PHASE_SELECTION, "scsi%d : NO CONNECT with target %d, stat = %x\n", hostno, target, STATUS);
 				return retcode (DID_NO_CONNECT);
 			}
 		}
@@ -1115,7 +1115,7 @@ connect_loop:
 
 				if (!len) {
 #if 0
-					printk("scsi%d: underflow to target %d lun %d \n", hostno, target, lun);
+					printk("scsi%d: underflow to target %d lun %d\n", hostno, target, lun);
 					st0x_aborted = DID_ERROR;
 					fast = 0;
 #endif
@@ -1549,7 +1549,7 @@ connect_loop:
 
 #if (DEBUG & PHASE_EXIT)
 #if 0				/* Doesn't work for scatter/gather */
-	printk("Buffer : \n");
+	printk("Buffer :\n");
 	for(i = 0; i < 20; ++i)
 		printk("%02x  ", ((unsigned char *) data)[i]);	/* WDE mod */
 	printk("\n");
Index: linux-kj/drivers/scsi/sg.c
===================================================================
--- linux-kj.orig/drivers/scsi/sg.c	2005-09-21 01:19:17.000000000 +0400
+++ linux-kj/drivers/scsi/sg.c	2005-09-21 01:35:54.000000000 +0400
@@ -1471,7 +1471,7 @@ static int sg_alloc(struct gendisk *disk
 		goto overflow;
 
 	memset(sdp, 0, sizeof(*sdp));
-	SCSI_LOG_TIMEOUT(3, printk("sg_alloc: dev=%d \n", k));
+	SCSI_LOG_TIMEOUT(3, printk("sg_alloc: dev=%d\n", k));
 	sprintf(disk->disk_name, "sg%d", k);
 	disk->first_minor = k;
 	sdp->disk = disk;
Index: linux-kj/drivers/scsi/sun3_NCR5380.c
===================================================================
--- linux-kj.orig/drivers/scsi/sun3_NCR5380.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/sun3_NCR5380.c	2005-09-21 01:35:54.000000000 +0400
@@ -82,7 +82,7 @@
   { printk("LINE:%d   Adding %p to %p\n", __LINE__, (void*)(x), (void*)(y)); \
     if ((x)==(y)) udelay(5); }
 #define REMOVE(w,x,y,z) \
-  { printk("LINE:%d   Removing: %p->%p  %p->%p \n", __LINE__, \
+  { printk("LINE:%d   Removing: %p->%p  %p->%p\n", __LINE__, \
 	   (void*)(w), (void*)(x), (void*)(y), (void*)(z)); \
     if ((x)==(y)) udelay(5); }
 #else
Index: linux-kj/drivers/scsi/tmscsim.c
===================================================================
--- linux-kj.orig/drivers/scsi/tmscsim.c	2005-09-21 01:19:18.000000000 +0400
+++ linux-kj/drivers/scsi/tmscsim.c	2005-09-21 01:35:54.000000000 +0400
@@ -657,7 +657,7 @@ dc390_dma_intr (struct dc390_acb* pACB)
 	  {
 	    do
 	      {
-		DEBUG1(printk (KERN_DEBUG "DC390: read residual bytes ... \n"));
+		DEBUG1(printk (KERN_DEBUG "DC390: read residual bytes ...\n"));
 		dstate = DC390_read8 (DMA_Status);
 		residual = DC390_read8 (CtcReg_Low) | DC390_read8 (CtcReg_Mid) << 8 |
 		  DC390_read8 (CtcReg_High) << 16;
@@ -1418,7 +1418,7 @@ dc390_DataIO_Comm( struct dc390_acb* pAC
 	    pSRB->SRBStatus |= OVER_RUN;
 	    DEBUG0(printk (KERN_WARNING " DC390: Overrun -"));
 	}
-	DEBUG0(printk (KERN_WARNING " Clear transfer pad \n"));
+	DEBUG0(printk (KERN_WARNING " Clear transfer pad\n"));
 	DC390_write8 (CtcReg_Low, 0);
 	DC390_write8 (CtcReg_Mid, 0);
 	DC390_write8 (CtcReg_High, 0);
Index: linux-kj/drivers/serial/jsm/jsm_tty.c
===================================================================
--- linux-kj.orig/drivers/serial/jsm/jsm_tty.c	2005-09-21 01:19:32.000000000 +0400
+++ linux-kj/drivers/serial/jsm/jsm_tty.c	2005-09-21 01:35:54.000000000 +0400
@@ -455,7 +455,7 @@ int jsm_uart_port_init(struct jsm_board 
 		if (uart_add_one_port (&jsm_uart_driver, &brd->channels[i]->uart_port))
 			printk(KERN_INFO "Added device failed\n");
 		else
-			printk(KERN_INFO "Added device \n");
+			printk(KERN_INFO "Added device\n");
 	}
 
 	jsm_printk(INIT, INFO, &brd->pci_dev, "finish\n");
Index: linux-kj/drivers/telephony/ixj.c
===================================================================
--- linux-kj.orig/drivers/telephony/ixj.c	2005-09-21 01:19:33.000000000 +0400
+++ linux-kj/drivers/telephony/ixj.c	2005-09-21 01:35:54.000000000 +0400
@@ -7584,7 +7584,7 @@ static int __init ixj_probe_isapnp(int *
 				break;
 			result = pnp_device_attach(dev);
 			if (result < 0) {
-				printk("pnp attach failed %d \n", result);
+				printk("pnp attach failed %d\n", result);
 				break;
 			}
 			if (pnp_activate_dev(dev) < 0) {
Index: linux-kj/drivers/usb/gadget/omap_udc.c
===================================================================
--- linux-kj.orig/drivers/usb/gadget/omap_udc.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/usb/gadget/omap_udc.c	2005-09-21 01:35:54.000000000 +0400
@@ -1634,7 +1634,7 @@ static void ep0_irq(struct omap_udc *udc
 				/* this has rude side-effects (aborts) and
 				 * can't really work if DMA-IN is active
 				 */
-				DBG("%s host set_halt, NYET \n", ep->name);
+				DBG("%s host set_halt, NYET\n", ep->name);
 				goto do_stall;
 			}
 			use_ep(ep, 0);
Index: linux-kj/drivers/usb/gadget/rndis.c
===================================================================
--- linux-kj.orig/drivers/usb/gadget/rndis.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/usb/gadget/rndis.c	2005-09-21 01:35:54.000000000 +0400
@@ -1163,7 +1163,7 @@ int rndis_register (int (* rndis_control
 
 void rndis_deregister (int configNr)
 {
-	DEBUG("%s: \n", __FUNCTION__ );
+	DEBUG("%s:\n", __FUNCTION__ );
 	
 	if (configNr >= RNDIS_MAX_CONFIGS) return;
 	rndis_per_dev_params [configNr].used = 0;
Index: linux-kj/drivers/usb/image/mdc800.c
===================================================================
--- linux-kj.orig/drivers/usb/image/mdc800.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/usb/image/mdc800.c	2005-09-21 01:35:54.000000000 +0400
@@ -288,7 +288,7 @@ static void mdc800_usb_irq (struct urb *
 	if (urb->status >= 0)
 	{
 
-		//dbg ("%i %i %i %i %i %i %i %i \n",b[0],b[1],b[2],b[3],b[4],b[5],b[6],b[7]);
+		//dbg ("%i %i %i %i %i %i %i %i\n",b[0],b[1],b[2],b[3],b[4],b[5],b[6],b[7]);
 
 		if (mdc800_isBusy (b))
 		{
Index: linux-kj/drivers/usb/input/ati_remote.c
===================================================================
--- linux-kj.orig/drivers/usb/input/ati_remote.c	2005-09-21 01:19:07.000000000 +0400
+++ linux-kj/drivers/usb/input/ati_remote.c	2005-09-21 01:35:54.000000000 +0400
@@ -572,7 +572,7 @@ static void ati_remote_irq_in(struct urb
 	case -ECONNRESET:	/* unlink */
 	case -ENOENT:
 	case -ESHUTDOWN:
-		dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink? \n",
+		dev_dbg(&ati_remote->interface->dev, "%s: urb error status, unlink?\n",
 			__FUNCTION__);
 		return;
 	default:		/* error */
@@ -719,7 +719,7 @@ static int ati_remote_probe(struct usb_i
 		goto error;
 	}
 	if (le16_to_cpu(ati_remote->endpoint_in->wMaxPacketSize) == 0) {
-		err("%s: endpoint_in message size==0? \n", __FUNCTION__);
+		err("%s: endpoint_in message size==0?\n", __FUNCTION__);
 		retval = -ENODEV;
 		goto error;
 	}
Index: linux-kj/drivers/video/aty/atyfb_base.c
===================================================================
--- linux-kj.orig/drivers/video/aty/atyfb_base.c	2005-09-21 01:19:27.000000000 +0400
+++ linux-kj/drivers/video/aty/atyfb_base.c	2005-09-21 01:35:54.000000000 +0400
@@ -2577,7 +2577,7 @@ static int __init store_video_par(char *
 	char *p;
 	unsigned long vmembase, size, guiregbase;
 
-	PRINTKI("store_video_par() '%s' \n", video_str);
+	PRINTKI("store_video_par() '%s'\n", video_str);
 
 	if (!(p = strsep(&video_str, ";")) || !*p)
 		goto mach64_invalid;
@@ -2592,7 +2592,7 @@ static int __init store_video_par(char *
 	phys_vmembase[m64_num] = vmembase;
 	phys_size[m64_num] = size;
 	phys_guiregbase[m64_num] = guiregbase;
-	PRINTKI("stored them all: $%08lX $%08lX $%08lX \n", vmembase, size,
+	PRINTKI("stored them all: $%08lX $%08lX $%08lX\n", vmembase, size,
 	       guiregbase);
 	return 0;
 
@@ -3451,7 +3451,7 @@ static int __devinit atyfb_atari_probe(v
 	for (m64_num = 0; m64_num < mach64_count; m64_num++) {
 		if (!phys_vmembase[m64_num] || !phys_size[m64_num] ||
 		    !phys_guiregbase[m64_num]) {
-		    PRINTKI("phys_*[%d] parameters not set => returning early. \n", m64_num);
+		    PRINTKI("phys_*[%d] parameters not set => returning early.\n", m64_num);
 			continue;
 		}
 
Index: linux-kj/drivers/video/hgafb.c
===================================================================
--- linux-kj.orig/drivers/video/hgafb.c	2005-09-21 01:19:30.000000000 +0400
+++ linux-kj/drivers/video/hgafb.c	2005-09-21 01:35:54.000000000 +0400
@@ -52,7 +52,7 @@
 #endif
 
 #if 0
-#define CHKINFO(ret) if (info != &fb_info) { printk(KERN_DEBUG __FILE__": This should never happen, line:%d \n", __LINE__); return ret; }
+#define CHKINFO(ret) if (info != &fb_info) { printk(KERN_DEBUG __FILE__": This should never happen, line:%d\n", __LINE__); return ret; }
 #else
 #define CHKINFO(ret)
 #endif
Index: linux-kj/drivers/video/sstfb.c
===================================================================
--- linux-kj.orig/drivers/video/sstfb.c	2005-09-21 01:23:54.000000000 +0400
+++ linux-kj/drivers/video/sstfb.c	2005-09-21 01:35:54.000000000 +0400
@@ -790,7 +790,7 @@ static int sstfb_ioctl(struct inode *ino
 			return -EFAULT;
 		if (val > info->fix.smem_len)
 			val = info->fix.smem_len;
-		printk(KERN_DEBUG "filling %#x \n", val);
+		printk(KERN_DEBUG "filling %#x\n", val);
 		for (p=0 ; p<val; p+=2)
 			writew(p >> 6, info->screen_base + p);
 		return 0;
Index: linux-kj/drivers/video/virgefb.c
===================================================================
--- linux-kj.orig/drivers/video/virgefb.c	2005-09-21 01:23:54.000000000 +0400
+++ linux-kj/drivers/video/virgefb.c	2005-09-21 01:35:54.000000000 +0400
@@ -2088,7 +2088,7 @@ static int cv3d_has_4mb(void)
 
 	if (*t2 == 0x87654321) {
 		/* should read 0x12345678 if 4MB */
-		DPRINTK("EXIT - 2MB(a) \n");
+		DPRINTK("EXIT - 2MB(a)\n");
 		return 0;
 	}
 
Index: linux-kj/fs/cifs/cifssmb.c
===================================================================
--- linux-kj.orig/fs/cifs/cifssmb.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/cifs/cifssmb.c	2005-09-21 01:35:54.000000000 +0400
@@ -2895,7 +2895,7 @@ getDFSRetry:
 					(8 /* sizeof start of data block */ +
 					data_offset +
 					(char *) &pSMBr->hdr.Protocol); 
-			cFYI(1,("num_referrals: %d dfs flags: 0x%x ... \nfor referral one refer size: 0x%x srv type: 0x%x refer flags: 0x%x ttl: 0x%x",
+			cFYI(1,("num_referrals: %d dfs flags: 0x%x ...\nfor referral one refer size: 0x%x srv type: 0x%x refer flags: 0x%x ttl: 0x%x",
 				le16_to_cpu(pSMBr->NumberOfReferrals),le16_to_cpu(pSMBr->DFSFlags), le16_to_cpu(referrals->ReferralSize),le16_to_cpu(referrals->ServerType),le16_to_cpu(referrals->ReferralFlags),le16_to_cpu(referrals->TimeToLive)));
 			/* BB This field is actually two bytes in from start of
 			   data block so we could do safety check that DataBlock
Index: linux-kj/fs/cifs/connect.c
===================================================================
--- linux-kj.orig/fs/cifs/connect.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/cifs/connect.c	2005-09-21 01:35:54.000000000 +0400
@@ -885,7 +885,7 @@ cifs_parse_mount_options(char *options, 
 					vol->UNC[1] = '\\';
 				} else if (strncmp(vol->UNC, "\\\\", 2) != 0) {	                   
 					printk(KERN_WARNING
-					       "CIFS: UNC Path does not begin with // or \\\\ \n");
+					       "CIFS: UNC Path does not begin with // or \\\\\n");
 					return 1;
 				}
 			} else {
@@ -1075,7 +1075,7 @@ cifs_parse_mount_options(char *options, 
 				vol->UNC[0] = '\\';
 				vol->UNC[1] = '\\';
 			} else if (strncmp(vol->UNC, "\\\\", 2) != 0) {
-				printk(KERN_WARNING "CIFS: UNC Path does not begin with // or \\\\ \n");
+				printk(KERN_WARNING "CIFS: UNC Path does not begin with // or \\\\\n");
 				return 1;
 			}
 		} else {
Index: linux-kj/fs/jffs2/erase.c
===================================================================
--- linux-kj.orig/fs/jffs2/erase.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/jffs2/erase.c	2005-09-21 01:35:54.000000000 +0400
@@ -263,7 +263,7 @@ static inline void jffs2_remove_node_ref
 	D2({
 		int i=0;
 		struct jffs2_raw_node_ref *this;
-		printk(KERN_DEBUG "After remove_node_refs_from_ino_list: \n" KERN_DEBUG);
+		printk(KERN_DEBUG "After remove_node_refs_from_ino_list:\n" KERN_DEBUG);
 
 		this = ic->nodes;
 	   
Index: linux-kj/fs/jffs2/nodelist.c
===================================================================
--- linux-kj.orig/fs/jffs2/nodelist.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/jffs2/nodelist.c	2005-09-21 01:35:54.000000000 +0400
@@ -308,7 +308,7 @@ int jffs2_get_inode_nodes(struct jffs2_s
 				/* sanity checks */
 				if ( je32_to_cpu(node.i.offset) > je32_to_cpu(node.i.isize) ||
 				     PAD(je32_to_cpu(node.i.csize) + sizeof (node.i)) != PAD(je32_to_cpu(node.i.totlen))) {
-					printk(KERN_NOTICE "jffs2_get_inode_nodes(): Inode corrupted at 0x%08x, totlen %d, #ino  %d, version %d, isize %d, csize %d, dsize %d \n",
+					printk(KERN_NOTICE "jffs2_get_inode_nodes(): Inode corrupted at 0x%08x, totlen %d, #ino  %d, version %d, isize %d, csize %d, dsize %d\n",
 						ref_offset(ref),  je32_to_cpu(node.i.totlen),  je32_to_cpu(node.i.ino),
 						je32_to_cpu(node.i.version),  je32_to_cpu(node.i.isize), 
 						je32_to_cpu(node.i.csize), je32_to_cpu(node.i.dsize));
Index: linux-kj/fs/lockd/svclock.c
===================================================================
--- linux-kj.orig/fs/lockd/svclock.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/lockd/svclock.c	2005-09-21 01:35:54.000000000 +0400
@@ -624,7 +624,7 @@ nlmsvc_grant_reply(struct svc_rqst *rqst
 	struct nlm_block	*block;
 	struct nlm_file		*file;
 
-	dprintk("grant_reply: looking for cookie %x, host (%08x), s=%d \n", 
+	dprintk("grant_reply: looking for cookie %x, host (%08x), s=%d\n", 
 		*(unsigned int *)(cookie->data), 
 		ntohl(rqstp->rq_addr.sin_addr.s_addr), status);
 	if (!(block = nlmsvc_find_block(cookie, &rqstp->rq_addr)))
Index: linux-kj/fs/nfs/nfs4renewd.c
===================================================================
--- linux-kj.orig/fs/nfs/nfs4renewd.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/nfs/nfs4renewd.c	2005-09-21 01:35:54.000000000 +0400
@@ -82,7 +82,7 @@ nfs4_renew_state(void *data)
 		timeout = (2 * lease) / 3;
 		spin_lock(&clp->cl_lock);
 	} else
-		dprintk("%s: failed to call renewd. Reason: lease not expired \n",
+		dprintk("%s: failed to call renewd. Reason: lease not expired\n",
 				__FUNCTION__);
 	if (timeout < 5 * HZ)    /* safeguard */
 		timeout = 5 * HZ;
Index: linux-kj/fs/nfsd/nfsproc.c
===================================================================
--- linux-kj.orig/fs/nfsd/nfsproc.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/nfsd/nfsproc.c	2005-09-21 01:35:54.000000000 +0400
@@ -346,7 +346,7 @@ nfsd_proc_rename(struct svc_rqst *rqstp,
 {
 	int	nfserr;
 
-	dprintk("nfsd: RENAME   %s %.*s -> \n",
+	dprintk("nfsd: RENAME   %s %.*s ->\n",
 		SVCFH_fmt(&argp->ffh), argp->flen, argp->fname);
 	dprintk("nfsd:        ->  %s %.*s\n",
 		SVCFH_fmt(&argp->tfh), argp->tlen, argp->tname);
Index: linux-kj/fs/ufs/inode.c
===================================================================
--- linux-kj.orig/fs/ufs/inode.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/ufs/inode.c	2005-09-21 01:35:54.000000000 +0400
@@ -61,7 +61,7 @@ static int ufs_block_to_path(struct inod
 	int n = 0;
 
 
-	UFSD(("ptrs=uspi->s_apb = %d,double_blocks=%d \n",ptrs,double_blocks));
+	UFSD(("ptrs=uspi->s_apb = %d,double_blocks=%d\n",ptrs,double_blocks));
 	if (i_block < 0) {
 		ufs_warning(inode->i_sb, "ufs_block_to_path", "block < 0");
 	} else if (i_block < direct_blocks) {
@@ -386,7 +386,7 @@ static int ufs_getfrag_block (struct ino
 	
 	if (!create) {
 		phys64 = ufs_frag_map(inode, fragment);
-		UFSD(("phys64 = %lu \n",phys64));
+		UFSD(("phys64 = %lu\n",phys64));
 		if (phys64)
 			map_bh(bh_result, sb, phys64);
 		return 0;
Index: linux-kj/fs/xfs/xfs_bmap.c
===================================================================
--- linux-kj.orig/fs/xfs/xfs_bmap.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/xfs/xfs_bmap.c	2005-09-21 01:35:54.000000000 +0400
@@ -3567,7 +3567,7 @@ xfs_bmap_search_extents(
 	if(!rt && !gotp->br_startblock && (*lastxp != NULLEXTNUM)) {
                 cmn_err(CE_PANIC,"Access to block zero: fs: <%s> inode: %lld "
 			"start_block : %llx start_off : %llx blkcnt : %llx "
-			"extent-state : %x \n",
+			"extent-state : %x\n",
 			(ip->i_mount)->m_fsname,(long long)ip->i_ino,
 			gotp->br_startblock, gotp->br_startoff,
 			gotp->br_blockcount,gotp->br_state);
Index: linux-kj/fs/xfs/xfs_iomap.c
===================================================================
--- linux-kj.orig/fs/xfs/xfs_iomap.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/fs/xfs/xfs_iomap.c	2005-09-21 01:35:54.000000000 +0400
@@ -508,7 +508,7 @@ xfs_iomap_write_direct(
 	if ( !(io->io_flags & XFS_IOCORE_RT)  && !ret_imap->br_startblock) {
                 cmn_err(CE_PANIC,"Access to block zero:  fs <%s> inode: %lld "
                         "start_block : %llx start_off : %llx blkcnt : %llx "
-                        "extent-state : %x \n",
+                        "extent-state : %x\n",
                         (ip->i_mount)->m_fsname,
                         (long long)ip->i_ino,
                         ret_imap->br_startblock, ret_imap->br_startoff,
@@ -609,7 +609,7 @@ retry:
 						"zero:  fs <%s> inode: %lld "
 						"start_block : %llx start_off "
 						": %llx blkcnt : %llx "
-						"extent-state : %x \n",
+						"extent-state : %x\n",
 						(ip->i_mount)->m_fsname,
 						(long long)ip->i_ino,
 						imap[n].br_startblock,
@@ -717,7 +717,7 @@ write_map:
 	if ( !(io->io_flags & XFS_IOCORE_RT)  && !ret_imap->br_startblock) {
 		cmn_err(CE_PANIC,"Access to block zero:  fs <%s> inode: %lld "
                         "start_block : %llx start_off : %llx blkcnt : %llx "
-                        "extent-state : %x \n",
+                        "extent-state : %x\n",
                         (ip->i_mount)->m_fsname,
                         (long long)ip->i_ino,
                         ret_imap->br_startblock, ret_imap->br_startoff,
@@ -853,7 +853,7 @@ xfs_iomap_write_allocate(
 				cmn_err(CE_PANIC,"Access to block zero:  "
 					"fs <%s> inode: %lld "
 					"start_block : %llx start_off : %llx " 
-					"blkcnt : %llx extent-state : %x \n",
+					"blkcnt : %llx extent-state : %x\n",
 					(ip->i_mount)->m_fsname,
 					(long long)ip->i_ino,
 					imap[i].br_startblock,
@@ -961,7 +961,7 @@ xfs_iomap_write_unwritten(
 		if ( !(io->io_flags & XFS_IOCORE_RT)  && !imap.br_startblock) {
 			cmn_err(CE_PANIC,"Access to block zero:  fs <%s> "
 				"inode: %lld start_block : %llx start_off : "
-				"%llx blkcnt : %llx extent-state : %x \n",
+				"%llx blkcnt : %llx extent-state : %x\n",
 				(ip->i_mount)->m_fsname,
 				(long long)ip->i_ino,
 				imap.br_startblock,imap.br_startoff,
Index: linux-kj/include/asm-x86_64/system.h
===================================================================
--- linux-kj.orig/include/asm-x86_64/system.h	2005-09-21 01:19:59.000000000 +0400
+++ linux-kj/include/asm-x86_64/system.h	2005-09-21 01:35:54.000000000 +0400
@@ -309,8 +309,8 @@ static inline unsigned long __cmpxchg(vo
 #define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } while (0)
 
 /* interrupt control.. */
-#define local_save_flags(x)	do { warn_if_not_ulong(x); __asm__ __volatile__("# save_flags \n\t pushfq ; popq %q0":"=g" (x): /* no input */ :"memory"); } while (0)
-#define local_irq_restore(x) 	__asm__ __volatile__("# restore_flags \n\t pushq %0 ; popfq": /* no output */ :"g" (x):"memory", "cc")
+#define local_save_flags(x)	do { warn_if_not_ulong(x); __asm__ __volatile__("# save_flags\n\t pushfq ; popq %q0":"=g" (x): /* no input */ :"memory"); } while (0)
+#define local_irq_restore(x) 	__asm__ __volatile__("# restore_flags\n\t pushq %0 ; popfq": /* no output */ :"g" (x):"memory", "cc")
 #define local_irq_disable() 	__asm__ __volatile__("cli": : :"memory")
 #define local_irq_enable()	__asm__ __volatile__("sti": : :"memory")
 /* used in the idle loop; sti takes one instruction cycle to complete */
@@ -324,7 +324,7 @@ static inline unsigned long __cmpxchg(vo
 })
 
 /* For spinlocks etc */
-#define local_irq_save(x) 	do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save \n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0)
+#define local_irq_save(x) 	do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save\n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0)
 
 void cpu_idle_wait(void);
 
Index: linux-kj/kernel/cpu.c
===================================================================
--- linux-kj.orig/kernel/cpu.c	2005-09-21 01:19:34.000000000 +0400
+++ linux-kj/kernel/cpu.c	2005-09-21 01:35:54.000000000 +0400
@@ -52,7 +52,7 @@ static inline void check_for_tasks(int c
 		    (!cputime_eq(p->utime, cputime_zero) ||
 		     !cputime_eq(p->stime, cputime_zero)))
 			printk(KERN_WARNING "Task %s (pid = %d) is on cpu %d\
-				(state = %ld, flags = %lx) \n",
+				(state = %ld, flags = %lx)\n",
 				 p->comm, p->pid, cpu, p->state, p->flags);
 	}
 	write_unlock_irq(&tasklist_lock);
Index: linux-kj/net/8021q/vlan.c
===================================================================
--- linux-kj.orig/net/8021q/vlan.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/8021q/vlan.c	2005-09-21 01:35:54.000000000 +0400
@@ -770,7 +770,7 @@ static int vlan_ioctl_handler(void __use
 
 	default:
 		/* pass on to underlying device instead?? */
-		printk(VLAN_DBG "%s: Unknown VLAN CMD: %x \n",
+		printk(VLAN_DBG "%s: Unknown VLAN CMD: %x\n",
 			__FUNCTION__, args.cmd);
 		return -EINVAL;
 	};
Index: linux-kj/net/core/pktgen.c
===================================================================
--- linux-kj.orig/net/core/pktgen.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/core/pktgen.c	2005-09-21 01:35:54.000000000 +0400
@@ -662,7 +662,7 @@ static int proc_if_read(char *buf , char
                      pkt_dev->udp_src_min, pkt_dev->udp_src_max, pkt_dev->udp_dst_min,
                      pkt_dev->udp_dst_max);
 
-        p += sprintf(p, "     src_mac_count: %d  dst_mac_count: %d \n     Flags: ",
+        p += sprintf(p, "     src_mac_count: %d  dst_mac_count: %d\n     Flags: ",
                      pkt_dev->src_mac_count, pkt_dev->dst_mac_count);
 
 
Index: linux-kj/net/core/wireless.c
===================================================================
--- linux-kj.orig/net/core/wireless.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/core/wireless.c	2005-09-21 01:35:54.000000000 +0400
@@ -1331,7 +1331,7 @@ int iw_handler_set_spy(struct net_device
 		printk(KERN_DEBUG "iw_handler_set_spy() :  wireless_data %p, spydata %p, num %d\n", dev->wireless_data, spydata, wrqu->data.length);
 		for (i = 0; i < wrqu->data.length; i++)
 			printk(KERN_DEBUG
-			       "%02X:%02X:%02X:%02X:%02X:%02X \n",
+			       "%02X:%02X:%02X:%02X:%02X:%02X\n",
 			       spydata->spy_address[i][0],
 			       spydata->spy_address[i][1],
 			       spydata->spy_address[i][2],
Index: linux-kj/net/ipv4/netfilter/ip_conntrack_standalone.c
===================================================================
--- linux-kj.orig/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/ipv4/netfilter/ip_conntrack_standalone.c	2005-09-21 01:35:54.000000000 +0400
@@ -352,7 +352,7 @@ static int ct_cpu_seq_show(struct seq_fi
 	}
 
 	seq_printf(seq, "%08x  %08x %08x %08x %08x %08x %08x %08x "
-			"%08x %08x %08x %08x %08x  %08x %08x %08x \n",
+			"%08x %08x %08x %08x %08x  %08x %08x %08x\n",
 		   nr_conntracks,
 		   st->searched,
 		   st->found,
Index: linux-kj/net/ipv4/route.c
===================================================================
--- linux-kj.orig/net/ipv4/route.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/ipv4/route.c	2005-09-21 01:35:54.000000000 +0400
@@ -435,7 +435,7 @@ static int rt_cpu_seq_show(struct seq_fi
 	}
 	
 	seq_printf(seq,"%08x  %08x %08x %08x %08x %08x %08x %08x "
-		   " %08x %08x %08x %08x %08x %08x %08x %08x %08x \n",
+		   " %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
 		   atomic_read(&ipv4_dst_ops.entries),
 		   st->in_hit,
 		   st->in_slow_tot,
Index: linux-kj/net/irda/ircomm/ircomm_param.c
===================================================================
--- linux-kj.orig/net/irda/ircomm/ircomm_param.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/irda/ircomm/ircomm_param.c	2005-09-21 01:35:54.000000000 +0400
@@ -475,7 +475,7 @@ static int ircomm_param_dce(void *instan
 	/* Check if any of the settings have changed */
 	if (dce & 0x0f) {
 		if (dce & IRCOMM_DELTA_CTS) {
-			IRDA_DEBUG(2, "%s(), CTS \n", __FUNCTION__ );
+			IRDA_DEBUG(2, "%s(), CTS\n", __FUNCTION__ );
 		}
 	}
 
Index: linux-kj/net/sched/cls_u32.c
===================================================================
--- linux-kj.orig/net/sched/cls_u32.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/sched/cls_u32.c	2005-09-21 01:35:54.000000000 +0400
@@ -807,13 +807,13 @@ static int __init init_u32(void)
 	printk("    Perfomance counters on\n");
 #endif
 #ifdef CONFIG_NET_CLS_POLICE
-	printk("    OLD policer on \n");
+	printk("    OLD policer on\n");
 #endif
 #ifdef CONFIG_NET_CLS_IND
-	printk("    input device check on \n");
+	printk("    input device check on\n");
 #endif
 #ifdef CONFIG_NET_CLS_ACT
-	printk("    Actions configured \n");
+	printk("    Actions configured\n");
 #endif
 	return register_tcf_proto_ops(&cls_u32_ops);
 }
Index: linux-kj/net/sched/sch_ingress.c
===================================================================
--- linux-kj.orig/net/sched/sch_ingress.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/sched/sch_ingress.c	2005-09-21 01:35:54.000000000 +0400
@@ -302,7 +302,7 @@ static int ingress_init(struct Qdisc *sc
 #ifdef CONFIG_NETFILTER
 	if (!nf_registered) {
 		if (nf_register_hook(&ing_ops) < 0) {
-			printk("ingress qdisc registration error \n");
+			printk("ingress qdisc registration error\n");
 			return -EINVAL;
 		}
 		nf_registered++;
Index: linux-kj/net/sunrpc/auth_gss/auth_gss.c
===================================================================
--- linux-kj.orig/net/sunrpc/auth_gss/auth_gss.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/sunrpc/auth_gss/auth_gss.c	2005-09-21 01:35:54.000000000 +0400
@@ -748,7 +748,7 @@ gss_destroy_cred(struct rpc_cred *rc)
 {
 	struct gss_cred *cred = container_of(rc, struct gss_cred, gc_base);
 
-	dprintk("RPC:      gss_destroy_cred \n");
+	dprintk("RPC:      gss_destroy_cred\n");
 
 	if (cred->gc_ctx)
 		gss_put_ctx(cred->gc_ctx);
Index: linux-kj/net/sunrpc/auth_gss/gss_krb5_seal.c
===================================================================
--- linux-kj.orig/net/sunrpc/auth_gss/gss_krb5_seal.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/sunrpc/auth_gss/gss_krb5_seal.c	2005-09-21 01:35:54.000000000 +0400
@@ -154,7 +154,7 @@ krb5_make_token(struct krb5_ctx *ctx, in
 		       md5cksum.data + md5cksum.len - KRB5_CKSUM_LENGTH,
 		       KRB5_CKSUM_LENGTH);
 
-		dprintk("RPC:      make_seal_token: cksum data: \n");
+		dprintk("RPC:      make_seal_token: cksum data:\n");
 		print_hexl((u32 *) (krb5_hdr + 16), KRB5_CKSUM_LENGTH, 0);
 		break;
 	default:
Index: linux-kj/net/sunrpc/auth_gss/gss_spkm3_token.c
===================================================================
--- linux-kj.orig/net/sunrpc/auth_gss/gss_spkm3_token.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/sunrpc/auth_gss/gss_spkm3_token.c	2005-09-21 01:35:54.000000000 +0400
@@ -223,7 +223,7 @@ spkm3_verify_mic_token(unsigned char **t
 
 	/* only support SPKM_MIC_TOK */
 	if((ptr[6] != 0x01) || (ptr[7] != 0x01)) {
-		dprintk("RPC: ERROR unsupported SPKM3 token \n");
+		dprintk("RPC: ERROR unsupported SPKM3 token\n");
 		goto out;
 	}
 
Index: linux-kj/net/sunrpc/rpc_pipe.c
===================================================================
--- linux-kj.orig/net/sunrpc/rpc_pipe.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/sunrpc/rpc_pipe.c	2005-09-21 01:35:54.000000000 +0400
@@ -421,7 +421,7 @@ rpc_lookup_parent(char *path, struct nam
 		return -ENOENT;
 	if (rpc_get_mount()) {
 		printk(KERN_WARNING "%s: %s failed to mount "
-			       "pseudofilesystem \n", __FILE__, __FUNCTION__);
+			       "pseudofilesystem\n", __FILE__, __FUNCTION__);
 		return -ENODEV;
 	}
 	nd->mnt = mntget(rpc_mount);
Index: linux-kj/net/wanrouter/af_wanpipe.c
===================================================================
--- linux-kj.orig/net/wanrouter/af_wanpipe.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/wanrouter/af_wanpipe.c	2005-09-21 01:35:54.000000000 +0400
@@ -2585,7 +2585,7 @@ struct notifier_block wanpipe_netdev_not
 #ifdef MODULE
 void cleanup_module(void)
 {
-	printk(KERN_INFO "wansock: Cleaning up \n");
+	printk(KERN_INFO "wansock: Cleaning up\n");
 	unregister_netdevice_notifier(&wanpipe_netdev_notifier);
 	sock_unregister(PF_WANPIPE);
 	proto_unregister(&wanpipe_proto);
@@ -2595,7 +2595,7 @@ int init_module(void)
 {
 	int rc;
 
-	printk(KERN_INFO "wansock: Registering Socket \n");
+	printk(KERN_INFO "wansock: Registering Socket\n");
 
 	rc = proto_register(&wanpipe_proto, 0);
 	if (rc != 0)
Index: linux-kj/scripts/conmakehash.c
===================================================================
--- linux-kj.orig/scripts/conmakehash.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/scripts/conmakehash.c	2005-09-21 01:35:54.000000000 +0400
@@ -26,7 +26,7 @@ typedef unsigned short unicode;
 
 void usage(char *argv0)
 {
-  fprintf(stderr, "Usage: \n"
+  fprintf(stderr, "Usage:\n"
          "        %s chartable [hashsize] [hashstep] [maxhashlevel]\n", argv0);
   exit(EX_USAGE);
 }
@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
 \n\
 #include <linux/types.h>\n\
 \n\
-u8 dfont_unicount[%d] = \n\
+u8 dfont_unicount[%d] =\n\
 {\n\t", argv[1], fontlen);
 
   for ( i = 0 ; i < fontlen ; i++ )
Index: linux-kj/scripts/kernel-doc
===================================================================
--- linux-kj.orig/scripts/kernel-doc	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/scripts/kernel-doc	2005-09-21 01:35:54.000000000 +0400
@@ -1006,7 +1006,7 @@ sub output_enum_man(%) {
 	    last;
 	}
 	else {
-	    print ", \n.br\n";
+	    print ",\n.br\n";
 	}
 	$count++;
     }
Index: linux-kj/sound/core/seq/seq_fifo.c
===================================================================
--- linux-kj.orig/sound/core/seq/seq_fifo.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/core/seq/seq_fifo.c	2005-09-21 01:35:54.000000000 +0400
@@ -35,7 +35,7 @@ fifo_t *snd_seq_fifo_new(int poolsize)
 
 	f = kzalloc(sizeof(*f), GFP_KERNEL);
 	if (f == NULL) {
-		snd_printd("malloc failed for snd_seq_fifo_new() \n");
+		snd_printd("malloc failed for snd_seq_fifo_new()\n");
 		return NULL;
 	}
 
Index: linux-kj/sound/core/seq/seq_timer.c
===================================================================
--- linux-kj.orig/sound/core/seq/seq_timer.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/core/seq/seq_timer.c	2005-09-21 01:35:54.000000000 +0400
@@ -62,7 +62,7 @@ seq_timer_t *snd_seq_timer_new(void)
 	
 	tmr = kzalloc(sizeof(*tmr), GFP_KERNEL);
 	if (tmr == NULL) {
-		snd_printd("malloc failed for snd_seq_timer_new() \n");
+		snd_printd("malloc failed for snd_seq_timer_new()\n");
 		return NULL;
 	}
 	spin_lock_init(&tmr->lock);
Index: linux-kj/sound/drivers/mtpav.c
===================================================================
--- linux-kj.orig/sound/drivers/mtpav.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/drivers/mtpav.c	2005-09-21 01:35:54.000000000 +0400
@@ -679,7 +679,7 @@ static int snd_mtpav_get_RAWMIDI(mtpav_t
 	rawmidi->info_flags |= SNDRV_RAWMIDI_INFO_OUTPUT | SNDRV_RAWMIDI_INFO_INPUT |
 			       SNDRV_RAWMIDI_INFO_DUPLEX;
 	sprintf(rawmidi->name, "MTP AV MIDI");
-	//printk("exiting snd_mtpav_get_RAWMIDI() \n");
+	//printk("exiting snd_mtpav_get_RAWMIDI()\n");
 	return 0;
 }
 
Index: linux-kj/sound/drivers/vx/vx_pcm.c
===================================================================
--- linux-kj.orig/sound/drivers/vx/vx_pcm.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/drivers/vx/vx_pcm.c	2005-09-21 01:35:54.000000000 +0400
@@ -786,7 +786,7 @@ static void vx_pcm_delayed_start(unsigne
 		snd_printk(KERN_ERR "vx: cannot start pipe\n");
 		return;
 	}
-	/*   printk( KERN_DEBUG "dddd tasklet delayed start jiffies = %ld \n", jiffies);*/
+	/*   printk( KERN_DEBUG "dddd tasklet delayed start jiffies = %ld\n", jiffies);*/
 }
 
 /*
Index: linux-kj/sound/isa/gus/gus_mem.c
===================================================================
--- linux-kj.orig/sound/isa/gus/gus_mem.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/isa/gus/gus_mem.c	2005-09-21 01:35:54.000000000 +0400
@@ -300,11 +300,11 @@ static void snd_gf1_mem_info_read(snd_in
 	gus = entry->private_data;
 	alloc = &gus->gf1.mem_alloc;
 	down(&alloc->memory_mutex);
-	snd_iprintf(buffer, "8-bit banks       : \n    ");
+	snd_iprintf(buffer, "8-bit banks       :\n    ");
 	for (i = 0; i < 4; i++)
 		snd_iprintf(buffer, "0x%06x (%04ik)%s", alloc->banks_8[i].address, alloc->banks_8[i].size >> 10, i + 1 < 4 ? "," : "");
 	snd_iprintf(buffer, "\n"
-		    "16-bit banks      : \n    ");
+		    "16-bit banks      :\n    ");
 	for (i = total = 0; i < 4; i++) {
 		snd_iprintf(buffer, "0x%06x (%04ik)%s", alloc->banks_16[i].address, alloc->banks_16[i].size >> 10, i + 1 < 4 ? "," : "");
 		total += alloc->banks_16[i].size;
Index: linux-kj/sound/oss/ali5455.c
===================================================================
--- linux-kj.orig/sound/oss/ali5455.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/oss/ali5455.c	2005-09-21 01:35:54.000000000 +0400
@@ -3002,7 +3002,7 @@ static void ali_ac97_set(struct ac97_cod
 			break;
 	}
 	if (count == 0x7f) {
-		printk(KERN_WARNING "ali_ac97_set: AC97 codec register access timed out. \n");
+		printk(KERN_WARNING "ali_ac97_set: AC97 codec register access timed out.\n");
 		spin_unlock(&card->ac97_lock);
 		return;
 	}
@@ -3015,7 +3015,7 @@ static void ali_ac97_set(struct ac97_cod
 	}
 	spin_unlock(&card->ac97_lock);
 	if (count == 0x7f)
-		printk(KERN_WARNING "ali_ac97_set: AC97 codec register access timed out. \n");
+		printk(KERN_WARNING "ali_ac97_set: AC97 codec register access timed out.\n");
 	return;
 }
 
Index: linux-kj/sound/oss/cs4281/cs4281m.c
===================================================================
--- linux-kj.orig/sound/oss/cs4281/cs4281m.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/oss/cs4281/cs4281m.c	2005-09-21 01:35:54.000000000 +0400
@@ -640,7 +640,7 @@ static int cs4281_write_ac97(struct cs42
 	u32 count, status=0;
 
 	CS_DBGOUT(CS_FUNCTION, 2,
-		  printk(KERN_INFO "cs4281: cs_4281_write_ac97()+ \n"));
+		  printk(KERN_INFO "cs4281: cs_4281_write_ac97()+\n"));
 
 	// Setup the AC97 control registers on the CS4281 to send the
 	// appropriate command to the AC97 to perform the read.
@@ -693,7 +693,7 @@ static __devinit int cs4281_hw_init(stru
 	u32 temp1, temp2;
 
 	CS_DBGOUT(CS_FUNCTION, 2,
-		  printk(KERN_INFO "cs4281: cs4281_hw_init()+ \n"));
+		  printk(KERN_INFO "cs4281: cs4281_hw_init()+\n"));
 #ifndef NOT_CS4281_PM
 	if(!card)
 		return 1;
@@ -1682,7 +1682,7 @@ static void start_adc(struct cs4281_stat
 		spin_unlock_irqrestore(&s->lock, flags);
 
 		CS_DBGOUT(CS_PARMS, 6, printk(KERN_INFO
-			 "cs4281: start_adc(): writel 0x%x \n", temp1));
+			 "cs4281: start_adc(): writel 0x%x\n", temp1));
 	}
 	CS_DBGOUT(CS_FUNCTION, 2,
 		  printk(KERN_INFO "cs4281: start_adc()-\n"));
@@ -1945,7 +1945,7 @@ static void clear_advance(void *buf, uns
 		len -= x;
 	}
 	CS_DBGOUT(CS_WAVE_WRITE, 4, printk(KERN_INFO
-		"cs4281: clear_advance(): memset %d at %p for %d size \n",
+		"cs4281: clear_advance(): memset %d at %p for %d size\n",
 			(unsigned)c, ((char *) buf) + bptr, len));
 	memset(((char *) buf) + bptr, c, len);
 }
@@ -1981,7 +1981,7 @@ static void cs4281_update_ptr(struct cs4
 				wake_up(&s->dma_adc.wait);
 		}
 		CS_DBGOUT(CS_PARMS, 8, printk(KERN_INFO
-			"cs4281: cs4281_update_ptr(): s=%p hwptr=%d total_bytes=%d count=%d \n",
+			"cs4281: cs4281_update_ptr(): s=%p hwptr=%d total_bytes=%d count=%d\n",
 				s, s->dma_adc.hwptr, s->dma_adc.total_bytes, s->dma_adc.count));
 	}
 	// update DAC pointer 
@@ -2014,7 +2014,7 @@ static void cs4281_update_ptr(struct cs4
 				// Continue to play silence until the _release.
 				//
 				CS_DBGOUT(CS_WAVE_WRITE, 6, printk(KERN_INFO
-					"cs4281: cs4281_update_ptr(): memset %d at %p for %d size \n",
+					"cs4281: cs4281_update_ptr(): memset %d at %p for %d size\n",
 						(unsigned)(s->prop_dac.fmt & 
 						(AFMT_U8 | AFMT_U16_LE)) ? 0x80 : 0, 
 						s->dma_dac.rawbuf, s->dma_dac.dmasize));
@@ -2048,7 +2048,7 @@ static void cs4281_update_ptr(struct cs4
 			}
 		}
 		CS_DBGOUT(CS_PARMS, 8, printk(KERN_INFO
-			"cs4281: cs4281_update_ptr(): s=%p hwptr=%d total_bytes=%d count=%d \n",
+			"cs4281: cs4281_update_ptr(): s=%p hwptr=%d total_bytes=%d count=%d\n",
 				s, s->dma_dac.hwptr, s->dma_dac.total_bytes, s->dma_dac.count));
 	}
 }
@@ -2062,7 +2062,7 @@ static void prog_codec(struct cs4281_sta
 	unsigned temp1, format;
 
 	CS_DBGOUT(CS_FUNCTION, 2,
-		  printk(KERN_INFO "cs4281: prog_codec()+ \n"));
+		  printk(KERN_INFO "cs4281: prog_codec()+\n"));
 
 	spin_lock_irqsave(&s->lock, flags);
 	if (type == CS_TYPE_ADC) {
@@ -2136,7 +2136,7 @@ static void prog_codec(struct cs4281_sta
 	}
 	spin_unlock_irqrestore(&s->lock, flags);
 	CS_DBGOUT(CS_FUNCTION, 2,
-		  printk(KERN_INFO "cs4281: prog_codec()- \n"));
+		  printk(KERN_INFO "cs4281: prog_codec()-\n"));
 }
 
 
@@ -2854,7 +2854,7 @@ static unsigned cs_copy_to_user(struct c
 	}
 	*copied = cnt;
 	CS_DBGOUT(CS_FUNCTION, 2, printk(KERN_INFO
-		"cs4281: cs_copy_to_user()- copied bytes is %d \n", cnt));
+		"cs4281: cs_copy_to_user()- copied bytes is %d\n", cnt));
 	return 0;
 }
 
@@ -2872,7 +2872,7 @@ static ssize_t cs4281_read(struct file *
 	unsigned copied = 0;
 
 	CS_DBGOUT(CS_FUNCTION | CS_WAVE_READ, 2,
-		  printk(KERN_INFO "cs4281: cs4281_read()+ %Zu \n", count));
+		  printk(KERN_INFO "cs4281: cs4281_read()+ %Zu\n", count));
 
 	VALIDATE_STATE(s);
 	if (s->dma_adc.mapped)
@@ -2893,7 +2893,7 @@ static ssize_t cs4281_read(struct file *
 //
 	while (count > 0) {
 		CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO
-			"_read() count>0 count=%Zu .count=%d .swptr=%d .hwptr=%d \n",
+			"_read() count>0 count=%Zu .count=%d .swptr=%d .hwptr=%d\n",
 				count, s->dma_adc.count,
 				s->dma_adc.swptr, s->dma_adc.hwptr));
 		spin_lock_irqsave(&s->lock, flags);
@@ -4329,7 +4329,7 @@ static int __devinit cs4281_probe(struct
 
 	CS_DBGOUT(CS_INIT, 2,
 		  printk(KERN_INFO
-			 "cs4281: probe() BA0=0x%.8x BA1=0x%.8x pBA0=%p pBA1=%p \n",
+			 "cs4281: probe() BA0=0x%.8x BA1=0x%.8x pBA0=%p pBA1=%p\n",
 			 (unsigned) temp1, (unsigned) temp2, s->pBA0, s->pBA1));
 	CS_DBGOUT(CS_INIT, 2,
 		  printk(KERN_INFO
@@ -4472,7 +4472,7 @@ static int __init cs4281_init_module(voi
 {
 	int rtn = 0;
 	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
-		"cs4281: cs4281_init_module()+ \n"));
+		"cs4281: cs4281_init_module()+\n"));
 	printk(KERN_INFO "cs4281: version v%d.%02d.%d time " __TIME__ " "
 	       __DATE__ "\n", CS4281_MAJOR_VERSION, CS4281_MINOR_VERSION,
 	       CS4281_ARCH);
Index: linux-kj/sound/oss/cs46xx.c
===================================================================
--- linux-kj.orig/sound/oss/cs46xx.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/oss/cs46xx.c	2005-09-21 01:35:54.000000000 +0400
@@ -990,7 +990,7 @@ static inline unsigned cs_get_dma_addr(s
 	     (!(dmabuf->enable & ADC_RUNNING) ) )
 	{
 		CS_DBGOUT(CS_ERROR, 2, printk(
-			"cs46xx: ERROR cs_get_dma_addr(): not enabled \n") );
+			"cs46xx: ERROR cs_get_dma_addr(): not enabled\n") );
 		return 0;
 	}
 		
@@ -1017,14 +1017,14 @@ static void resync_dma_ptrs(struct cs_st
 {
 	struct dmabuf *dmabuf;
 	
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: resync_dma_ptrs()+ \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: resync_dma_ptrs()+\n") );
 	if(state)
 	{
 		dmabuf = &state->dmabuf;
 		dmabuf->hwptr=dmabuf->swptr = 0;
 		dmabuf->pringbuf = 0;
 	}
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: resync_dma_ptrs()- \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: resync_dma_ptrs()-\n") );
 }
 	
 /* Stop recording (lock held) */
@@ -1045,11 +1045,11 @@ static void stop_adc(struct cs_state *st
 {
 	unsigned long flags;
 
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_adc()+ \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_adc()+\n") );
 	spin_lock_irqsave(&state->card->lock, flags);
 	__stop_adc(state);
 	spin_unlock_irqrestore(&state->card->lock, flags);
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_adc()- \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_adc()-\n") );
 }
 
 static void start_adc(struct cs_state *state)
@@ -1072,7 +1072,7 @@ static void start_adc(struct cs_state *s
 		tmp &= 0xFFFF0000;
 		tmp |= card->cctl;
 		CS_DBGOUT(CS_FUNCTION, 2, printk(
-			"cs46xx: start_adc() poke 0x%x \n",tmp) );
+			"cs46xx: start_adc() poke 0x%x\n",tmp) );
 		cs461x_poke(card, BA1_CCTL, tmp);
 	}
 	spin_unlock_irqrestore(&card->lock, flags);
@@ -1096,11 +1096,11 @@ static void stop_dac(struct cs_state *st
 {
 	unsigned long flags;
 
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_dac()+ \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_dac()+\n") );
 	spin_lock_irqsave(&state->card->lock, flags);
 	__stop_dac(state);
 	spin_unlock_irqrestore(&state->card->lock, flags);
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_dac()- \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: stop_dac()-\n") );
 }	
 
 static void start_dac(struct cs_state *state)
@@ -1110,7 +1110,7 @@ static void start_dac(struct cs_state *s
 	unsigned long flags;
 	int tmp;
 
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: start_dac()+ \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: start_dac()+\n") );
 	spin_lock_irqsave(&card->lock, flags);
 	if (!(dmabuf->enable & DAC_RUNNING) && 
 	    ((dmabuf->mapped || dmabuf->count > 0) && dmabuf->ready) &&
@@ -1122,13 +1122,13 @@ static void start_dac(struct cs_state *s
 		tmp &= 0xFFFF;
 		tmp |= card->pctl;
 		CS_DBGOUT(CS_PARMS, 6, printk(
-		    "cs46xx: start_dac() poke card=%p tmp=0x%.08x addr=%p \n",
+		    "cs46xx: start_dac() poke card=%p tmp=0x%.08x addr=%p\n",
 		    card, (unsigned)tmp, 
 		    card->ba1.idx[(BA1_PCTL >> 16) & 3]+(BA1_PCTL&0xffff) ) );
 		cs461x_poke(card, BA1_PCTL, tmp);
 	}
 	spin_unlock_irqrestore(&card->lock, flags);
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: start_dac()- \n") );
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: start_dac()-\n") );
 }
 
 #define DMABUF_MINORDER 1
@@ -1257,7 +1257,7 @@ static int __prog_dmabuf(struct cs_state
         unsigned long SGarray[9], nSGpages=0;                               
         int ret;
 
-	CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: prog_dmabuf()+ \n"));
+	CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: prog_dmabuf()+\n"));
 /*
  * check for CAPTURE and use only non-sg for initial release
  */
@@ -1314,7 +1314,7 @@ static int __prog_dmabuf(struct cs_state
 			    dmabuf->rate, dmabuf->fmt, dmabuf->numfrag,
 			    dmabuf->fragsize, dmabuf->dmasize) );
 
-		CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: prog_dmabuf()- 0 \n"));
+		CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: prog_dmabuf()- 0\n"));
 		return 0;
 	}
 	else if (dmabuf->type == CS_TYPE_DAC)
@@ -1417,7 +1417,7 @@ static int __prog_dmabuf(struct cs_state
 			    dmabuf->rate, dmabuf->fmt, dmabuf->numfrag,
 			    dmabuf->fragsize, dmabuf->dmasize) );
 
-		CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: prog_dmabuf()- \n"));
+		CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: prog_dmabuf()-\n"));
 		return 0;
 	}
 	else
@@ -1452,7 +1452,7 @@ static int drain_dac(struct cs_state *st
 	unsigned long tmo;
 	int count;
 
-	CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: drain_dac()+ \n"));
+	CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: drain_dac()+\n"));
 	if (dmabuf->mapped || !dmabuf->ready)
 	{
 		CS_DBGOUT(CS_FUNCTION, 4, printk("cs46xx: drain_dac()- 0, not ready\n"));
@@ -1658,7 +1658,7 @@ static irqreturn_t cs_interrupt(int irq,
 	struct cs_state *playstate = card->channel[1].state;
 	u32 status;
 
-	CS_DBGOUT(CS_INTERRUPT, 9, printk("cs46xx: cs_interrupt()+ \n"));
+	CS_DBGOUT(CS_INTERRUPT, 9, printk("cs46xx: cs_interrupt()+\n"));
 
 	spin_lock(&card->lock);
 
@@ -1688,7 +1688,7 @@ static irqreturn_t cs_interrupt(int irq,
  	/* clear 'em */
 	cs461x_pokeBA0(card, BA0_HICR, HICR_CHGM|HICR_IEV);
 	spin_unlock(&card->lock);
-	CS_DBGOUT(CS_INTERRUPT, 9, printk("cs46xx: cs_interrupt()- \n"));
+	CS_DBGOUT(CS_INTERRUPT, 9, printk("cs46xx: cs_interrupt()-\n"));
 	return IRQ_HANDLED;
 }
 
@@ -2055,7 +2055,7 @@ static unsigned cs_copy_to_user(
 	}
 	*copied = cnt;
 	CS_DBGOUT(CS_FUNCTION, 2, printk(KERN_INFO 
-		"cs46xx: cs_copy_to_user()- copied bytes is %d \n",cnt) );
+		"cs46xx: cs_copy_to_user()- copied bytes is %d\n",cnt) );
 	return 0;
 }
 
@@ -2300,7 +2300,7 @@ static unsigned int cs_poll(struct file 
 	unsigned long flags;
 	unsigned int mask = 0;
 
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: cs_poll()+ \n"));
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: cs_poll()+\n"));
 	if (!(file->f_mode & (FMODE_WRITE | FMODE_READ)))
 	{
 		return -EINVAL;
@@ -2352,7 +2352,7 @@ static unsigned int cs_poll(struct file 
 	}
 	spin_unlock_irqrestore(&card->lock, flags);
 
-	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: cs_poll()- (0x%x) \n",
+	CS_DBGOUT(CS_FUNCTION, 2, printk("cs46xx: cs_poll()- (0x%x)\n",
 		mask));
 	return mask;
 }
@@ -3890,7 +3890,7 @@ static u16 _cs_ac97_get(struct ac97_code
 	 */
 	if (!( (tmp=cs461x_peekBA0(card, BA0_ACSTS)) & ACSTS_VSTS)) {
 		CS_DBGOUT(CS_ERROR, 2, printk(KERN_WARNING 
-			"cs46xx: AC'97 read problem (ACSTS_VSTS), reg = 0x%x val=0x%x 0xffff \n", 
+			"cs46xx: AC'97 read problem (ACSTS_VSTS), reg = 0x%x val=0x%x 0xffff\n", 
 				reg, tmp));
 		return 0xffff;
 	}
@@ -5710,7 +5710,7 @@ static int __init cs46xx_init_module(voi
 {
 	int rtn = 0;
 	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
-		"cs46xx: cs46xx_init_module()+ \n"));
+		"cs46xx: cs46xx_init_module()+\n"));
 	rtn = pci_module_init(&cs46xx_pci_driver);
 
 	if(rtn == -ENODEV)
Index: linux-kj/sound/oss/dmasound/dac3550a.c
===================================================================
--- linux-kj.orig/sound/oss/dmasound/dac3550a.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/oss/dmasound/dac3550a.c	2005-09-21 01:35:54.000000000 +0400
@@ -77,7 +77,7 @@ int daca_set_volume(uint left_vol, uint 
 	voldata |= (right_vol >> 14)  & 0x3f;
   
 	if (i2c_smbus_write_word_data(daca_client, 2, voldata) < 0) {
-		printk("daca: failed to set volume \n");
+		printk("daca: failed to set volume\n");
 		return -1; 
 	}
 
Index: linux-kj/sound/oss/dmasound/tas_common.h
===================================================================
--- linux-kj.orig/sound/oss/dmasound/tas_common.h	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/oss/dmasound/tas_common.h	2005-09-21 01:35:54.000000000 +0400
@@ -183,7 +183,7 @@ tas_write_register(	struct tas_data_t *s
 					      reg_width,
 					      data);
 		if (rc < 0) {
-			printk("tas: I2C block write failed \n");  
+			printk("tas: I2C block write failed\n");  
 			return rc; 
 		}
 	}
@@ -204,7 +204,7 @@ tas_sync_register(	struct tas_data_t *se
 				      reg_width,
 				      self->shadow[reg_num]);
 	if (rc < 0) {
-		printk("tas: I2C block write failed \n");
+		printk("tas: I2C block write failed\n");
 		return rc;
 	}
 	return 0;
@@ -224,7 +224,7 @@ tas_write_byte_register(	struct tas_data
 		self->shadow[reg_num][0]=data;
 	if (write_mode & WRITE_HW) {
 		if (i2c_smbus_write_byte_data(self->client, reg_num, data) < 0) {
-			printk("tas: I2C byte write failed \n");  
+			printk("tas: I2C byte write failed\n");  
 			return -1; 
 		}
 	}
@@ -240,7 +240,7 @@ tas_sync_byte_register(	struct tas_data_
 		return -1;
 	if (i2c_smbus_write_byte_data(
 	    self->client, reg_num, self->shadow[reg_num][0]) < 0) {
-		printk("tas: I2C byte write failed \n");
+		printk("tas: I2C byte write failed\n");
 		return -1;
 	}
 	return 0;
Index: linux-kj/sound/oss/forte.c
===================================================================
--- linux-kj.orig/sound/oss/forte.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/oss/forte.c	2005-09-21 01:35:54.000000000 +0400
@@ -1403,7 +1403,7 @@ forte_dsp_mmap (struct file *file, struc
         size = vma->vm_end - vma->vm_start;
 
         if (size > channel->buf_pages * PAGE_SIZE) {
-		DPRINTK ("%s: size (%ld) > buf_sz (%d) \n", __FUNCTION__,
+		DPRINTK ("%s: size (%ld) > buf_sz (%d)\n", __FUNCTION__,
 			 size, channel->buf_sz);
 		ret = -EINVAL;
                 goto out;
@@ -1794,7 +1794,7 @@ forte_proc_read (char *page, char **star
 		      "Channels   : %-5d     -\n"
 		      "16-bit     : %-3s       %-3s\n"
 		      "Stereo     : %-3s       %-3s\n"
-		      " \n"
+		      "\n"
 		      "Buffer Sz  : %-6d    %-6d\n"
 		      "Frag Sz    : %-6d    %-6d\n"
 		      "Frag Num   : %-6d    %-6d\n"
Index: linux-kj/sound/oss/swarm_cs4297a.c
===================================================================
--- linux-kj.orig/sound/oss/swarm_cs4297a.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/oss/swarm_cs4297a.c	2005-09-21 01:35:54.000000000 +0400
@@ -337,7 +337,7 @@ static void clear_advance(void *buf, uns
 		len -= x;
 	}
 	CS_DBGOUT(CS_WAVE_WRITE, 4, printk(KERN_INFO
-		"cs4297a: clear_advance(): memset %d at 0x%.8x for %d size \n",
+		"cs4297a: clear_advance(): memset %d at 0x%.8x for %d size\n",
 			(unsigned)c, (unsigned)((char *) buf) + bptr, len));
 	memset(((char *) buf) + bptr, c, len);
 }
@@ -1059,7 +1059,7 @@ static void cs4297a_update_ptr(struct cs
                 }
 
 		CS_DBGOUT(CS_PARMS, 8, printk(KERN_INFO
-			"cs4297a: cs4297a_update_ptr(): s=0x%.8x hwptr=%d total_bytes=%d count=%d \n",
+			"cs4297a: cs4297a_update_ptr(): s=0x%.8x hwptr=%d total_bytes=%d count=%d\n",
 				(unsigned)s, d->hwptr, 
 				d->total_bytes, d->count));
 	}
@@ -1100,7 +1100,7 @@ static void cs4297a_update_ptr(struct cs
 				// Continue to play silence until the _release.
 				//
 				CS_DBGOUT(CS_WAVE_WRITE, 6, printk(KERN_INFO
-					"cs4297a: cs4297a_update_ptr(): memset %d at 0x%.8x for %d size \n",
+					"cs4297a: cs4297a_update_ptr(): memset %d at 0x%.8x for %d size\n",
 						(unsigned)(s->prop_dac.fmt & 
 						(AFMT_U8 | AFMT_U16_LE)) ? 0x80 : 0, 
 						(unsigned)d->dma_buf, 
@@ -1133,7 +1133,7 @@ static void cs4297a_update_ptr(struct cs
 			}
 		}
 		CS_DBGOUT(CS_PARMS, 8, printk(KERN_INFO
-			"cs4297a: cs4297a_update_ptr(): s=0x%.8x hwptr=%d total_bytes=%d count=%d \n",
+			"cs4297a: cs4297a_update_ptr(): s=0x%.8x hwptr=%d total_bytes=%d count=%d\n",
 				(unsigned) s, d->hwptr, 
 				d->total_bytes, d->count));
 	}
@@ -1650,7 +1650,7 @@ static ssize_t cs4297a_read(struct file 
 	unsigned copied = 0;
 
 	CS_DBGOUT(CS_FUNCTION | CS_WAVE_READ, 2,
-		  printk(KERN_INFO "cs4297a: cs4297a_read()+ %d \n", count));
+		  printk(KERN_INFO "cs4297a: cs4297a_read()+ %d\n", count));
 
 	VALIDATE_STATE(s);
 	if (s->dma_adc.mapped)
@@ -1671,7 +1671,7 @@ static ssize_t cs4297a_read(struct file 
 //
 	while (count > 0) {
 		CS_DBGOUT(CS_WAVE_READ, 8, printk(KERN_INFO
-			"_read() count>0 count=%d .count=%d .swptr=%d .hwptr=%d \n",
+			"_read() count>0 count=%d .count=%d .swptr=%d .hwptr=%d\n",
 				count, s->dma_adc.count,
 				s->dma_adc.swptr, s->dma_adc.hwptr));
 		spin_lock_irqsave(&s->lock, flags);
@@ -2587,7 +2587,7 @@ static int __init cs4297a_init(void)
 #endif
 
 	CS_DBGOUT(CS_INIT | CS_FUNCTION, 2, printk(KERN_INFO 
-		"cs4297a: cs4297a_init_module()+ \n"));
+		"cs4297a: cs4297a_init_module()+\n"));
 
 #ifndef CONFIG_BCM_CS4297A_CSWARM
         mdio_val = __raw_readq(KSEG1 + A_MAC_REGISTER(2, R_MAC_MDIO)) &
Index: linux-kj/sound/pci/ali5451/ali5451.c
===================================================================
--- linux-kj.orig/sound/pci/ali5451/ali5451.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/pci/ali5451/ali5451.c	2005-09-21 01:35:54.000000000 +0400
@@ -2120,7 +2120,7 @@ static int snd_ali_chip_init(ali_t *code
 	unsigned char temp;
 	struct pci_dev *pci_dev = NULL;
 
-	snd_ali_printk("chip initializing ... \n");
+	snd_ali_printk("chip initializing ...\n");
 
 	if (snd_ali_reset_5451(codec)) {
 		snd_printk("ali_chip_init: reset 5451 error.\n");
Index: linux-kj/sound/pci/au88x0/au88x0_eq.c
===================================================================
--- linux-kj.orig/sound/pci/au88x0/au88x0_eq.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/pci/au88x0/au88x0_eq.c	2005-09-21 01:35:54.000000000 +0400
@@ -854,7 +854,7 @@ snd_vortex_peaks_get(snd_kcontrol_t * kc
 
 	vortex_Eqlzr_GetAllPeaks(vortex, peaks, &count);
 	if (count != 20) {
-		printk("vortex: peak count error 20 != %d \n", count);
+		printk("vortex: peak count error 20 != %d\n", count);
 		return -1;
 	}
 	for (i = 0; i < 20; i++)
Index: linux-kj/sound/pci/rme9652/hdspm.c
===================================================================
--- linux-kj.orig/sound/pci/rme9652/hdspm.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/pci/rme9652/hdspm.c	2005-09-21 01:35:54.000000000 +0400
@@ -745,7 +745,7 @@ static int hdspm_set_rate(hdspm_t * hdsp
 			if ((hdspm_autosync_ref(hdspm) ==
 			     HDSPM_AUTOSYNC_FROM_NONE)) {
 
-				snd_printk(KERN_WARNING "HDSPM: Detected no Externel Sync \n");
+				snd_printk(KERN_WARNING "HDSPM: Detected no Externel Sync\n");
 				not_set = 1;
 
 			} else if (rate != external_freq) {
@@ -2338,7 +2338,7 @@ snd_hdspm_proc_read(snd_info_entry_t * e
 		    (long) hdspm_hw_pointer(hdspm) * 4);
 
 	snd_iprintf(buffer,
-		    "MIDI FIFO: Out1=0x%x, Out2=0x%x, In1=0x%x, In2=0x%x \n",
+		    "MIDI FIFO: Out1=0x%x, Out2=0x%x, In1=0x%x, In2=0x%x\n",
 		    hdspm_read(hdspm, HDSPM_midiStatusOut0) & 0xFF,
 		    hdspm_read(hdspm, HDSPM_midiStatusOut1) & 0xFF,
 		    hdspm_read(hdspm, HDSPM_midiStatusIn0) & 0xFF,
Index: linux-kj/sound/ppc/daca.c
===================================================================
--- linux-kj.orig/sound/ppc/daca.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/ppc/daca.c	2005-09-21 01:35:54.000000000 +0400
@@ -84,7 +84,7 @@ static int daca_set_volume(pmac_daca_t *
 	data[1] |= mix->deemphasis ? 0x40 : 0;
 	if (i2c_smbus_write_block_data(mix->i2c.client, DACA_REG_AVOL,
 				       2, data) < 0) {
-		snd_printk("failed to set volume \n");
+		snd_printk("failed to set volume\n");
 		return -EINVAL;
 	}
 	return 0;
Index: linux-kj/sound/ppc/tumbler.c
===================================================================
--- linux-kj.orig/sound/ppc/tumbler.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/ppc/tumbler.c	2005-09-21 01:35:54.000000000 +0400
@@ -241,7 +241,7 @@ static int tumbler_set_master_volume(pma
   
 	if (i2c_smbus_write_block_data(mix->i2c.client, TAS_REG_VOL,
 				       6, block) < 0) {
-		snd_printk("failed to set volume \n");
+		snd_printk("failed to set volume\n");
 		return -EINVAL;
 	}
 	return 0;
Index: linux-kj/sound/usb/usx2y/usX2Yhwdep.c
===================================================================
--- linux-kj.orig/sound/usb/usx2y/usX2Yhwdep.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/usb/usx2y/usX2Yhwdep.c	2005-09-21 01:35:54.000000000 +0400
@@ -183,7 +183,7 @@ static int usX2Y_create_usbmidi(snd_card
 	struct usb_interface *iface = usb_ifnum_to_if(dev, 0);
 	snd_usb_audio_quirk_t *quirk = le16_to_cpu(dev->descriptor.idProduct) == USB_ID_US428 ? &quirk_2 : &quirk_1;
 
-	snd_printdd("usX2Y_create_usbmidi \n");
+	snd_printdd("usX2Y_create_usbmidi\n");
 	return snd_usb_create_midi_interface(&usX2Y(card)->chip, iface, quirk);
 }
 
@@ -193,7 +193,7 @@ static int usX2Y_create_alsa_devices(snd
 
 	do {
 		if ((err = usX2Y_create_usbmidi(card)) < 0) {
-			snd_printk("usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i \n", err);
+			snd_printk("usX2Y_create_alsa_devices: usX2Y_create_usbmidi error %i\n", err);
 			break;
 		}
 		if ((err = usX2Y_audio_create(card)) < 0) 
@@ -224,7 +224,7 @@ static int snd_usX2Y_hwdep_dsp_load(snd_
 		}
 		err = usb_set_interface(dev, 0, 1);
 		if (err)
-			snd_printk("usb_set_interface error \n");
+			snd_printk("usb_set_interface error\n");
 		else
 			err = usb_bulk_msg(dev, usb_sndbulkpipe(dev, 2), buf, dsp->length, &lret, 6000);
 		kfree(buf);
@@ -235,17 +235,17 @@ static int snd_usX2Y_hwdep_dsp_load(snd_
 		msleep(250);				// give the device some time
 		err = usX2Y_AsyncSeq04_init(priv);
 		if (err) {
-			snd_printk("usX2Y_AsyncSeq04_init error \n");
+			snd_printk("usX2Y_AsyncSeq04_init error\n");
 			return err;
 		}
 		err = usX2Y_In04_init(priv);
 		if (err) {
-			snd_printk("usX2Y_In04_init error \n");
+			snd_printk("usX2Y_In04_init error\n");
 			return err;
 		}
 		err = usX2Y_create_alsa_devices(hw->card);
 		if (err) {
-			snd_printk("usX2Y_create_alsa_devices error %i \n", err);
+			snd_printk("usX2Y_create_alsa_devices error %i\n", err);
 			snd_card_free(hw->card);
 			return err;
 		}
Index: linux-kj/sound/usb/usx2y/usbusx2yaudio.c
===================================================================
--- linux-kj.orig/sound/usb/usx2y/usbusx2yaudio.c	2005-09-21 01:19:06.000000000 +0400
+++ linux-kj/sound/usb/usx2y/usbusx2yaudio.c	2005-09-21 01:35:54.000000000 +0400
@@ -740,7 +740,7 @@ static int usX2Y_format_set(usX2Ydev_t *
 	}
 	usb_kill_urb(usX2Y->In04urb);
 	if ((err = usb_set_interface(usX2Y->chip.dev, 0, alternate))) {
-		snd_printk("usb_set_interface error \n");
+		snd_printk("usb_set_interface error\n");
 		return err;
 	}
 	usX2Y->In04urb->dev = usX2Y->chip.dev;
Index: linux-kj/drivers/acpi/executer/exdump.c
===================================================================
--- linux-kj.orig/drivers/acpi/executer/exdump.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/executer/exdump.c	2005-09-21 01:35:54.000000000 +0400
@@ -214,7 +214,7 @@ void acpi_ex_dump_operand(union acpi_ope
 
 	case ACPI_TYPE_BUFFER:
 
-		acpi_os_printf("Buffer len %X @ %p \n",
+		acpi_os_printf("Buffer len %X @ %p\n",
 			       obj_desc->buffer.length,
 			       obj_desc->buffer.pointer);
 
@@ -320,17 +320,17 @@ void acpi_ex_dump_operand(union acpi_ope
 
 	case ACPI_TYPE_BUFFER_FIELD:
 
-		acpi_os_printf("buffer_field: %X bits at byte %X bit %X of \n",
+		acpi_os_printf("buffer_field: %X bits at byte %X bit %X of\n",
 			       obj_desc->buffer_field.bit_length,
 			       obj_desc->buffer_field.base_byte_offset,
 			       obj_desc->buffer_field.start_field_bit_offset);
 
 		if (!obj_desc->buffer_field.buffer_obj) {
-			ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "*NULL* \n"));
+			ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "*NULL*\n"));
 		} else
 		    if (ACPI_GET_OBJECT_TYPE(obj_desc->buffer_field.buffer_obj)
 			!= ACPI_TYPE_BUFFER) {
-			acpi_os_printf("*not a Buffer* \n");
+			acpi_os_printf("*not a Buffer*\n");
 		} else {
 			acpi_ex_dump_operand(obj_desc->buffer_field.buffer_obj,
 					     depth + 1);
@@ -618,7 +618,7 @@ acpi_ex_dump_package(union acpi_operand_
 
 	case ACPI_TYPE_PACKAGE:
 
-		acpi_os_printf("[Package] Contains %d Elements: \n",
+		acpi_os_printf("[Package] Contains %d Elements:\n",
 			       obj_desc->package.count);
 
 		for (i = 0; i < obj_desc->package.count; i++) {
Index: linux-kj/drivers/acpi/executer/exnames.c
===================================================================
--- linux-kj.orig/drivers/acpi/executer/exnames.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/executer/exnames.c	2005-09-21 01:35:54.000000000 +0400
@@ -191,10 +191,10 @@ static acpi_status acpi_ex_name_segment(
 		if (name_string) {
 			ACPI_STRCAT(name_string, char_buf);
 			ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-					  "Appended to - %s \n", name_string));
+					  "Appended to - %s\n", name_string));
 		} else {
 			ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-					  "No Name string - %s \n", char_buf));
+					  "No Name string - %s\n", char_buf));
 		}
 	} else if (index == 0) {
 		/*
Index: linux-kj/drivers/acpi/executer/exresop.c
===================================================================
--- linux-kj.orig/drivers/acpi/executer/exresop.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/executer/exresop.c	2005-09-21 01:35:54.000000000 +0400
@@ -157,7 +157,7 @@ acpi_ex_resolve_operands(u16 opcode,
 	}
 
 	ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-			  "Opcode %X [%s] required_operand_types=%8.8X \n",
+			  "Opcode %X [%s] required_operand_types=%8.8X\n",
 			  opcode, op_info->name, arg_types));
 
 	/*
Index: linux-kj/drivers/acpi/namespace/nsaccess.c
===================================================================
--- linux-kj.orig/drivers/acpi/namespace/nsaccess.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/namespace/nsaccess.c	2005-09-21 01:35:54.000000000 +0400
@@ -498,7 +498,7 @@ acpi_ns_lookup(union acpi_generic_state 
 			path++;
 
 			ACPI_DEBUG_PRINT((ACPI_DB_NAMES,
-					  "Multi Pathname (%d Segments, Flags=%X) \n",
+					  "Multi Pathname (%d Segments, Flags=%X)\n",
 					  num_segments, flags));
 			break;
 
Index: linux-kj/drivers/acpi/namespace/nsnames.c
===================================================================
--- linux-kj.orig/drivers/acpi/namespace/nsnames.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/namespace/nsnames.c	2005-09-21 01:35:54.000000000 +0400
@@ -241,7 +241,7 @@ acpi_ns_handle_to_pathname(acpi_handle t
 
 	acpi_ns_build_external_path(node, required_size, buffer->pointer);
 
-	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X] \n",
+	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, "%s [%X]\n",
 			  (char *)buffer->pointer, (u32) required_size));
 	return_ACPI_STATUS(AE_OK);
 }
Index: linux-kj/drivers/acpi/tables/tbrsdt.c
===================================================================
--- linux-kj.orig/drivers/acpi/tables/tbrsdt.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/tables/tbrsdt.c	2005-09-21 01:35:54.000000000 +0400
@@ -251,7 +251,7 @@ acpi_status acpi_tb_get_table_rsdt(void)
 	}
 
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-			  "RSDP located at %p, points to RSDT physical=%8.8X%8.8X \n",
+			  "RSDP located at %p, points to RSDT physical=%8.8X%8.8X\n",
 			  acpi_gbl_RSDP,
 			  ACPI_FORMAT_UINT64(address.pointer.value)));
 
Index: linux-kj/drivers/acpi/tables/tbxfroot.c
===================================================================
--- linux-kj.orig/drivers/acpi/tables/tbxfroot.c	2005-09-21 01:19:08.000000000 +0400
+++ linux-kj/drivers/acpi/tables/tbxfroot.c	2005-09-21 01:35:54.000000000 +0400
@@ -251,7 +251,7 @@ acpi_get_firmware_table(acpi_string sign
 
 	acpi_tb_get_rsdt_address(&address);
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO,
-			  "RSDP located at %p, RSDT physical=%8.8X%8.8X \n",
+			  "RSDP located at %p, RSDT physical=%8.8X%8.8X\n",
 			  acpi_gbl_RSDP,
 			  ACPI_FORMAT_UINT64(address.pointer.value)));
 
Index: linux-kj/drivers/message/fusion/mptbase.c
===================================================================
--- linux-kj.orig/drivers/message/fusion/mptbase.c	2005-09-21 01:19:31.000000000 +0400
+++ linux-kj/drivers/message/fusion/mptbase.c	2005-09-21 01:35:54.000000000 +0400
@@ -770,7 +770,7 @@ mpt_get_msg_frame(int handle, MPT_ADAPTE
 		printk(KERN_WARNING "IOC Active. No free Msg Frames! Count 0x%x Max 0x%x\n", ioc->mfcnt, ioc->req_depth);
 	mfcounter++;
 	if (mfcounter == PRINT_MF_COUNT)
-		printk(KERN_INFO "MF Count 0x%x Max 0x%x \n", ioc->mfcnt, ioc->req_depth);
+		printk(KERN_INFO "MF Count 0x%x Max 0x%x\n", ioc->mfcnt, ioc->req_depth);
 #endif
 
 	dmfprintk((KERN_INFO MYNAM ": %s: mpt_get_msg_frame(%d,%d), got mf=%p\n",
Index: linux-kj/net/ipv6/netfilter/ip6t_dst.c
===================================================================
--- linux-kj.orig/net/ipv6/netfilter/ip6t_dst.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/ipv6/netfilter/ip6t_dst.c	2005-09-21 01:36:57.000000000 +0400
@@ -157,11 +157,11 @@ match(const struct sk_buff *skb,
 			}
 
 			/* Step to the next */
-			DEBUGP("len%04X \n", optlen);
+			DEBUGP("len%04X\n", optlen);
 
 			if ((ptr > skb->len - optlen || hdrlen < optlen) &&
 			    (temp < optinfo->optsnr - 1)) {
-				DEBUGP("new pointer is too large! \n");
+				DEBUGP("new pointer is too large!\n");
 				break;
 			}
 			ptr += optlen;
Index: linux-kj/net/ipv6/netfilter/ip6t_hbh.c
===================================================================
--- linux-kj.orig/net/ipv6/netfilter/ip6t_hbh.c	2005-09-21 01:19:03.000000000 +0400
+++ linux-kj/net/ipv6/netfilter/ip6t_hbh.c	2005-09-21 01:37:12.000000000 +0400
@@ -157,11 +157,11 @@ match(const struct sk_buff *skb,
 			}
 
 			/* Step to the next */
-			DEBUGP("len%04X \n", optlen);
+			DEBUGP("len%04X\n", optlen);
 
 			if ((ptr > skb->len - optlen || hdrlen < optlen) &&
 			    (temp < optinfo->optsnr - 1)) {
-				DEBUGP("new pointer is too large! \n");
+				DEBUGP("new pointer is too large!\n");
 				break;
 			}
 			ptr += optlen;
