remove trailing spaces in messages
Subsystems (30)
cover remove trailing spaces in messages
This is a first series of patches to remove trailing spaces in messages. Patches cover arch-specific code plus one fix for PM and one in Documentation. Depending on how this series is received I'll continue with other parts of the kernel.
Benefits are:
- general cleanup and consistency
- minor reduction in kernel size and user's log file size
- reduced annoyance for people writing logcheck rules
The patch for m68k has been rebased against linux-next; all other patches apply against both mainline and -next (as of 5-2).
Shortstat:
74 files changed, 135 insertions(+), 136 deletions(-)
Frans Pop (16):
alpha: remove trailing spaces in messages
arm: remove trailing spaces in messages
ia64: remove trailing space in messages
m68k: remove trailing space in messages
microblaze: remove trailing space in messages
mips: remove trailing space in messages
parisc: remove trailing space in messages
s390: remove trailing space in messages
sparc: remove trailing space in messages
x86: remove trailing space in messages
blackfin: remove trailing space in messages cris/trivial: remove trailing space in message
powerpc: remove trailing space in messages
um: remove trailing space in messages
PM: remove trailing space in message
trivial: remove trailing space in spidev test program
PATCH 1/16 alpha: remove trailing spaces in messages
--- arch/alpha/kernel/sys_dp264.c | 2 +- arch/alpha/kernel/sys_titan.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/alpha/kernel/sys_dp264.c +1 -1
@@ -224,7 +224,7 @@ static void dp264_device_interrupt(unsigned long vector) {#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;
arch/alpha/kernel/sys_titan.c +1 -1
@@ -171,7 +171,7 @@ titan_set_irq_affinity(unsigned int irq, const struct cpumask *affinity)static void titan_device_interrupt (unsigned long vector) { -printk ("titan_device_interrupt: NOT IMPLEMENTED YET!! \n" ); +printk ("titan_device_interrupt: NOT IMPLEMENTED YET!!\n" ); } static void
Signature · 1 line
1.6.6.1
Matt Turner
maintainerRe: [PATCH 01/16] alpha: remove trailing spaces in messages
Quoted 32 lines · Frans Pop
Signed-off-by Frans Pop <[email protected]>---
arch/alpha/kernel/sys_dp264.c | 2 +-
arch/alpha/kernel/sys_titan.c | 2 +-2 files changed, 2 insertions(+), 2 deletions(-)arch/alpha/kernel/sys_dp264.c +1
-1@@ -224,7 +224,7 @@ static void dp264_device_interrupt(unsigned long vector) { #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;arch/alpha/kernel/sys_titan.c +0
-0@@ -171,7 +171,7 @@ titan_set_irq_affinity(unsigned int irq, const struct cpumask *affinity)static void
titan_device_interrupt(unsigned long vector)
{
-printk("titan_device_interrupt: NOT IMPLEMENTED YET!! \n");
+printk("titan_device_interrupt: NOT IMPLEMENTED YET!!\n"); }
Quoted 9 lines
static void
--
1.6.6.1--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks. I'll apply this to my tree.
Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-alpha" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/16 arm: remove trailing spaces in messages
In reply to Frans PopAlso make 'Displaying register contents' messages consistent in mach-bcmring/csp/{dmac/dmacHw_extra.c,tmr/tmrHw.c}.
Minor checkpatch fixes for mach-lh7a40x/clcd.c and mach-pxa/pxa27x.c.
--- arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +- arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +- arch/arm/mach-lh7a40x/clcd.c | 8 ++++---- arch/arm/mach-pxa/pxa27x.c | 8 ++++---- arch/arm/mach-pxa/stargate2.c | 2 +- arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c +1 -1
@@ -73,7 +73,7 @@ static void DisplayRegisterContents(int module, /* [ IN ] DMA Controller unit ) {int chan; - (*fpPrint) ("Displaying register content \n\n" ); + (*fpPrint) ("Displaying register contents\n\n" ); (*fpPrint) ("Module %d: Interrupt raw transfer 0x%X\n" , module, (uint32_t ) (dmacHw_REG_INT_RAW_TRAN (module))); (*fpPrint) ("Module %d: Interrupt raw block 0x%X\n",
arch/arm/mach-bcmring/csp/tmr/tmrHw.c +1 -1
@@ -498,7 +498,7 @@ tmrHw_ID_t tmrHw_getInterruptSource(void /* void */void tmrHw_printDebugInfo (tmrHw_ID_t timerId,/* [ IN ] Timer id */ int (*fpPrint) (const char *, ...)/* [ IN ] Print callback function */ ) { - (*fpPrint) ("Displaying register contents \n\n" ); + (*fpPrint) ("Displaying register contents\n\n" ); (*fpPrint) ("Timer %d: Load value 0x%X\n" , timerId, pTmrHw[timerId].LoadValue); (*fpPrint) ("Timer %d: Background load value 0x%X\n", timerId,
arch/arm/mach-lh7a40x/clcd.c +4 -4
@@ -147,10 +147,10 @@ static int lh7a40x_clcd_setup (struct clcd_fb *fb) fb->fb.screen_base =dma_alloc_writecombine (&fb->dev->dev, len, &dma,GFP_KERNEL ); -printk ("CLCD: LCD setup fb virt 0x%p phys 0x%p l %x io 0x%p \n" , +printk ("CLCD: LCD setup fb virt 0x%p phys 0x%p l %x io 0x%p\n" , fb->fb.screen_base, (void *) dma, len, (void *)io_p2v (CLCDC_PHYS )); -printk ("CLCD: pixclock %d\n" , lcd_panel.mode.pixclock); +printk ("CLCD: pixclock %d\n" , lcd_panel.mode.pixclock);if (!fb->fb.screen_base) {printk (KERN_ERR "CLCD: unable to map framebuffer\n" );
@@ -231,10 +231,10 @@ void __init lh7a40x_clcd_init (void) {int i;int result; -printk ("CLCD: registering amba devices\n" ); +printk ("CLCD: registering amba devices\n" );for (i =0 ; i <ARRAY_SIZE (amba_devs); i++) {struct amba_device *d = amba_devs[i]; result =amba_device_register (d, &iomem_resource); -printk (" %d -> %d\n" , i ,result); +printk (" %d -> %d\n" , i, result); } }
arch/arm/mach-pxa/pxa27x.c +4 -4
@@ -73,14 +73,14 @@ unsigned int pxa27x_get_clk_frequency_khz(int info)S = (b) ?L : (L /2 );if (info) { -printk (KERN_INFO "Run Mode clock: %d.%02dMHz (*%d)\n" , +printk (KERN_INFO "Run Mode clock: %d.%02dMHz (*%d)\n" ,L /1000000 , (L %1000000 ) /10000 , l ); -printk (KERN_INFO "Turbo Mode clock: %d.%02dMHz (*%d.%d, %sactive)\n" , +printk (KERN_INFO "Turbo Mode clock: %d.%02dMHz (*%d.%d, %sactive)\n" ,N /1000000 , (N %1000000 )/10000 , n2 /2 , (n2 %2 )*5 , (t) ?"" :"in" ); -printk (KERN_INFO "Memory clock: %d.%02dMHz (/%d)\n" , +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 ); }
arch/arm/mach-pxa/stargate2.c +1 -1
@@ -167,7 +167,7 @@ static int stargate2_reset_bluetooth(void)int err; err =gpio_request (SG2_BT_RESET ,"SG2_BT_RESET" );if (err) { -printk (KERN_ERR "Could not get gpio for bluetooth reset \n" ); +printk (KERN_ERR "Could not get gpio for bluetooth reset\n" );return err; }gpio_direction_output (SG2_BT_RESET ,1 );
arch/arm/mach-sa1100/jornada720_ssp.c +1 -1
@@ -144,7 +144,7 @@ static int __init jornada_ssp_probe(struct platform_device *dev)return ret; } -printk (KERN_WARNING "SSP: initialization failed, trying non-irq solution \n" ); +printk (KERN_WARNING "SSP: initialization failed, trying non-irq solution\n" );/* init of Serial 4 port */ Ser4MCCR0 =0 ;
Signature · 1 line
1.6.6.1
PATCH 3/16 ia64: remove trailing space in messages
In reply to Frans Pop--- arch/ia64/ia32/sys_ia32.c | 4 ++-- arch/ia64/kernel/perfmon.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
arch/ia64/ia32/sys_ia32.c +2 -2
@@ -2219,8 +2219,8 @@ static void access_fpreg_ia32(int regno, void *reg,else if (regno <=7 ) f = &sw->f12 + (regno -4 );else { -printk (KERN_ERR "regno must be less than 7 \n" ); -return ; +printk (KERN_ERR "regno must be less than 7\n" ); +return ; }if (write)
arch/ia64/kernel/perfmon.c +2 -2
@@ -2713,7 +2713,7 @@ pfm_context_create(pfm_context_t *ctx, void *arg, int count, struct pt_regs *reg goto buffer_error; } - 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,
@@ -3677,7 +3677,7 @@ pfm_restart(pfm_context_t *ctx, void *arg, int count, struct pt_regs *regs)* "self-monitoring". */ if (CTX_OVFL_NOBLOCK (ctx) =0 && state =PFM_CTX_MASKED ) { -DPRINT (("unblocking [%d] \n" ,task_pid_nr (task))); +DPRINT (("unblocking [%d]\n" ,task_pid_nr (task)));complete (&ctx->ctx_restart_done); }else {DPRINT (("[%d] armed exit trap\n" ,task_pid_nr (task)));
Signature · 1 line
1.6.6.1
PATCH 4/16 m68k: remove trailing space in messages
In reply to Frans Pop--- arch/m68k/kernel/traps.c | 2 +- arch/m68k/mac/config.c | 10 +++++----- arch/m68k/q40/config.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
arch/m68k/kernel/traps.c +1 -1
@@ -455,7 +455,7 @@ static inline void access_error040(struct frame *fp)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 */
arch/m68k/mac/config.c +5 -5
@@ -148,7 +148,7 @@ static void mac_cache_card_flush(int writeback)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; mach_init_IRQ = mac_init_IRQ;
@@ -867,7 +867,7 @@ static void __init mac_identify(void)*/ iop_preinit (); -printk (KERN_INFO "Detected Macintosh model: %d \n" , model); +printk (KERN_INFO "Detected Macintosh model: %d\n" , model);/* * Report booter data:
@@ -878,12 +878,12 @@ static void __init 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);iop_init ();
arch/m68k/q40/config.c +1 -1
@@ -126,7 +126,7 @@ static void q40_reset(void) { halted =1 ;printk ("\n\n*******************************************\n" -"Called q40_reset : press the RESET button!! \n" +"Called q40_reset : press the RESET button!!\n" "*******************************************\n" );Q40_LED_ON ();while (1 )
Signature · 1 line
1.6.6.1
PATCH 4/16 m68k: remove trailing space in messages
In reply to Frans Pop--- arch/m68k/kernel/traps.c | 2 +- arch/m68k/mac/config.c | 10 +++++----- arch/m68k/q40/config.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
arch/m68k/kernel/traps.c +1 -1
@@ -455,7 +455,7 @@ static inline void access_error040(struct frame *fp)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 */
arch/m68k/mac/config.c +5 -5
@@ -148,7 +148,7 @@ static void mac_cache_card_flush(int writeback)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; mach_init_IRQ = mac_init_IRQ;
@@ -867,7 +867,7 @@ static void __init mac_identify(void)*/ iop_preinit (); -printk (KERN_INFO "Detected Macintosh model: %d \n" , model); +printk (KERN_INFO "Detected Macintosh model: %d\n" , model);/* * Report booter data:
@@ -878,12 +878,12 @@ static void __init 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);iop_init ();
arch/m68k/q40/config.c +1 -1
@@ -126,7 +126,7 @@ static void q40_reset(void) { halted =1 ;printk ("\n\n*******************************************\n" -"Called q40_reset : press the RESET button!! \n" +"Called q40_reset : press the RESET button!!\n" "*******************************************\n" );Q40_LED_ON ();while (1 )
Signature · 1 line
1.6.6.1
Geert Uytterhoeven
maintainerRe: [PATCH 04/16] m68k: remove trailing space in messages
Quoted 3 lines · Frans Pop
Thx, applied.
Quoted 64 lines
---
arch/m68k/kernel/traps.c | 2 +-
arch/m68k/mac/config.c | 10 +++++-----
arch/m68k/q40/config.c | 2 +-3 files changed, 7 insertions(+), 7 deletions(-)arch/m68k/kernel/traps.c +1
-1@@ -455,7 +455,7 @@ static inline void access_error040(struct frame *fp) 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 */arch/m68k/mac/config.c +5
-5@@ -148,7 +148,7 @@ static void mac_cache_card_flush(int writeback) 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; mach_init_IRQ = mac_init_IRQ;@@ -867,7 +867,7 @@ static void __init mac_identify(void)*/ iop_preinit(); - printk(KERN_INFO "Detected Macintosh model: %d \n", model); + printk(KERN_INFO "Detected Macintosh model: %d\n", model); /** Report booter data: @@ -878,12 +878,12 @@ static void __init 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); iop_init();arch/m68k/q40/config.c +0
-0@@ -126,7 +126,7 @@ static void q40_reset(void) { halted = 1;
Quoted 6 lines
printk("\n\n*******************************************\n"
- "Calledq40_reset: press the RESET button!! \n"
+ "Calledq40_reset: press the RESET button!!\n" "*******************************************\n");Q40_LED_ON();
while (1)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
PATCH 5/16 microblaze: remove trailing space in messages
In reply to Frans Pop--- arch/microblaze/kernel/cpu/cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/microblaze/kernel/cpu/cache.c +1 -1
@@ -504,7 +504,7 @@ const struct scache wt_nomsr_noirq = {#define CPUVER_7_20_A 0x0c#define CPUVER_7_20_D 0x0f -#define INFO (s) printk(KERN_INFO "cache: " s " \n"); +#define INFO (s) printk(KERN_INFO "cache: " s "\n");void microblaze_cache_init (void ) {
Signature · 1 line
1.6.6.1
Re: [PATCH 05/16] microblaze: remove trailing space in messages
Quoted 20 lines · Frans Pop
--- arch/microblaze/kernel/cpu/cache.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/microblaze/kernel/cpu/cache.c +1
-1@@ -504,7 +504,7 @@ const struct scache wt_nomsr_noirq = {#define CPUVER_7_20_A 0x0c#define CPUVER_7_20_D 0x0f -#define INFO (s) printk(KERN_INFO "cache: " s " \n"); +#define INFO (s) printk(KERN_INFO "cache: " s "\n");void microblaze_cache_init (void ) {
Signature · 4 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian
PATCH 6/16 mips: remove trailing space in messages
In reply to Frans Pop--- arch/mips/alchemy/common/dbdma.c | 2 +- arch/mips/cavium-octeon/smp.c | 2 +- arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/mips/alchemy/common/dbdma.c +1 -1
@@ -903,7 +903,7 @@ void au1xxx_dbdma_dump(u32 chanid) dtp = ctp->chan_dest; cp = ctp->chan_ptr; -printk (KERN_DEBUG "Chan %x, stp %x (dev %d) dtp %x (dev %d) \n" , +printk (KERN_DEBUG "Chan %x, stp %x (dev %d) dtp %x (dev %d)\n" , (u32 )ctp, (u32 )stp, stp - dbdev_tab, (u32 )dtp, dtp - dbdev_tab); printk(KERN_DEBUG "desc base %x, get %x, put %x, cur %x\n",
arch/mips/cavium-octeon/smp.c +1 -1
@@ -327,7 +327,7 @@ static void octeon_cpu_die(unsigned int cpu) avail_coremask); } -pr_info ("Reset core %d. Available Coremask = %x \n" , coreid, +pr_info ("Reset core %d. Available Coremask = %x\n" , coreid, avail_coremask);cvmx_write_csr (CVMX_CIU_PP_RST ,1 << coreid);cvmx_write_csr (CVMX_CIU_PP_RST ,0 );
arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c +1 -1
@@ -127,7 +127,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 ; }
Signature · 1 line
1.6.6.1
PATCH 7/16 parisc: remove trailing space in messages
In reply to Frans Pop--- arch/parisc/kernel/cache.c | 4 ++-- drivers/parisc/eisa_enumerator.c | 2 +- drivers/parisc/superio.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/parisc/kernel/cache.c +2 -2
@@ -171,14 +171,14 @@ parisc_cache_init(void) cache_info.ic_conf.cc_cst, cache_info.ic_conf.cc_hv); -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,
drivers/parisc/eisa_enumerator.c +1 -1
@@ -460,7 +460,7 @@ static int init_slot(int slot, struct eeprom_eisa_slot_info *es) 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 ;
drivers/parisc/superio.c +1 -1
@@ -169,7 +169,7 @@ superio_init(struct pci_dev *pcidev)/* ...then properly fixup the USB to point at suckyio PIC */ sio->usb_pdev->irq =superio_fixup_irq (sio->usb_pdev); - printk(KERN_INFO PFX "Found NS87560 Legacy I/O device at %s (IRQ %i) \n", + printk(KERN_INFO PFX "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);
Signature · 1 line
1.6.6.1
Re: [PATCH 07/16] parisc: remove trailing space in messages
Quoted 4 lines · Frans Pop
Signed-off-by Frans Pop <[email protected]>Cc Kyle McMartin <[email protected]>Cc Helge Deller <[email protected]>
I'll apply this.
Thanks Frans.
regards, Kyle
PATCH 8/16 s390: remove trailing space in messages
In reply to Frans Pop--- arch/s390/math-emu/math.c | 2 +- drivers/s390/block/dasd_eckd.c | 2 +- drivers/s390/block/dasd_proc.c | 2 +- drivers/s390/block/dcssblk.c | 2 +- drivers/s390/block/xpram.c | 4 ++-- drivers/s390/char/vmlogrdr.c | 2 +- drivers/s390/cio/device_status.c | 2 +- drivers/s390/net/claw.c | 4 ++-- drivers/s390/net/ctcm_fsms.c | 4 ++-- drivers/s390/net/ctcm_main.c | 2 +- drivers/s390/net/ctcm_mpc.c | 16 ++++++++-------- drivers/s390/net/lcs.c | 2 +- drivers/s390/net/qeth_l2_main.c | 2 +- drivers/s390/net/qeth_l3_main.c | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-)
arch/s390/math-emu/math.c +1 -1
@@ -106,7 +106,7 @@ static void display_emulation_not_implemented(struct pt_regs *regs, char *instr) { 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,
drivers/s390/block/dasd_eckd.c +1 -1
@@ -3198,7 +3198,7 @@ static void dasd_eckd_dump_sense_tcw(struct dasd_device *device,break ;case 3 :/* tsa_intrg */ len += sprintf(page + len, KERN_ERR PRINTK_HEADER -" tsb->tsa.intrg.: not supportet yet \n" ); +" tsb->tsa.intrg.: not supportet yet\n" );break ; }
drivers/s390/block/dasd_proc.c +1 -1
@@ -246,7 +246,7 @@ dasd_statistics_read(char *page, char **start, off_t off, str =dasd_statistics_array (str, prof->dasd_io_time2ps, factor); str +=sprintf (str,"Histogram of I/O time between irq and end\n" ); str =dasd_statistics_array (str, prof->dasd_io_time3, factor); - 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, factor); len = str - page;#else
drivers/s390/block/dcssblk.c +1 -1
@@ -1089,7 +1089,7 @@ MODULE_PARM_DESC(segments, "Name of DCSS segment(s) to be loaded, ""names of contiguous segments and each name max. 8 chars.\n" "Adding \"(local)\" to the end of each set equals echoing 0 " "to /sys/devices/dcssblk/<device name>/shared after loading " -"the contiguous segments - \n" +"the contiguous segments -\n" "e.g. segments=\"mydcss1,mydcss2:mydcss3,mydcss4(local)\"");MODULE_LICENSE ("GPL" );
drivers/s390/block/xpram.c +2 -2
@@ -71,7 +71,7 @@ module_param_array(sizes, charp, 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" );
@@ -294,7 +294,7 @@ static int __init xpram_setup_sizes(unsigned long pages) mem_auto_no++; } -pr_info (" number of devices (partitions): %d \n" , xpram_devs); +pr_info (" number of devices (partitions): %d\n" , xpram_devs);for (i =0 ; i < xpram_devs; i++) {if (xpram_sizes[i]) pr_info(" size of partition %d: %u kB\n",
drivers/s390/char/vmlogrdr.c +1 -1
@@ -345,7 +345,7 @@ static int vmlogrdr_open (struct inode *inode, struct file *filp) logptr);if (connect_rc) {pr_err ("vmlogrdr: iucv connection to %s " -"failed with rc %i \n" , +"failed with rc %i\n" , logptr->system_service, connect_rc); goto out_path; }
drivers/s390/cio/device_status.c +1 -1
@@ -60,7 +60,7 @@ ccw_device_path_notoper(struct ccw_device *cdev) goto doverify;CIO_MSG_EVENT (0 ,"%s(0.%x.%04x) - path(s) %02x are " -"not operational \n" , __func__, +"not operational\n" , __func__, sch->schid.ssid, sch->schid.sch_no, sch->schib.pmcw.pnom);
drivers/s390/net/claw.c +2 -2
@@ -738,7 +738,7 @@ claw_irq_handler(struct ccw_device *cdev, privptr->stats.rx_errors++;dev_info (&cdev->dev,"%s: Restart is required after remote " -"side recovers \n" , +"side recovers\n" , dev->name); }CLAW_DBF_TEXT (4 , trace,"notrdy" );
@@ -3075,7 +3075,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev) ndev = priv->channel[READ ].ndev;if (ndev) {/* Close the device */ -dev_info (&cgdev->dev,"%s: shutting down \n" , +dev_info (&cgdev->dev,"%s: shutting down\n" , ndev->name);if (ndev->flags &IFF_RUNNING ) ret =claw_release (ndev);
drivers/s390/net/ctcm_fsms.c +2 -2
@@ -1292,7 +1292,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)else p_header->pdu_flag |=0x20 ; -CTCM_PR_DBGDATA ("%s: trans_skb len:%04x \n" , +CTCM_PR_DBGDATA ("%s: trans_skb len:%04x\n" , __func__, ch->trans_skb->len);CTCM_PR_DBGDATA ("%s: pdu header and data for up" " to 32 bytes sent to vtam\n" , __func__);
@@ -1330,7 +1330,7 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg)kfree (header); -CTCM_PR_DBGDATA ("%s: trans_skb len:%04x \n" , +CTCM_PR_DBGDATA ("%s: trans_skb len:%04x\n" , __func__, ch->trans_skb->len);CTCM_PR_DBGDATA ("%s: up-to-50 bytes of trans_skb " "data to vtam from collect_q\n" , __func__);
drivers/s390/net/ctcm_main.c +1 -1
@@ -697,7 +697,7 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb)memcpy (skb_push (skb,PDU_HEADER_LENGTH ), p_header,PDU_HEADER_LENGTH ); -CTCM_PR_DEBUG ("%s(%s): Put on collect_q - skb len: %04x \n" +CTCM_PR_DEBUG ("%s(%s): Put on collect_q - skb len: %04x\n" "pdu header and data for up to 32 bytes:\n" , __func__, dev->name, skb->len);CTCM_D3_DUMP ((char *)skb->data,min_t (int,32 , skb->len));
drivers/s390/net/ctcm_mpc.c +8 -8
@@ -253,7 +253,7 @@ void ctcmpc_dump_skb(struct sk_buff *skb, int offset) header = (struct th_header *)p;ctcm_pr_debug ("dump:\n" ); -ctcm_pr_debug ("skb len=%d \n" , skb->len); +ctcm_pr_debug ("skb len=%d\n" , skb->len);if (skb->len >2 ) {switch (header->th_ch_flag) {case TH_HAS_PDU :
@@ -1079,7 +1079,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)CTCM_PR_DBGDATA ("%s: th_header\n" , __func__);CTCM_D3_DUMP ((char *)header,TH_HEADER_LENGTH ); -CTCM_PR_DBGDATA ("%s: pskb len: %04x \n" , __func__, pskb->len); +CTCM_PR_DBGDATA ("%s: pskb len: %04x\n" , __func__, pskb->len); pskb->dev = dev; pskb->ip_summed =CHECKSUM_UNNECESSARY ;
@@ -1119,7 +1119,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)CTCM_PR_DBGDATA ("%s: pdu_header\n" , __func__);CTCM_D3_DUMP ((char *)pskb->data,PDU_HEADER_LENGTH ); -CTCM_PR_DBGDATA ("%s: pskb len: %04x \n" , +CTCM_PR_DBGDATA ("%s: pskb len: %04x\n" , __func__, pskb->len);skb_pull (pskb,PDU_HEADER_LENGTH );
@@ -1143,7 +1143,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb) }skb_reset_mac_header (pskb); new_len = curr_pdu->pdu_offset; -CTCM_PR_DBGDATA ("%s: new_len: %04x \n" , +CTCM_PR_DBGDATA ("%s: new_len: %04x\n" , __func__, new_len);if ((new_len ==0 ) || (new_len > pskb->len)) {/* should never happen */
@@ -1177,7 +1177,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)ctcm_pr_debug ("%s: ToDCM_pdu_seq= %08x\n" , __func__, ch->pdu_seq);ctcm_pr_debug ("%s: skb:%0lx " -"skb len: %d \n" , __func__, +"skb len: %d\n" , __func__, (unsigned long )skb, skb->len);ctcm_pr_debug ("%s: up to 32 bytes " "of pdu_data sent\n" , __func__);
@@ -1982,7 +1982,7 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg)struct ctcm_priv *priv = dev->ml_priv;struct mpc_group *grp = priv->mpcg; -CTCM_PR_DEBUG ("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i \n" , +CTCM_PR_DEBUG ("%s: ch-id:%s xid2:%i xid7:%i xidt_p2:%i\n" , __func__, ch->id, grp->outstanding_xid2, grp->outstanding_xid7, grp->outstanding_xid7_p2);
@@ -2021,10 +2021,10 @@ static void mpc_action_rcvd_xid0(fsm_instance *fsm, int event, void *arg) }kfree (mpcginfo); -CTCM_PR_DEBUG ("ctcmpc:%s() %s xid2:%i xid7:%i xidt_p2:%i \n" , +CTCM_PR_DEBUG ("ctcmpc:%s() %s xid2:%i xid7:%i xidt_p2:%i\n" , __func__, ch->id, grp->outstanding_xid2, grp->outstanding_xid7, grp->outstanding_xid7_p2); -CTCM_PR_DEBUG ("ctcmpc:%s() %s grpstate: %s chanstate: %s \n" , +CTCM_PR_DEBUG ("ctcmpc:%s() %s grpstate: %s chanstate: %s\n" , __func__, ch->id,fsm_getstate_str (grp->fsm),fsm_getstate_str (ch->fsm));return ;
drivers/s390/net/lcs.c +1 -1
@@ -1418,7 +1418,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)if (rc || (dstat &DEV_STAT_UNIT_EXCEP )) {dev_warn (&cdev->dev,"The LCS device stopped because of an error," -" dstat=0x%X, cstat=0x%X \n" , +" dstat=0x%X, cstat=0x%X\n" , dstat, cstat);if (rc) { channel->state =LCS_CH_STATE_ERROR ;
drivers/s390/net/qeth_l2_main.c +1 -1
@@ -132,7 +132,7 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card, mac = &cmd->data.setdelmac.mac[0 ];/* MAC already registered, needed in couple/uncouple case */ if (cmd->hdr.return_code ==IPA_RC_L2_DUP_MAC ) { -QETH_DBF_MESSAGE (2 ,"Group MAC %pM already existing on %s \n" , +QETH_DBF_MESSAGE (2 ,"Group MAC %pM already existing on %s\n" , mac,QETH_CARD_IFNAME (card)); cmd->hdr.return_code =0 ; }
drivers/s390/net/qeth_l3_main.c +1 -1
@@ -1221,7 +1221,7 @@ static int qeth_l3_start_ipa_ip_fragmentation(struct qeth_card *card) QETH_CARD_IFNAME(card)); }else dev_info (&card->gdev->dev, -"Hardware IP fragmentation enabled \n" ); +"Hardware IP fragmentation enabled\n" );return rc; }
Signature · 1 line
1.6.6.1
PATCH 9/16 sparc: remove trailing space in messages
In reply to Frans Pop--- arch/sparc/kernel/leon_kernel.c | 2 +- arch/sparc/kernel/leon_smp.c | 4 ++-- arch/sparc/kernel/sun4d_smp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/sparc/kernel/leon_kernel.c +1 -1
@@ -124,7 +124,7 @@ void __init leon_init_timers(irq_handler_t counter_fn)if (!(LEON3_BYPASS_LOAD_PA (&leon3_gptimer_regs->config) & (1 <<LEON3_GPTIMER_SEPIRQ ))) { -prom_printf ("irq timer not configured with seperate irqs \n" ); +prom_printf ("irq timer not configured with seperate irqs\n" );BUG (); }
arch/sparc/kernel/leon_smp.c +2 -2
@@ -177,7 +177,7 @@ void __init leon_boot_cpus(void)int nrcpu =leon_smp_nrcpus ();int me =smp_processor_id (); -printk (KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x \n" , (unsigned int )me, +printk (KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x\n" , (unsigned int )me, (unsigned int )nrcpu, (unsigned int )NR_CPUS , (unsigned int )&(leon3_irqctrl_regs->mpstatus));
@@ -226,7 +226,7 @@ int __cpuinit leon_boot_one_cpu(int i)break ;udelay (200 ); } -printk (KERN_INFO "Started CPU %d \n" , (unsigned int )i); +printk (KERN_INFO "Started CPU %d\n" , (unsigned int )i);if (!(cpu_callin_map[i])) {printk (KERN_ERR "Processor %d is stuck.\n" , i);
arch/sparc/kernel/sun4d_smp.c +1 -1
@@ -194,7 +194,7 @@ int __cpuinit smp4d_boot_one_cpu(int i) smp_penguin_ctable.reg_size =0 ;/* whirrr, whirrr, whirrrrrrrrr... */ -SMP_PRINTK (("Starting CPU %d at %p \n" , i, entry)); +SMP_PRINTK (("Starting CPU %d at %p\n" , i, entry));local_flush_cache_all ();prom_startcpu (cpu_node, &smp_penguin_ctable,0 , (char *)entry);
Signature · 1 line
1.6.6.1
Re: [PATCH 09/16 v2] sparc: remove trailing space in messages
Also fixes a typo in one message.
--- arch/sparc/kernel/leon_kernel.c | 2 +- arch/sparc/kernel/leon_smp.c | 4 ++-- arch/sparc/kernel/sun4d_smp.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
Change relative to v1:
- spelling correction in first chunk (with thanks to Josip Rodin)
P.S. I like the "whirrr, whirrr, whirrrrrrrrr..." :-)
arch/sparc/kernel/leon_kernel.c +1 -1
@@ -124,7 +124,7 @@ void __init leon_init_timers(irq_handler_t counter_fn)if (!(LEON3_BYPASS_LOAD_PA (&leon3_gptimer_regs->config) & (1 <<LEON3_GPTIMER_SEPIRQ ))) { -prom_printf ("irq timer not configured with seperate irqs \n" ); +prom_printf ("irq timer not configured with separate irqs\n" );BUG (); }
arch/sparc/kernel/leon_smp.c +2 -2
@@ -177,7 +177,7 @@ void __init leon_boot_cpus(void)int nrcpu =leon_smp_nrcpus ();int me =smp_processor_id (); -printk (KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x \n" , (unsigned int )me, +printk (KERN_INFO "%d:(%d:%d) cpus mpirq at 0x%x\n" , (unsigned int )me, (unsigned int )nrcpu, (unsigned int )NR_CPUS , (unsigned int )&(leon3_irqctrl_regs->mpstatus));
@@ -226,7 +226,7 @@ int __cpuinit leon_boot_one_cpu(int i)break ;udelay (200 ); } -printk (KERN_INFO "Started CPU %d \n" , (unsigned int )i); +printk (KERN_INFO "Started CPU %d\n" , (unsigned int )i);if (!(cpu_callin_map[i])) {printk (KERN_ERR "Processor %d is stuck.\n" , i);
arch/sparc/kernel/sun4d_smp.c +1 -1
@@ -194,7 +194,7 @@ int __cpuinit smp4d_boot_one_cpu(int i) smp_penguin_ctable.reg_size =0 ;/* whirrr, whirrr, whirrrrrrrrr... */ -SMP_PRINTK (("Starting CPU %d at %p \n" , i, entry)); +SMP_PRINTK (("Starting CPU %d at %p\n" , i, entry));local_flush_cache_all ();prom_startcpu (cpu_node, &smp_penguin_ctable,0 , (char *)entry);
Signature · 1 line
1.6.6.1
Re: [PATCH 09/16 v2] sparc: remove trailing space in messages
From: Frans Pop <[email protected]>
Date: Sat, 6 Feb 2010 19:16:43 +0100
Quoted 3 lines
Also fixes a typo in one message.
Signed-off-by Frans Pop <[email protected]>
Applied to sparc-next-2.6, thanks!
Quoted 1 line
P.S. I like the "whirrr, whirrr, whirrrrrrrrr..." :-)
That's the sound my brain makes when I'm working on low-level sparc code.
PATCH 10/16 x86: remove trailing space in messages
In reply to Frans PopIn arch/x86/kvm/vmx.c also:
- join two related error messages into a single line
- remove an unnecessary period
---
Please review the following with extra attention:
- arch/x86/boot/mkcpustr.c
- arch/x86/tools/test_get_len.c
--- arch/x86/boot/mkcpustr.c | 2 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/numaq_32.c | 2 +- arch/x86/kernel/apm_32.c | 4 ++-- arch/x86/kernel/efi.c | 2 +- arch/x86/kernel/microcode_intel.c | 2 +- arch/x86/kernel/uv_sysfs.c | 6 +++--- arch/x86/kvm/vmx.c | 5 ++--- arch/x86/tools/test_get_len.c | 4 ++-- 10 files changed, 15 insertions(+), 16 deletions(-)
arch/x86/boot/mkcpustr.c +1 -1
@@ -22,7 +22,7 @@ int main(void)int i, j;const char *str; -printf ("static const char x86_cap_strs[] = \n" ); +printf ("static const char x86_cap_strs[] =\n" );for (i =0 ; i <NCAPINTS ; i++) {for (j =0 ; j <32 ; j++) {
arch/x86/kernel/apic/apic.c +1 -1
@@ -581,7 +581,7 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc) res = (((u64)(*deltatsc)) * pm_100ms);do_div (res, deltapm);apic_printk (APIC_VERBOSE ,"TSC delta adjusted to " -"PM-Timer: %lu (%ld) \n" , +"PM-Timer: %lu (%ld)\n" , (unsigned long )res, *deltatsc); *deltatsc = (long )res; }
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -1647,7 +1647,7 @@ __apicdebuginit(void) print_IO_APIC(void)printk (KERN_DEBUG ".... IRQ redirection table:\n" );printk (KERN_DEBUG " NR Dst Mask Trig IRR Pol" -" Stat Dmod Deli Vect: \n" ); +" Stat Dmod Deli Vect:\n" );for (i =0 ; i <= reg_01.bits.entries; i++) {struct IO_APIC_route_entry entry;
arch/x86/kernel/apic/numaq_32.c +1 -1
@@ -225,7 +225,7 @@ static void __init smp_read_mpc_oem(struct mpc_table *mpc) mpc_record =0 ;printk (KERN_INFO -"Found an OEM MPC table at %8p - parsing it ... \n" , oemtable); +"Found an OEM MPC table at %8p - parsing it...\n" , oemtable);if (memcmp (oemtable->signature,MPC_OEM_SIGNATURE ,4 )) { printk(KERN_WARNING
arch/x86/kernel/apm_32.c +2 -2
@@ -1992,8 +1992,8 @@ static int __init apm_is_horked_d850md(const struct dmi_system_id *d) 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 ; }
arch/x86/kernel/efi.c +1 -1
@@ -362,7 +362,7 @@ void __init efi_init(void) printk(KERN_ERR PFX "Could not map the firmware vendor!\n");early_iounmap (tmp,2 ); -printk (KERN_INFO "EFI v%u.%.02u by %s \n" , +printk (KERN_INFO "EFI v%u.%.02u by %s\n" , efi.systab->hdr.revision >>16 , efi.systab->hdr.revision &0xffff , vendor);
arch/x86/kernel/microcode_intel.c +1 -1
@@ -328,7 +328,7 @@ static int apply_microcode(int cpu) cpu_num, mc_intel->hdr.rev);return -1 ; } - pr_info("CPU%d updated to revision 0x%x, date = %04x-%02x-%02x \n", + pr_info("CPU%d updated to revision 0x%x, date = %04x-%02x-%02x\n", cpu_num, val[1], mc_intel->hdr.date & 0xffff, mc_intel->hdr.date >> 24,
arch/x86/kernel/uv_sysfs.c +3 -3
@@ -54,19 +54,19 @@ static int __init sgi_uv_sysfs_init(void)if (!sgi_uv_kobj) sgi_uv_kobj =kobject_create_and_add ("sgi_uv" , firmware_kobj);if (!sgi_uv_kobj) { -printk (KERN_WARNING "kobject_create_and_add sgi_uv failed \n" ); +printk (KERN_WARNING "kobject_create_and_add sgi_uv failed\n" );return -EINVAL ; } ret =sysfs_create_file (sgi_uv_kobj, &partition_id_attr.attr);if (ret) { -printk (KERN_WARNING "sysfs_create_file partition_id failed \n" ); +printk (KERN_WARNING "sysfs_create_file partition_id failed\n" );return ret; } ret =sysfs_create_file (sgi_uv_kobj, &coherence_id_attr.attr);if (ret) { -printk (KERN_WARNING "sysfs_create_file coherence_id failed \n" ); +printk (KERN_WARNING "sysfs_create_file coherence_id failed\n" );return ret; }
arch/x86/kvm/vmx.c +2 -3
@@ -1570,7 +1570,7 @@ static void enter_lmode(struct kvm_vcpu *vcpu) guest_tr_ar =vmcs_read32 (GUEST_TR_AR_BYTES );if ((guest_tr_ar &AR_TYPE_MASK ) !=AR_TYPE_BUSY_64_TSS ) { -printk (KERN_DEBUG "%s: tss fixup for long mode. \n" , +printk (KERN_DEBUG "%s: tss fixup for long mode\n" , __func__);vmcs_write32 (GUEST_TR_AR_BYTES , (guest_tr_ar & ~AR_TYPE_MASK)
@@ -3343,8 +3343,7 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) gpa =vmcs_read64 (GUEST_PHYSICAL_ADDRESS ); -printk (KERN_ERR "EPT: Misconfiguration.\n" ); -printk (KERN_ERR "EPT: GPA: 0x%llx\n" , gpa); +printk (KERN_ERR "EPT: Misconfiguration; GPA: 0x%llx\n" , gpa); nr_sptes =kvm_mmu_get_spte_hierarchy (vcpu, gpa, sptes);
arch/x86/tools/test_get_len.c +2 -2
@@ -43,7 +43,7 @@ static int x86_64;static void usage (void ) {fprintf (stderr,"Usage: objdump -d a.out | awk -f distill.awk |" -" %s [-y|-n] [-v] \n" , prog); +" %s [-y|-n] [-v]\n" , prog);fprintf (stderr,"\t-y 64bit mode\n" );fprintf (stderr,"\t-n 32bit mode\n" );fprintf (stderr,"\t-v verbose mode\n" );
@@ -69,7 +69,7 @@ static void dump_field(FILE *fp, const char *name, const char *indent,static void dump_insn (FILE *fp,struct insn *insn) { -fprintf (fp,"Instruction = { \n" ); +fprintf (fp,"Instruction = {\n" );dump_field (fp,"prefixes" ,"\t" , &insn->prefixes);dump_field (fp,"rex_prefix" ,"\t" , &insn->rex_prefix);dump_field (fp,"vex_prefix" ,"\t" , &insn->vex_prefix);
Signature · 1 line
1.6.6.1
[tip:x86/cleanups] x86: Remove trailing spaces in messages
Commit-ID: 3235dc3f22378f35ce77eba0d0f62db2d9c4844e Gitweb: http://git.kernel.org/tip/3235dc3f22378f35ce77eba0d0f62db2d9c4844e Author: Frans Pop <[email protected]> AuthorDate: Sat, 6 Feb 2010 18:47:17 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 7 Feb 2010 17:47:51 +0100
x86: Remove trailing spaces in messages
LKML-Reference: <[email protected]>
--- arch/x86/boot/mkcpustr.c | 2 +- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/apic/numaq_32.c | 2 +- arch/x86/kernel/apm_32.c | 4 ++-- arch/x86/kernel/efi.c | 2 +- arch/x86/kernel/microcode_intel.c | 2 +- arch/x86/kernel/uv_sysfs.c | 6 +++--- arch/x86/tools/test_get_len.c | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-)
arch/x86/boot/mkcpustr.c +1 -1
@@ -22,7 +22,7 @@ int main(void)int i, j;const char *str; -printf ("static const char x86_cap_strs[] = \n" ); +printf ("static const char x86_cap_strs[] =\n" );for (i =0 ; i <NCAPINTS ; i++) {for (j =0 ; j <32 ; j++) {
arch/x86/kernel/apic/apic.c +1 -1
@@ -587,7 +587,7 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc) res = (((u64)(*deltatsc)) * pm_100ms);do_div (res, deltapm);apic_printk (APIC_VERBOSE ,"TSC delta adjusted to " -"PM-Timer: %lu (%ld) \n" , +"PM-Timer: %lu (%ld)\n" , (unsigned long )res, *deltatsc); *deltatsc = (long )res; }
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -1647,7 +1647,7 @@ __apicdebuginit(void) print_IO_APIC(void)printk (KERN_DEBUG ".... IRQ redirection table:\n" );printk (KERN_DEBUG " NR Dst Mask Trig IRR Pol" -" Stat Dmod Deli Vect: \n" ); +" Stat Dmod Deli Vect:\n" );for (i =0 ; i <= reg_01.bits.entries; i++) {struct IO_APIC_route_entry entry;
arch/x86/kernel/apic/numaq_32.c +1 -1
@@ -225,7 +225,7 @@ static void __init smp_read_mpc_oem(struct mpc_table *mpc) mpc_record =0 ;printk (KERN_INFO -"Found an OEM MPC table at %8p - parsing it ... \n" , oemtable); +"Found an OEM MPC table at %8p - parsing it...\n" , oemtable);if (memcmp (oemtable->signature,MPC_OEM_SIGNATURE ,4 )) { printk(KERN_WARNING
arch/x86/kernel/apm_32.c +2 -2
@@ -1992,8 +1992,8 @@ static int __init apm_is_horked_d850md(const struct dmi_system_id *d) 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 ; }
arch/x86/kernel/efi.c +1 -1
@@ -362,7 +362,7 @@ void __init efi_init(void) printk(KERN_ERR PFX "Could not map the firmware vendor!\n");early_iounmap (tmp,2 ); -printk (KERN_INFO "EFI v%u.%.02u by %s \n" , +printk (KERN_INFO "EFI v%u.%.02u by %s\n" , efi.systab->hdr.revision >>16 , efi.systab->hdr.revision &0xffff , vendor);
arch/x86/kernel/microcode_intel.c +1 -1
@@ -328,7 +328,7 @@ static int apply_microcode(int cpu) cpu_num, mc_intel->hdr.rev);return -1 ; } - pr_info("CPU%d updated to revision 0x%x, date = %04x-%02x-%02x \n", + pr_info("CPU%d updated to revision 0x%x, date = %04x-%02x-%02x\n", cpu_num, val[1], mc_intel->hdr.date & 0xffff, mc_intel->hdr.date >> 24,
arch/x86/kernel/uv_sysfs.c +3 -3
@@ -54,19 +54,19 @@ static int __init sgi_uv_sysfs_init(void)if (!sgi_uv_kobj) sgi_uv_kobj =kobject_create_and_add ("sgi_uv" , firmware_kobj);if (!sgi_uv_kobj) { -printk (KERN_WARNING "kobject_create_and_add sgi_uv failed \n" ); +printk (KERN_WARNING "kobject_create_and_add sgi_uv failed\n" );return -EINVAL ; } ret =sysfs_create_file (sgi_uv_kobj, &partition_id_attr.attr);if (ret) { -printk (KERN_WARNING "sysfs_create_file partition_id failed \n" ); +printk (KERN_WARNING "sysfs_create_file partition_id failed\n" );return ret; } ret =sysfs_create_file (sgi_uv_kobj, &coherence_id_attr.attr);if (ret) { -printk (KERN_WARNING "sysfs_create_file coherence_id failed \n" ); +printk (KERN_WARNING "sysfs_create_file coherence_id failed\n" );return ret; }
arch/x86/tools/test_get_len.c +2 -2
@@ -43,7 +43,7 @@ static int x86_64;static void usage (void ) {fprintf (stderr,"Usage: objdump -d a.out | awk -f distill.awk |" -" %s [-y|-n] [-v] \n" , prog); +" %s [-y|-n] [-v]\n" , prog);fprintf (stderr,"\t-y 64bit mode\n" );fprintf (stderr,"\t-n 32bit mode\n" );fprintf (stderr,"\t-v verbose mode\n" );
@@ -69,7 +69,7 @@ static void dump_field(FILE *fp, const char *name, const char *indent,static void dump_insn (FILE *fp,struct insn *insn) { -fprintf (fp,"Instruction = { \n" ); +fprintf (fp,"Instruction = {\n" );dump_field (fp,"prefixes" ,"\t" , &insn->prefixes);dump_field (fp,"rex_prefix" ,"\t" , &insn->rex_prefix);dump_field (fp,"vex_prefix" ,"\t" , &insn->vex_prefix);
PATCH 11/16 blackfin: remove trailing space in messages
In reply to Frans Pop--- arch/blackfin/kernel/bfin_dma_5xx.c | 10 +++++----- arch/blackfin/kernel/traps.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
arch/blackfin/kernel/bfin_dma_5xx.c +5 -5
@@ -91,7 +91,7 @@ late_initcall(proc_dma_init);*/ int request_dma (unsigned int channel,const char *device_id) { -pr_debug ("request_dma() : BEGIN \n" ); +pr_debug ("request_dma() : BEGIN\n" );if (device_id ==NULL )printk (KERN_WARNING "request_dma(%u): no device_id given\n" , channel);
@@ -107,7 +107,7 @@ int request_dma(unsigned int channel, const char *device_id)#endif if (atomic_cmpxchg (&dma_ch[channel].chan_status,0 ,1 )) { -pr_debug ("DMA CHANNEL IN USE \n" ); +pr_debug ("DMA CHANNEL IN USE\n" );return -EBUSY ; }
@@ -131,7 +131,7 @@ int request_dma(unsigned int channel, const char *device_id)* you have to request DMA, before doing any operations on * descriptor/channel */ -pr_debug ("request_dma() : END \n" ); +pr_debug ("request_dma() : END\n" );return 0 ; }EXPORT_SYMBOL (request_dma);
@@ -171,7 +171,7 @@ static void clear_dma_buffer(unsigned int channel)void free_dma (unsigned int channel) { -pr_debug ("freedma() : BEGIN \n" ); +pr_debug ("freedma() : BEGIN\n" );BUG_ON (channel >=MAX_DMA_CHANNELS || !atomic_read (&dma_ch[channel].chan_status));
@@ -185,7 +185,7 @@ void free_dma(unsigned int channel)/* Clear the DMA Variable in the Channel */ atomic_set (&dma_ch[channel].chan_status,0 ); -pr_debug ("freedma() : END \n" ); +pr_debug ("freedma() : END\n" ); }EXPORT_SYMBOL (free_dma);
arch/blackfin/kernel/traps.c +1 -1
@@ -1096,7 +1096,7 @@ void dump_bfin_mem(struct pt_regs *fp)/* And the last RETI points to the current userspace context */ if ((fp +1 )->pc >= current->mm->start_code && (fp +1 )->pc <= current->mm->end_code) { -verbose_printk (KERN_NOTICE "It might be better to look around here : \n" ); +verbose_printk (KERN_NOTICE "It might be better to look around here :\n" );verbose_printk (KERN_NOTICE "-------------------------------------------\n" );show_regs (fp +1 );verbose_printk (KERN_NOTICE "-------------------------------------------\n" );
Signature · 1 line
1.6.6.1
Re: [PATCH 11/16] blackfin: remove trailing space in messages
thanks, ive merged this now
-mike
PATCH 12/16 cris/trivial: remove trailing space in message
In reply to Frans PopIn this case replaced with an extra period as an elipsis is usually three periods.
--- arch/cris/arch-v32/drivers/sync_serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/cris/arch-v32/drivers/sync_serial.c +1 -1
@@ -448,7 +448,7 @@ static int sync_serial_open(struct inode *inode, struct file *file)/* Allow open this device twice (assuming one reader and one writer) */ if (port->busy ==2 ) { -DEBUG (printk (KERN_DEBUG "Device is busy.. \n" )); +DEBUG (printk (KERN_DEBUG "Device is busy...\n" )); goto out; }
Signature · 1 line
1.6.6.1
Re: [PATCH 12/16] cris/trivial: remove trailing space in message
Quoted 2 lines · Frans Pop
In this case replaced with an extra period as an elipsis is usually three periods.
Absolutely.
/^JN - Jesper Nilsson
Signature · 1 line
Jesper Nilsson -- [email protected]
PATCH 13/16 powerpc: remove trailing space in messages
In reply to Frans Pop---
Please review the following with extra attention:
- arch/powerpc/kernel/lparcfg.c: last blob
- arch/powerpc/platforms/85xx/stx_gp3.c
- arch/powerpc/platforms/iseries/proc.c
For now I have skipped trailing spaces in printf and LOG_BLOB statements in:
- arch/powerpc/boot/addRamDisk.c
- arch/powerpc/boot/ps3.c
- arch/powerpc/platforms/powermac/pfunc_core.c
- arch/powerpc/xmon/xmon.c
--- arch/powerpc/kernel/lparcfg.c | 10 +++++----- arch/powerpc/kernel/pci_of_scan.c | 2 +- arch/powerpc/platforms/85xx/stx_gp3.c | 2 +- arch/powerpc/platforms/iseries/proc.c | 2 +- arch/powerpc/platforms/iseries/setup.c | 2 +- arch/powerpc/platforms/powermac/bootx_init.c | 4 ++-- arch/powerpc/platforms/pseries/eeh_driver.c | 6 +++--- arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- arch/powerpc/platforms/pseries/phyp_dump.c | 6 +++--- arch/powerpc/platforms/pseries/xics.c | 2 +- arch/powerpc/sysdev/mpic.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +- arch/powerpc/sysdev/qe_lib/qe_io.c | 8 ++++---- drivers/macintosh/therm_adt746x.c | 2 +- drivers/ps3/ps3av.c | 2 +- 15 files changed, 27 insertions(+), 27 deletions(-)
arch/powerpc/kernel/lparcfg.c +5 -5
@@ -359,7 +359,7 @@ static void parse_system_parameter_string(struct seq_file *m)unsigned 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__, __func__, __LINE__);return ; }
@@ -383,13 +383,13 @@ static void parse_system_parameter_string(struct seq_file *m)int idx, w_idx;char *workbuffer =kzalloc (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__, __func__, __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 ] *256 + local_buffer[1 ]; local_buffer +=2 ;/* step over strlen value */
@@ -440,7 +440,7 @@ static int lparcfg_count_active_processors(void)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++; }
@@ -725,7 +725,7 @@ static int lparcfg_data(struct seq_file *m, void *v)const unsigned int *lp_index_ptr;unsigned int lp_index =0 ; -seq_printf (m,"%s %s \n" ,MODULE_NAME ,MODULE_VERS ); +seq_printf (m,"%s %s\n" ,MODULE_NAME ,MODULE_VERS ); rootdn =of_find_node_by_path ("/" );if (rootdn) {
arch/powerpc/kernel/pci_of_scan.c +1 -1
@@ -304,7 +304,7 @@ static void __devinit __of_scan_bus(struct device_node *node,int reglen, devfn;struct pci_dev *dev; -pr_debug ("of_scan_bus(%s) bus no %d... \n" , +pr_debug ("of_scan_bus(%s) bus no %d...\n" , node->full_name, bus->number);/* Scan direct children */
arch/powerpc/platforms/85xx/stx_gp3.c +1 -1
@@ -134,7 +134,7 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m) pvid =mfspr (SPRN_PVR ); svid =mfspr (SPRN_SVR ); -seq_printf (m,"Vendor\t\t: RPC Electronics STx \n" ); +seq_printf (m,"Vendor\t\t: RPC Electronics STx\n" );seq_printf (m,"PVR\t\t: 0x%x\n" , pvid);seq_printf (m,"SVR\t\t: 0x%x\n" , svid);
arch/powerpc/platforms/iseries/proc.c +1 -1
@@ -85,7 +85,7 @@ static int proc_titantod_show(struct seq_file *m, void *v)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);
arch/powerpc/platforms/iseries/setup.c +1 -1
@@ -256,7 +256,7 @@ static unsigned long iSeries_process_mainstore_vpd(struct MemoryBlock *mb_array, 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",
arch/powerpc/platforms/powermac/bootx_init.c +2 -2
@@ -539,7 +539,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4)if (model && (strcmp (model,"iMac,1" ) ==0 ||strcmp (model,"PowerMac1,1" ) ==0 )) { -bootx_printf ("iMac,1 detected, shutting down USB \n" ); +bootx_printf ("iMac,1 detected, shutting down USB\n" );out_le32 ((unsigned __iomem *)0x80880008 ,1 );/* XXX */ } }
@@ -554,7 +554,7 @@ void __init bootx_init(unsigned long r3, unsigned long r4) }else space = bi->totalParamsSize; -bootx_printf ("Total space used by parameters & ramdisk: 0x%x \n" , space); +bootx_printf ("Total space used by parameters & ramdisk: 0x%x\n" , space);/* New BootX will have flushed all TLBs and enters kernel with * MMU switched OFF, so this should not be useful anymore.
arch/powerpc/platforms/pseries/eeh_driver.c +3 -3
@@ -478,9 +478,9 @@ excess_failures:* due to actual, failed cards. */ printk (KERN_ERR -"EEH: PCI device at location=%s driver=%s pci addr=%s \n" +"EEH: PCI device at location=%s driver=%s pci addr=%s\n" "has failed %d times in the last hour " -"and has been permanently disabled. \n" +"and has been permanently disabled.\n" "Please try reseating this device or replacing it.\n" , location, drv_str, pci_str, frozen_pdn->eeh_freeze_count); goto perm_error;
@@ -488,7 +488,7 @@ excess_failures: hard_fail:printk (KERN_ERR "EEH: Unable to recover from failure of PCI device " -"at location=%s driver=%s pci addr=%s \n" +"at location=%s driver=%s pci addr=%s\n" "Please try reseating this device or replacing it.\n" , location, drv_str, pci_str);
arch/powerpc/platforms/pseries/pci_dlpar.c +1 -1
@@ -165,7 +165,7 @@ int remove_phb_dynamic(struct pci_controller *phb)struct resource *res;int rc, i; -pr_debug ("PCI: Removing PHB %04x:%02x... \n" , +pr_debug ("PCI: Removing PHB %04x:%02x...\n" ,pci_domain_nr (b), b->number);/* We cannot to remove a root bus that has children */
arch/powerpc/platforms/pseries/phyp_dump.c +3 -3
@@ -150,7 +150,7 @@ static void print_dump_header(const struct phyp_dump_header *ph)printk (KERN_INFO "Max auto time= %d\n" , ph->maxtime_to_auto);/*set cpu state and hpte states as well scratch pad area */ -printk (KERN_INFO " CPU AREA \n" ); +printk (KERN_INFO " CPU AREA\n" );printk (KERN_INFO "cpu dump_flags =%d\n" , ph->cpu_data.dump_flags);printk (KERN_INFO "cpu source_type =%d\n" , ph->cpu_data.source_type);printk (KERN_INFO "cpu error_flags =%d\n" , ph->cpu_data.error_flags);
@@ -161,7 +161,7 @@ static void print_dump_header(const struct phyp_dump_header *ph)printk (KERN_INFO "cpu length_copied =%llx\n" , ph->cpu_data.length_copied); -printk (KERN_INFO " HPTE AREA \n" ); +printk (KERN_INFO " HPTE AREA\n" );printk (KERN_INFO "HPTE dump_flags =%d\n" , ph->hpte_data.dump_flags);printk (KERN_INFO "HPTE source_type =%d\n" , ph->hpte_data.source_type);printk (KERN_INFO "HPTE error_flags =%d\n" , ph->hpte_data.error_flags);
@@ -172,7 +172,7 @@ static void print_dump_header(const struct phyp_dump_header *ph)printk (KERN_INFO "HPTE length_copied =%llx\n" , ph->hpte_data.length_copied); -printk (KERN_INFO " SRSD AREA \n" ); +printk (KERN_INFO " SRSD AREA\n" );printk (KERN_INFO "SRSD dump_flags =%d\n" , ph->kernel_data.dump_flags);printk (KERN_INFO "SRSD source_type =%d\n" , ph->kernel_data.source_type);printk (KERN_INFO "SRSD error_flags =%d\n" , ph->kernel_data.error_flags);
arch/powerpc/platforms/pseries/xics.c +1 -1
@@ -127,7 +127,7 @@ static inline unsigned int lpar_xirr_info_get(void) 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 (unsigned int )return_value; }
arch/powerpc/sysdev/mpic.c +1 -1
@@ -1575,7 +1575,7 @@ void mpic_request_ipis(void)int i;BUG_ON (mpic ==NULL ); -printk (KERN_INFO "mpic: requesting IPIs ... \n" ); +printk (KERN_INFO "mpic: requesting IPIs...\n" );for (i =0 ; i <4 ; i++) { unsigned int vipi = irq_create_mapping(mpic->irqhost,
arch/powerpc/sysdev/qe_lib/qe_ic.c +1 -1
@@ -256,7 +256,7 @@ static int qe_ic_host_map(struct irq_host *h, unsigned int virq,struct irq_chip *chip;if (qe_ic_info[hw].mask ==0 ) { -printk (KERN_ERR "Can't map reserved IRQ \n" ); +printk (KERN_ERR "Can't map reserved IRQ\n" );return -EINVAL ; }/* Default chip */
arch/powerpc/sysdev/qe_lib/qe_io.c +4 -4
@@ -157,13 +157,13 @@ int par_io_of_config(struct device_node *np)const unsigned int *pio_map;if (par_io ==NULL ) { -printk (KERN_ERR "par_io not initialized \n" ); +printk (KERN_ERR "par_io not initialized\n" );return -1 ; } ph =of_get_property (np,"pio-handle" ,NULL );if (ph ==NULL ) { -printk (KERN_ERR "pio-handle not available \n" ); +printk (KERN_ERR "pio-handle not available\n" );return -1 ; }
@@ -171,12 +171,12 @@ int par_io_of_config(struct device_node *np) pio_map =of_get_property (pio,"pio-map" , &pio_map_len);if (pio_map ==NULL ) { -printk (KERN_ERR "pio-map is not set! \n" ); +printk (KERN_ERR "pio-map is not set!\n" );return -1 ; } pio_map_len /=sizeof (unsigned int );if ((pio_map_len %6 ) !=0 ) { -printk (KERN_ERR "pio-map format wrong! \n" ); +printk (KERN_ERR "pio-map format wrong!\n" );return -1 ; }
drivers/macintosh/therm_adt746x.c +1 -1
@@ -312,7 +312,7 @@ static void update_fans_speed (struct thermostat *th)if (verbose)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);
drivers/ps3/ps3av.c +1 -1
@@ -532,7 +532,7 @@ static void ps3av_set_videomode_packet(u32 id) res =ps3av_cmd_avb_param (&avb_param, len);if (res ==PS3AV_STATUS_NO_SYNC_HEAD )printk (KERN_WARNING -"%s: Command failed. Please try your request again. \n" , +"%s: Command failed. Please try your request again.\n" , __func__);else if (res)dev_dbg (&ps3av->dev->core,"ps3av_cmd_avb_param failed\n" );
Signature · 1 line
1.6.6.1
PATCH 14/16 um: remove trailing space in messages
In reply to Frans Pop---
Note that the URL in the patch for arch/um/os-Linux/start_up.c is dead.
--- arch/um/drivers/mconsole_kern.c | 26 +++++++++++++------------- arch/um/drivers/ubd_kern.c | 4 ++-- arch/um/kernel/sysrq.c | 2 +- arch/um/kernel/um_arch.c | 4 ++-- arch/um/os-Linux/aio.c | 6 +++--- arch/um/os-Linux/skas/mem.c | 2 +- arch/um/os-Linux/start_up.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-)
arch/um/drivers/mconsole_kern.c +13 -13
@@ -246,19 +246,19 @@ void mconsole_proc(struct mc_request *req) }#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 Ctrl-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 Ctrl-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\
arch/um/drivers/ubd_kern.c +2 -2
@@ -418,10 +418,10 @@ __uml_help(ubd_setup," a COW file or a backing file. To override this detection, add the 'd'\n" " flag:\n" " ubd0d=BackingFile\n" -" Usually, there is a filesystem in the file, but \n" +" Usually, there is a filesystem in the file, but\n" " that's not required. Swap devices containing swap files can be\n" " specified like this. Also, a file which doesn't contain a\n" -" filesystem can have its contents read in the virtual \n" +" filesystem can have its contents read in the virtual\n" " machine by running 'dd' on the device. <n> must be in the range\n" " 0 to 7. Appending an 'r' to the number will cause that device\n" " to be mounted read-only. For example ubd1r=./ext_fs. Appending\n"
arch/um/kernel/sysrq.c +1 -1
@@ -20,7 +20,7 @@ void show_trace(struct task_struct *task, unsigned long * stack)WARN_ON (1 ); } -printk (KERN_INFO "Call Trace: \n" ); +printk (KERN_INFO "Call Trace:\n" );while (((long ) stack & (THREAD_SIZE -1 )) !=0 ) { addr = *stack;if (__kernel_text_address (addr)) {
arch/um/kernel/um_arch.c +2 -2
@@ -142,14 +142,14 @@ __uml_setup("root=", uml_root_setup,"root=<file containing the root fs>\n" " This is actually used by the generic kernel in exactly the same\n" " way as in any other kernel. If you configure a number of block\n" -" devices and want to boot off something other than ubd0, you \n" +" devices and want to boot off something other than ubd0, you\n" " would use something like:\n" " root=/dev/ubd5\n\n" );static int __init no_skas_debug_setup (char *line,int *add) { -printf ("'debug' is not necessary to gdb UML in skas mode - run \n" ); +printf ("'debug' is not necessary to gdb UML in skas mode - run\n" );printf ("'gdb linux'\n" );return 0 ;
arch/um/os-Linux/aio.c +3 -3
@@ -314,12 +314,12 @@ __uml_setup("aio=2.4", set_aio_24,"aio=2.4\n" " This is used to force UML to use 2.4-style AIO even when 2.6 AIO is\n" " available. 2.4 AIO is a single thread that handles one request at a\n" -" time, synchronously. 2.6 AIO is a thread which uses the 2.6 AIO \n" -" interface to handle an arbitrary number of pending requests. 2.6 AIO \n" +" time, synchronously. 2.6 AIO is a thread which uses the 2.6 AIO\n" +" interface to handle an arbitrary number of pending requests. 2.6 AIO\n" " is not available in tt mode, on 2.4 hosts, or when UML is built with\n" " /usr/include/linux/aio_abi.h not available. Many distributions don't\n" " include aio_abi.h, so you will need to copy it from a kernel tree to\n" -" your /usr/include/linux in order to build an AIO-capable UML\n\n" +" your /usr/include/linux in order to build an AIO-capable UML.\n\n" );static int init_aio (void )
arch/um/os-Linux/skas/mem.c +1 -1
@@ -70,7 +70,7 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr) n =ptrace_setregs (pid, syscall_regs);if (n <0 ) { -printk (UM_KERN_ERR "Registers - \n" ); +printk (UM_KERN_ERR "Registers -\n" );for (i =0 ; i <MAX_REG_NR ; i++)printk (UM_KERN_ERR "\t%d\t0x%lx\n" , i, syscall_regs[i]); panic("do_syscall_stub : PTRACE_SETREGS failed, errno = %d\n",
arch/um/os-Linux/start_up.c +1 -1
@@ -195,7 +195,7 @@ __uml_setup("nosysemu", nosysemu_cmd_param," SYSEMU is a performance-patch introduced by Laurent Vivier. It changes\n" " behaviour of ptrace() and helps reducing host context switch rate.\n" " To make it working, you need a kernel patch for your host, too.\n" -" See http://perso.wanadoo.fr/laurent.vivier/UML/ for further \n" +" See http://perso.wanadoo.fr/laurent.vivier/UML/ for further\n" " information.\n\n");static void __init check_sysemu (void )
Signature · 13 lines
1.6.6.1 ------------------------------------------------------------------------------ The Planet: dedicated and managed hosting, cloud storage, colocation Stay online with enterprise data centers and the best network in the business Choose flexible plans and management services without long-term contracts Personal 24x7 support from experience hosting pros just a phone call away. http://p.sf.net/sfu/theplanet-com _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
PATCH 15/16 PM: remove trailing space in message
In reply to Frans Pop--- kernel/power/snapshot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/power/snapshot.c +1 -1
@@ -1500,7 +1500,7 @@ asmlinkage int swsusp_save(void) {unsigned int nr_pages, nr_highmem; -printk (KERN_INFO "PM: Creating hibernation image: \n" ); +printk (KERN_INFO "PM: Creating hibernation image:\n" );drain_local_pages (NULL ); nr_pages =count_data_pages ();
Signature · 1 line
1.6.6.1
PATCH 15/16 PM: remove trailing space in message
In reply to Frans Pop--- kernel/power/snapshot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/power/snapshot.c +1 -1
@@ -1500,7 +1500,7 @@ asmlinkage int swsusp_save(void) {unsigned int nr_pages, nr_highmem; -printk (KERN_INFO "PM: Creating hibernation image: \n" ); +printk (KERN_INFO "PM: Creating hibernation image:\n" );drain_local_pages (NULL ); nr_pages =count_data_pages ();
Signature · 1 line
1.6.6.1
Re: [PATCH 15/16] PM: remove trailing space in message
Quoted 3 lines · Frans Pop
Signed-off-by Frans Pop <[email protected]>Cc Rafael J. Wysocki <[email protected]>
ack.
Quoted 10 lines
+++
b/kernel/power/snapshot.ckernel/power/snapshot.c +1
-1@@ -1500,7 +1500,7 @@ asmlinkage int swsusp_save(void) {unsigned int nr_pages, nr_highmem; -printk (KERN_INFO "PM: Creating hibernation image: \n" ); +printk (KERN_INFO "PM: Creating hibernation image:\n" );drain_local_pages (NULL ); nr_pages =count_data_pages ();
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Re: [linux-pm] [PATCH 15/16] PM: remove trailing space in message
In reply to Frans PopQuoted 3 lines · Frans Pop
Signed-off-by Frans Pop <[email protected]>Cc Rafael J. Wysocki <[email protected]>
ack.
Quoted 10 lines
+++
b/kernel/power/snapshot.ckernel/power/snapshot.c +1
-1@@ -1500,7 +1500,7 @@ asmlinkage int swsusp_save(void) {unsigned int nr_pages, nr_highmem; -printk (KERN_INFO "PM: Creating hibernation image: \n" ); +printk (KERN_INFO "PM: Creating hibernation image:\n" );drain_local_pages (NULL ); nr_pages =count_data_pages ();
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
PATCH 16/16 trivial: remove trailing space in spidev test program
In reply to Frans Pop--- Documentation/spi/spidev_test.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Documentation/spi/spidev_test.c +1 -1
@@ -75,7 +75,7 @@ static void print_usage(const char *prog)puts (" -D --device device to use (default /dev/spidev1.1)\n" " -s --speed max speed (Hz)\n" " -d --delay delay (usec)\n" -" -b --bpw bits per word \n" +" -b --bpw bits per word\n" " -l --loop loopback\n" " -H --cpha clock phase\n" " -O --cpol clock polarity\n"
Signature · 1 line
1.6.6.1
Resending the patch cover letter for vger only as it didn't reach there for some reason (# recipients maybe?).
+++++++++++
This is a first series of patches to remove trailing spaces in messages. Patches cover arch-specific code plus one fix for PM and one in Documentation. Depending on how this series is received I'll continue with other parts of the kernel.
Benefits are:
- general cleanup and consistency
- minor reduction in kernel size and user's log file size
- reduced annoyance for people writing logcheck rules
The patch for m68k has been rebased against linux-next; all other patches apply against both mainline and -next (as of 5-2).
Shortstat:
74 files changed, 135 insertions(+), 136 deletions(-)
Frans Pop (16):
alpha: remove trailing spaces in messages
arm: remove trailing spaces in messages
ia64: remove trailing space in messages
m68k: remove trailing space in messages
microblaze: remove trailing space in messages
mips: remove trailing space in messages
parisc: remove trailing space in messages
s390: remove trailing space in messages
sparc: remove trailing space in messages
x86: remove trailing space in messages
blackfin: remove trailing space in messages cris/trivial: remove trailing space in message
powerpc: remove trailing space in messages
um: remove trailing space in messages
PM: remove trailing space in message
trivial: remove trailing space in spidev test program