arm: Convert pr_warning to pr_warn
Subsystems (13)
cover arm: Convert pr_warning to pr_warn
pr_warn is used about 3:1 over pr_warning and is mixed use in arch/arm. Standardize on pr_warn.
Joe Perches (8):
arm: Convert pr_warning to pr_warn
arm: mach-davinci: Convert pr_warning to pr_warn
arm: mach-ep93xx: Convert pr_warning to pr_warn
arm: mach-imx: Convert pr_warning to pr_warn
arm: mach-omap2: Convert pr_warning to pr_warn
arm: mach-orion5x: Convert pr_warning to pr_warn
arm: mach-pxa: Convert pr_warning to pr_warn
arm: mach-u300: Convert pr_warning to pr_warn
arch/arm/include/asm/syscall.h | 8 +-- arch/arm/kernel/atags_parse.c | 2 +- arch/arm/kernel/hw_breakpoint.c | 18 +++--- arch/arm/kernel/irq.c | 4 +- arch/arm/kernel/perf_event_cpu.c | 4 +- arch/arm/kernel/smp.c | 2 +- arch/arm/kernel/unwind.c | 24 ++++---- arch/arm/mach-davinci/board-da830-evm.c | 76 +++++++++++--------------- arch/arm/mach-davinci/board-dm644x-evm.c | 6 +- arch/arm/mach-davinci/board-mityomapl138.c | 38 ++++++------- arch/arm/mach-davinci/board-neuros-osd2.c | 3 +- arch/arm/mach-davinci/time.c | 6 +- arch/arm/mach-ep93xx/core.c | 4 +- arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- arch/arm/mach-imx/mach-mx31_3ds.c | 4 +- arch/arm/mach-imx/mach-mx31lite.c | 2 +- arch/arm/mach-imx/mach-pcm037.c | 4 +- arch/arm/mach-omap2/display.c | 2 +- arch/arm/mach-omap2/hdq1w.c | 4 +- arch/arm/mach-omap2/i2c.c | 2 +- arch/arm/mach-omap2/msdi.c | 4 +- arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 26 ++++----- arch/arm/mach-omap2/pdata-quirks.c | 4 +- arch/arm/mach-omap2/pm34xx.c | 2 +- arch/arm/mach-omap2/smartreflex-class3.c | 4 +- arch/arm/mach-omap2/sr_device.c | 2 +- arch/arm/mach-omap2/vc.c | 2 +- arch/arm/mach-omap2/voltage.c | 22 ++++---- arch/arm/mach-omap2/wd_timer.c | 4 +- arch/arm/mach-orion5x/dns323-setup.c | 8 +-- arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- arch/arm/mach-orion5x/ts209-setup.c | 2 +- arch/arm/mach-orion5x/ts409-setup.c | 2 +- arch/arm/mach-orion5x/ts78xx-setup.c | 4 +- arch/arm/mach-pxa/em-x270.c | 4 +- arch/arm/mach-pxa/gumstix.c | 3 +- arch/arm/mach-pxa/mfp-pxa2xx.c | 12 ++-- arch/arm/mach-pxa/poodle.c | 2 +- arch/arm/mach-pxa/pxa3xx-ulpi.c | 6 +- arch/arm/mach-pxa/raumfeld.c | 26 ++++----- arch/arm/mach-u300/dummyspichip.c | 65 ++++++++++------------ arch/arm/mm/idmap.c | 2 +- arch/arm/mm/mmu.c | 4 +- 44 files changed, 200 insertions(+), 229 deletions(-)
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 1/8 arm: Convert pr_warning to pr_warn
Use the more common pr_warn.
Other miscellanea:
o Coalesce formats
o Realign arguments
--- arch/arm/include/asm/syscall.h | 8 ++++---- arch/arm/kernel/atags_parse.c | 2 +- arch/arm/kernel/hw_breakpoint.c | 18 +++++++++--------- arch/arm/kernel/irq.c | 4 ++-- arch/arm/kernel/perf_event_cpu.c | 4 ++-- arch/arm/kernel/smp.c | 2 +- arch/arm/kernel/unwind.c | 24 ++++++++++++------------ arch/arm/mm/idmap.c | 2 +- arch/arm/mm/mmu.c | 4 ++-- 9 files changed, 34 insertions(+), 34 deletions(-)
arch/arm/include/asm/syscall.h +4 -4
@@ -63,8 +63,8 @@ static inline void syscall_get_arguments(struct task_struct *task,if (i + n >SYSCALL_MAX_ARGS ) {unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i;unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ; -pr_warning ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); +pr_warn ("%s called with max args %d, handling only %d\n" , + __func__, i + n,SYSCALL_MAX_ARGS );memset (args_bad,0 , n_bad *sizeof (args[0 ])); n =SYSCALL_MAX_ARGS - i; }
@@ -88,8 +88,8 @@ static inline void syscall_set_arguments(struct task_struct *task,return ;if (i + n >SYSCALL_MAX_ARGS ) { -pr_warning ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); +pr_warn ("%s called with max args %d, handling only %d\n" , + __func__, i + n,SYSCALL_MAX_ARGS ); n =SYSCALL_MAX_ARGS - i; }
arch/arm/kernel/atags_parse.c +1 -1
@@ -130,7 +130,7 @@ static int __init parse_tag_cmdline(const struct tag *tag)strlcat (default_command_line, tag->u.cmdline.cmdline,COMMAND_LINE_SIZE );#elif defined(CONFIG_CMDLINE_FORCE ) -pr_warning ("Ignoring tag cmdline (using the default kernel command line)\n" ); +pr_warn ("Ignoring tag cmdline (using the default kernel command line)\n" );#else strlcpy (default_command_line, tag->u.cmdline.cmdline,COMMAND_LINE_SIZE );
arch/arm/kernel/hw_breakpoint.c +9 -9
@@ -113,8 +113,8 @@ static u32 read_wb_reg(int n)GEN_READ_WB_REG_CASES (ARM_OP2_WVR , val);GEN_READ_WB_REG_CASES (ARM_OP2_WCR , val);default : -pr_warning ("attempt to read from unknown breakpoint " -"register %d\n" , n); +pr_warn ("attempt to read from unknown breakpoint register %d\n" , + n); }return val;
@@ -128,8 +128,8 @@ static void write_wb_reg(int n, u32 val)GEN_WRITE_WB_REG_CASES (ARM_OP2_WVR , val);GEN_WRITE_WB_REG_CASES (ARM_OP2_WCR , val);default : -pr_warning ("attempt to write to unknown breakpoint " -"register %d\n" , n); +pr_warn ("attempt to write to unknown breakpoint register %d\n" , + n); }isb (); }
@@ -292,7 +292,7 @@ int hw_breakpoint_slots(int type)case TYPE_DATA :return get_num_wrps ();default : -pr_warning ("unknown slot type: %d\n" , type); +pr_warn ("unknown slot type: %d\n" , type);return 0 ; } }
@@ -365,7 +365,7 @@ int arch_install_hw_breakpoint(struct perf_event *bp) }if (i == max_slots) { -pr_warning ("Can't find any breakpoint slot\n" ); +pr_warn ("Can't find any breakpoint slot\n" );return -EBUSY ; }
@@ -417,7 +417,7 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp) }if (i == max_slots) { -pr_warning ("Can't find any breakpoint slot\n" ); +pr_warn ("Can't find any breakpoint slot\n" );return ; }
@@ -894,8 +894,8 @@ static int debug_reg_trap(struct pt_regs *regs, unsigned int instr) {int cpu =smp_processor_id (); -pr_warning ("Debug register access (0x%x) caused undefined instruction on CPU %d\n" , - instr, cpu); +pr_warn ("Debug register access (0x%x) caused undefined instruction on CPU %d\n" , + instr, cpu);/* Set the error flag for this CPU and skip the faulting instruction. */ cpumask_set_cpu (cpu, &debug_err_mask);
arch/arm/kernel/irq.c +2 -2
@@ -188,8 +188,8 @@ void migrate_irqs(void)raw_spin_unlock (&desc->lock);if (affinity_broken &&printk_ratelimit ()) -pr_warning ("IRQ%u no longer affine to CPU%u\n" , i, -smp_processor_id ()); +pr_warn ("IRQ%u no longer affine to CPU%u\n" , + i,smp_processor_id ()); }local_irq_restore (flags);
arch/arm/kernel/perf_event_cpu.c +2 -2
@@ -152,8 +152,8 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler)* continue. Otherwise, continue without this interrupt. */ if (irq_set_affinity (irq,cpumask_of (i)) && irqs >1 ) { -pr_warning ("unable to set irq affinity (irq=%d, cpu=%u)\n" , - irq, i); +pr_warn ("unable to set irq affinity (irq=%d, cpu=%u)\n" , + irq, i);continue ; }
arch/arm/kernel/smp.c +1 -1
@@ -646,7 +646,7 @@ void smp_send_stop(void)udelay (1 );if (num_online_cpus () >1 ) -pr_warning ("SMP: failed to stop secondary CPUs\n" ); +pr_warn ("SMP: failed to stop secondary CPUs\n" ); }/*
arch/arm/kernel/unwind.c +12 -12
@@ -157,7 +157,7 @@ static const struct unwind_idx *search_index(unsigned long addr,if (likely (start->addr_offset <= addr_prel31))return start;else { -pr_warning ("unwind: Unknown symbol address %08lx\n" , addr); +pr_warn ("unwind: Unknown symbol address %08lx\n" , addr);return NULL ; } }
@@ -225,7 +225,7 @@ static unsigned long unwind_get_byte(struct unwind_ctrl_block *ctrl)unsigned long ret;if (ctrl->entries <=0 ) { -pr_warning ("unwind: Corrupt unwind table\n" ); +pr_warn ("unwind: Corrupt unwind table\n" );return 0 ; }
@@ -333,8 +333,8 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl) insn = (insn <<8 ) |unwind_get_byte (ctrl); mask = insn &0x0fff ;if (mask ==0 ) { -pr_warning ("unwind: 'Refuse to unwind' instruction %04lx\n" , - insn); +pr_warn ("unwind: 'Refuse to unwind' instruction %04lx\n" , + insn);return -URC_FAILURE ; }
@@ -357,8 +357,8 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl)unsigned long mask =unwind_get_byte (ctrl);if (mask ==0 || mask &0xf0 ) { -pr_warning ("unwind: Spare encoding %04lx\n" , - (insn <<8 ) | mask); +pr_warn ("unwind: Spare encoding %04lx\n" , + (insn <<8 ) | mask);return -URC_FAILURE ; }
@@ -370,7 +370,7 @@ static int unwind_exec_insn(struct unwind_ctrl_block *ctrl) ctrl->vrs[SP ] +=0x204 + (uleb128 <<2 ); }else { -pr_warning ("unwind: Unhandled instruction %02lx\n" , insn); +pr_warn ("unwind: Unhandled instruction %02lx\n" , insn);return -URC_FAILURE ; }
@@ -403,7 +403,7 @@ int unwind_frame(struct stackframe *frame) idx =unwind_find_idx (frame->pc);if (!idx) { -pr_warning ("unwind: Index not found %08lx\n" , frame->pc); +pr_warn ("unwind: Index not found %08lx\n" , frame->pc);return -URC_FAILURE ; }
@@ -422,8 +422,8 @@ int unwind_frame(struct stackframe *frame)/* only personality routine 0 supported in the index */ ctrl.insn = &idx->insn; else { -pr_warning ("unwind: Unsupported personality routine %08lx in the index at %p\n" , - idx->insn, idx); +pr_warn ("unwind: Unsupported personality routine %08lx in the index at %p\n" , + idx->insn, idx);return -URC_FAILURE ; }
@@ -435,8 +435,8 @@ int unwind_frame(struct stackframe *frame) ctrl.byte =1 ; ctrl.entries =1 + ((*ctrl.insn &0x00ff0000 ) >>16 ); }else { -pr_warning ("unwind: Unsupported personality routine %08lx at %p\n" , - *ctrl.insn, ctrl.insn); +pr_warn ("unwind: Unsupported personality routine %08lx at %p\n" , + *ctrl.insn, ctrl.insn);return -URC_FAILURE ; }
arch/arm/mm/idmap.c +1 -1
@@ -27,7 +27,7 @@ static void idmap_add_pmd(pud_t *pud, unsigned long addr, unsigned long end,if (pud_none_or_clear_bad (pud) || (pud_val (*pud) &L_PGD_SWAPPER )) { pmd =pmd_alloc_one (&init_mm, addr);if (!pmd) { -pr_warning ("Failed to allocate identity pmd.\n" ); +pr_warn ("Failed to allocate identity pmd.\n" );return ; }/*
arch/arm/mm/mmu.c +2 -2
@@ -223,13 +223,13 @@ early_param("ecc", early_ecc);static int __init early_cachepolicy (char *p) { -pr_warning ("cachepolicy kernel parameter not supported without cp15\n" ); +pr_warn ("cachepolicy kernel parameter not supported without cp15\n" ); }early_param ("cachepolicy" , early_cachepolicy);static int __init noalign_setup (char *__unused) { -pr_warning ("noalign kernel parameter not supported without cp15\n" ); +pr_warn ("noalign kernel parameter not supported without cp15\n" ); }__setup ("noalign" , noalign_setup);
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Quoted 8 lines · Joe Perches
Use the more common
pr_warn.Other miscellanea:
o Coalesce formats
o Realign argumentsSigned-off-by Joe Perches <[email protected]>
Quoted 11 lines
--- arch/arm/include/asm/syscall.h | 8 ++++---- arch/arm/kernel/atags_parse.c | 2 +- arch/arm/kernel/hw_breakpoint.c | 18 +++++++++--------- arch/arm/kernel/irq.c | 4 ++-- arch/arm/kernel/perf_event_cpu.c | 4 ++-- arch/arm/kernel/smp.c | 2 +- arch/arm/kernel/unwind.c | 24 ++++++++++++------------ arch/arm/mm/idmap.c | 2 +- arch/arm/mm/mmu.c | 4 ++-- 9 files changed, 34 insertions(+), 34 deletions(-)
It's Russell's call on this, but it really looks like more trouble than it's worth imo. Having git blame identify the person who wrote the original code is considerably more useful than being pointed at somebody making cosmetic changes.
Will
Quoted 2 lines · Will Deacon
Quoted 1 line · Joe Perches
Use the more common
pr_warn.
[]
Quoted 4 lines
It's Russell's call on this, but it really looks like more trouble than it's worth imo. Having git blame identify the person who wrote the original code is considerably more useful than being pointed at somebody making cosmetic changes.
The general idea is to standardize the printk mechanisms and eventually remove pr_warning.
Quoted 21 lines · Will Deacon
Quoted 8 lines · Joe Perches
Use the more common
pr_warn.Other miscellanea:
o Coalesce formats
o Realign argumentsSigned-off-by Joe Perches <[email protected]>Quoted 11 lines
--- arch/arm/include/asm/syscall.h | 8 ++++---- arch/arm/kernel/atags_parse.c | 2 +- arch/arm/kernel/hw_breakpoint.c | 18 +++++++++--------- arch/arm/kernel/irq.c | 4 ++-- arch/arm/kernel/perf_event_cpu.c | 4 ++-- arch/arm/kernel/smp.c | 2 +- arch/arm/kernel/unwind.c | 24 ++++++++++++------------ arch/arm/mm/idmap.c | 2 +- arch/arm/mm/mmu.c | 4 ++-- 9 files changed, 34 insertions(+), 34 deletions(-)
Quoted 4 lines
It's Russell's call on this, but it really looks like more trouble than it's worth imo. Having git blame identify the person who wrote the original code is considerably more useful than being pointed at somebody making cosmetic changes.
I have no objection to this patch set, but I'll echo Will's comment that having git blame identify who wrote the code is useful.
However, removing old cruft is also a useful exercise, as it keeps things simpler (because we're not carrying around lots of excess baggage.) So, I think on balance it's worth the churn.
Joe, any chance you could add a KernelVersion: tag somewhere in the commit message and throw it at patches at arm.linux.org.uk so it doesn't get lost?
Thanks.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up according to speedtest.net.
Quoted 3 lines · Russell King - ARM Linux
any chance you could add a KernelVersion: tag somewhere in the commit message and throw it at patches at arm.linux.org.uk so it doesn't get lost?
There are no commit logs with a KernelVersion: tag in all of git history.
What do you think a KernelVersion: tag is and what would it be used for?
Hi Joe,
Quoted 10 lines · Joe Perches
Quoted 3 lines · Russell King - ARM Linux
any chance you could add a KernelVersion: tag somewhere in the commit message and throw it at patches at arm.linux.org.uk so it doesn't get lost?
There are no commit logs with a KernelVersion: tag in all of git history.
What do you think a KernelVersion: tag is and what would it be used for?
That's used in Russell's patch tracker, but the resulting commit doesn't have the KernelVersion tag.
See http://www.arm.linux.org.uk/developer/patches/info.php for the details.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Quoted 7 lines · Joe Perches
Quoted 3 lines · Russell King - ARM Linux
any chance you could add a KernelVersion: tag somewhere in the commit message and throw it at patches at arm.linux.org.uk so it doesn't get lost?
There are no commit logs with a KernelVersion: tag in all of git history.
Right, that's not it's purpose.
Quoted 2 lines
What do you think a KernelVersion: tag is and what would it be used for?
It's for that email address to know which kernel version the patch was generated against, which is useful information when I come to apply it. It gets filtered out from the commit message. It can go anywhere, even below the -- line.
If you don't want to cooperate, you will have to rely on my notoriously bad email skills to scan the mailing list for random patches to apply some time (maybe days or even weeks) later after you send your message. Which just won't happen. It's why I wrote scripts which are some 20 years old to solve my bad email patch handling skills.
Signature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.5Mbps down 400kbps up according to speedtest.net.
Quoted 19 lines · Russell King - ARM Linux
Quoted 7 lines · Joe Perches
Quoted 3 lines · Russell King - ARM Linux
any chance you could add a KernelVersion: tag somewhere in the commit message and throw it at patches at arm.linux.org.uk so it doesn't get lost?
There are no commit logs with a KernelVersion: tag in all of git history.
Right, that's not it's purpose.
Quoted 2 lines
What do you think a KernelVersion: tag is and what would it be used for?
It's for that email address to know which kernel version the patch was generated against, which is useful information when I come to apply it. It gets filtered out from the commit message. It can go anywhere, even below the -- line.
Quoted 5 lines
If you don't want to cooperate, you will have to rely on my notoriously bad email skills to scan the mailing list for random patches to apply some time (maybe days or even weeks) later after you send your message. Which just won't happen. It's why I wrote scripts which are some 20 years old to solve my bad email patch handling skills.
I received your patchbot's reply about 15 minutes before you sent this.
I suggest you might move one year to patchwork
(ie: https://patchwork.kernel.org/project/linux-arm-kernel/list/)
and adapt that as necessary, but whatever works
for you.
btw:
patches at arm.linux.org.uk is not documented at all in the kernel sources. You could fix that if you want other people to know what you do.
PATCH 2/8 arm: mach-davinci: Convert pr_warning to pr_warn
In reply to Joe PerchesUse the more common pr_warn.
Other miscellanea:
o Coalesce formats
o Realign arguments
--- arch/arm/mach-davinci/board-da830-evm.c | 76 +++++++++++++----------------- arch/arm/mach-davinci/board-dm644x-evm.c | 6 +-- arch/arm/mach-davinci/board-mityomapl138.c | 38 +++++++-------- arch/arm/mach-davinci/board-neuros-osd2.c | 3 +- arch/arm/mach-davinci/time.c | 6 +-- 5 files changed, 55 insertions(+), 74 deletions(-)
arch/arm/mach-davinci/board-da830-evm.c +32 -44
@@ -145,8 +145,7 @@ static __init void da830_evm_usb_init(void)/* USB_REFCLKIN is not used. */ ret =davinci_cfg_reg (DA830_USB0_DRVVBUS );if (ret) -pr_warning ("%s: USB 2.0 PinMux setup failed: %d\n" , - __func__, ret); +pr_warn ("%s: USB 2.0 PinMux setup failed: %d\n" , __func__, ret);else {/* * TPS2065 switch @ 5V supplies 1 A (sustains 1.5 A),
@@ -154,14 +153,14 @@ static __init void da830_evm_usb_init(void)*/ ret =da8xx_register_usb20 (1000 ,3 );if (ret) -pr_warning ("%s: USB 2.0 registration failed: %d\n" , - __func__, ret); +pr_warn ("%s: USB 2.0 registration failed: %d\n" , + __func__, ret); } ret =davinci_cfg_reg_list (da830_evm_usb11_pins);if (ret) { -pr_warning ("%s: USB 1.1 PinMux setup failed: %d\n" , - __func__, ret); +pr_warn ("%s: USB 1.1 PinMux setup failed: %d\n" , + __func__, ret);return ; }
@@ -183,8 +182,8 @@ static __init void da830_evm_usb_init(void) ret =da8xx_register_usb11 (&da830_evm_usb11_pdata);if (ret) -pr_warning ("%s: USB 1.1 registration failed: %d\n" , - __func__, ret); +pr_warn ("%s: USB 1.1 registration failed: %d\n" , + __func__, ret); }static const short da830_evm_mcasp1_pins[] = {
@@ -252,31 +251,30 @@ static inline void da830_evm_init_mmc(void) ret =davinci_cfg_reg_list (da830_evm_mmc_sd_pins);if (ret) { -pr_warning ("da830_evm_init: mmc/sd mux setup failed: %d\n" , - ret); +pr_warn ("da830_evm_init: mmc/sd mux setup failed: %d\n" , ret);return ; } ret =gpio_request (DA830_MMCSD_WP_PIN ,"MMC WP" );if (ret) { -pr_warning ("da830_evm_init: can not open GPIO %d\n" , -DA830_MMCSD_WP_PIN ); +pr_warn ("da830_evm_init: can not open GPIO %d\n" , +DA830_MMCSD_WP_PIN );return ; }gpio_direction_input (DA830_MMCSD_WP_PIN ); ret =gpio_request (DA830_MMCSD_CD_PIN ,"MMC CD\n" );if (ret) { -pr_warning ("da830_evm_init: can not open GPIO %d\n" , -DA830_MMCSD_CD_PIN ); +pr_warn ("da830_evm_init: can not open GPIO %d\n" , +DA830_MMCSD_CD_PIN );return ; }gpio_direction_input (DA830_MMCSD_CD_PIN ); ret =da8xx_register_mmcsd0 (&da830_evm_mmc_config);if (ret) { -pr_warning ("da830_evm_init: mmc/sd registration failed: %d\n" , - ret); +pr_warn ("da830_evm_init: mmc/sd registration failed: %d\n" , + ret);gpio_free (DA830_MMCSD_WP_PIN ); } }
@@ -404,20 +402,18 @@ static inline void da830_evm_init_nand(int mux_mode)int ret;if (HAS_MMC ) { -pr_warning ("WARNING: both MMC/SD and NAND are " -"enabled, but they share AEMIF pins.\n" -"\tDisable MMC/SD for NAND support.\n" ); +pr_warn ("WARNING: both MMC/SD and NAND are enabled, but they share AEMIF pins.\n" +"\tDisable MMC/SD for NAND support.\n" );return ; } ret =davinci_cfg_reg_list (da830_evm_emif25_pins);if (ret) -pr_warning ("da830_evm_init: emif25 mux setup failed: %d\n" , - ret); +pr_warn ("da830_evm_init: emif25 mux setup failed: %d\n" , ret); ret =platform_device_register (&da830_evm_nand_device);if (ret) -pr_warning ("da830_evm_init: NAND device not registered.\n" ); +pr_warn ("da830_evm_init: NAND device not registered.\n" );if (davinci_aemif_setup (&da830_evm_nand_device))pr_warn ("%s: Cannot configure AEMIF.\n" , __func__);
@@ -435,12 +431,11 @@ static inline void da830_evm_init_lcdc(int mux_mode) ret =davinci_cfg_reg_list (da830_lcdcntl_pins);if (ret) -pr_warning ("da830_evm_init: lcdcntl mux setup failed: %d\n" , - ret); +pr_warn ("da830_evm_init: lcdcntl mux setup failed: %d\n" , ret); ret =da8xx_register_lcdc (&sharp_lcd035q3dg01_pdata);if (ret) -pr_warning ("da830_evm_init: lcd setup failed: %d\n" , ret); +pr_warn ("da830_evm_init: lcd setup failed: %d\n" , ret);gpio_direction_output (mux_mode,0 ); }
@@ -602,18 +597,15 @@ static __init void da830_evm_init(void) ret =da830_register_edma (da830_edma_rsv);if (ret) -pr_warning ("da830_evm_init: edma registration failed: %d\n" , - ret); +pr_warn ("da830_evm_init: edma registration failed: %d\n" , ret); ret =davinci_cfg_reg_list (da830_i2c0_pins);if (ret) -pr_warning ("da830_evm_init: i2c0 mux setup failed: %d\n" , - ret); +pr_warn ("da830_evm_init: i2c0 mux setup failed: %d\n" , ret); ret =da8xx_register_i2c (0 , &da830_evm_i2c_0_pdata);if (ret) -pr_warning ("da830_evm_init: i2c0 registration failed: %d\n" , - ret); +pr_warn ("da830_evm_init: i2c0 registration failed: %d\n" , ret);da830_evm_usb_init ();
@@ -622,18 +614,16 @@ static __init void da830_evm_init(void) ret =davinci_cfg_reg_list (da830_cpgmac_pins);if (ret) -pr_warning ("da830_evm_init: cpgmac mux setup failed: %d\n" , - ret); +pr_warn ("da830_evm_init: cpgmac mux setup failed: %d\n" , ret); ret =da8xx_register_emac ();if (ret) -pr_warning ("da830_evm_init: emac registration failed: %d\n" , - ret); +pr_warn ("da830_evm_init: emac registration failed: %d\n" , ret); ret =da8xx_register_watchdog ();if (ret) -pr_warning ("da830_evm_init: watchdog registration failed: %d\n" , - ret); +pr_warn ("da830_evm_init: watchdog registration failed: %d\n" , + ret);davinci_serial_init (da8xx_serial_device); i2c_register_board_info(1, da830_evm_i2c_devices,
@@ -641,8 +631,7 @@ static __init void da830_evm_init(void) ret =davinci_cfg_reg_list (da830_evm_mcasp1_pins);if (ret) -pr_warning ("da830_evm_init: mcasp1 mux setup failed: %d\n" , - ret); +pr_warn ("da830_evm_init: mcasp1 mux setup failed: %d\n" , ret);da8xx_register_mcasp (1 , &da830_evm_snd_data);
@@ -650,18 +639,17 @@ static __init void da830_evm_init(void) ret =da8xx_register_rtc ();if (ret) -pr_warning ("da830_evm_init: rtc setup failed: %d\n" , ret); +pr_warn ("da830_evm_init: rtc setup failed: %d\n" , ret); ret =spi_register_board_info (da830evm_spi_info,ARRAY_SIZE (da830evm_spi_info));if (ret) -pr_warn ("%s: spi info registration failed: %d\n" , __func__, - ret); +pr_warn ("%s: spi info registration failed: %d\n" , + __func__, ret); ret =da8xx_register_spi_bus (0 ,ARRAY_SIZE (da830evm_spi_info));if (ret) -pr_warning ("da830_evm_init: spi 0 registration failed: %d\n" , - ret); +pr_warn ("da830_evm_init: spi 0 registration failed: %d\n" , ret); }#ifdef CONFIG_SERIAL_8250_CONSOLE
arch/arm/mach-davinci/board-dm644x-evm.c +2 -4
@@ -767,8 +767,7 @@ static __init void davinci_evm_init(void)if (HAS_ATA ) {if (HAS_NAND ||HAS_NOR ) -pr_warning ("WARNING: both IDE and Flash are " -"enabled, but they share AEMIF pins.\n" +pr_warn ("WARNING: both IDE and Flash are enabled, but they share AEMIF pins.\n" "\tDisable IDE for NAND/NOR support.\n" );davinci_init_ide (); }else if (HAS_NAND ||HAS_NOR ) {
@@ -785,8 +784,7 @@ static __init void davinci_evm_init(void) evm_leds[7 ].default_trigger ="nand-disk" ;if (HAS_NOR ) -pr_warning ("WARNING: both NAND and NOR flash " -"are enabled; disable one of them.\n" ); +pr_warn ("WARNING: both NAND and NOR flash are enabled; disable one of them.\n" ); }else if (HAS_NOR )platform_device_register (&davinci_evm_norflash_device); }
arch/arm/mach-davinci/board-mityomapl138.c +18 -20
@@ -107,7 +107,7 @@ static void mityomapl138_cpufreq_init(const char *partnum) ret =da850_register_cpufreq ("pll0_sysclk3" );if (ret) - pr_warning("cpufreq registration failed: %d\n", ret); + pr_warn("cpufreq registration failed: %d\n", ret); }#else static void mityomapl138_cpufreq_init (const char *partnum) { }
@@ -121,20 +121,19 @@ static void read_factory_config(struct memory_accessor *a, void *context) ret = a->read (a, (char *)&factory_config,0 ,sizeof (factory_config));if (ret !=sizeof (struct factory_config )) { -pr_warning ("MityOMAPL138: Read Factory Config Failed: %d\n" , - ret); +pr_warn ("MityOMAPL138: Read Factory Config Failed: %d\n" , ret); goto bad_config; }if (factory_config.magic !=FACTORY_CONFIG_MAGIC ) { -pr_warning ("MityOMAPL138: Factory Config Magic Wrong (%X)\n" , - factory_config.magic); +pr_warn ("MityOMAPL138: Factory Config Magic Wrong (%X)\n" , + factory_config.magic); goto bad_config; }if (factory_config.version !=FACTORY_CONFIG_VERSION ) { -pr_warning ("MityOMAPL138: Factory Config Version Wrong (%X)\n" , - factory_config.version); +pr_warn ("MityOMAPL138: Factory Config Version Wrong (%X)\n" , + factory_config.version); goto bad_config; }
@@ -143,8 +142,7 @@ static void read_factory_config(struct memory_accessor *a, void *context)memcpy (soc_info->emac_pdata->mac_addr, factory_config.mac,ETH_ALEN ); else - pr_warning("MityOMAPL138: Invalid MAC found " - "in factory config block\n"); + pr_warn("MityOMAPL138: Invalid MAC found in factory config block\n"); partnum = factory_config.partnum;pr_info ("MityOMAPL138: Part Number = %s\n" , partnum);
@@ -478,7 +476,7 @@ static void __init mityomapl138_config_emac(void) }if (ret) { -pr_warning ("mii/rmii mux setup failed: %d\n" , ret); +pr_warn ("mii/rmii mux setup failed: %d\n" , ret);return ; }
@@ -489,7 +487,7 @@ static void __init mityomapl138_config_emac(void) ret =da8xx_register_emac ();if (ret) -pr_warning ("emac registration failed: %d\n" , ret); +pr_warn ("emac registration failed: %d\n" , ret); }static struct davinci_pm_config da850_pm_pdata = {
@@ -511,21 +509,21 @@ static void __init mityomapl138_init(void)/* for now, no special EDMA channels are reserved */ ret =da850_register_edma (NULL );if (ret) -pr_warning ("edma registration failed: %d\n" , ret); +pr_warn ("edma registration failed: %d\n" , ret); ret =da8xx_register_watchdog ();if (ret) -pr_warning ("watchdog registration failed: %d\n" , ret); +pr_warn ("watchdog registration failed: %d\n" , ret);davinci_serial_init (da8xx_serial_device); ret =da8xx_register_i2c (0 , &mityomap_i2c_0_pdata);if (ret) -pr_warning ("i2c0 registration failed: %d\n" , ret); +pr_warn ("i2c0 registration failed: %d\n" , ret); ret =pmic_tps65023_init ();if (ret) -pr_warning ("TPS65023 PMIC init failed: %d\n" , ret); +pr_warn ("TPS65023 PMIC init failed: %d\n" , ret);mityomapl138_setup_nand ();
@@ -537,22 +535,22 @@ static void __init mityomapl138_init(void) ret =da8xx_register_spi_bus (1 ,ARRAY_SIZE (mityomapl138_spi_flash_info));if (ret) -pr_warning ("spi 1 registration failed: %d\n" , ret); +pr_warn ("spi 1 registration failed: %d\n" , ret);mityomapl138_config_emac (); ret =da8xx_register_rtc ();if (ret) -pr_warning ("rtc setup failed: %d\n" , ret); +pr_warn ("rtc setup failed: %d\n" , ret); ret =da8xx_register_cpuidle ();if (ret) -pr_warning ("cpuidle registration failed: %d\n" , ret); +pr_warn ("cpuidle registration failed: %d\n" , ret); ret =da850_register_pm (&da850_pm_device);if (ret) -pr_warning ("da850_evm_init: suspend registration failed: %d\n" , - ret); +pr_warn ("da850_evm_init: suspend registration failed: %d\n" , + ret); }#ifdef CONFIG_SERIAL_8250_CONSOLE
arch/arm/mach-davinci/board-neuros-osd2.c +1 -2
@@ -183,8 +183,7 @@ static __init void davinci_ntosd2_init(void)if (HAS_ATA ) {if (HAS_NAND ) -pr_warning ("WARNING: both IDE and Flash are " -"enabled, but they share AEMIF pins.\n" +pr_warn ("WARNING: both IDE and Flash are enabled, but they share AEMIF pins.\n" "\tDisable IDE for NAND/NOR support.\n" );davinci_init_ide (); }else if (HAS_NAND ) {
arch/arm/mach-davinci/time.c +2 -4
@@ -364,12 +364,10 @@ void __init davinci_timer_init(void)/* Only bottom timers can use compare regs */ if (IS_TIMER_TOP (clockevent_id)) -pr_warning ("davinci_timer_init: Invalid use" -" of system timers. Results unpredictable.\n" ); +pr_warn ("davinci_timer_init: Invalid use of system timers. Results unpredictable.\n" );else if ((dtip[event_timer].cmp_off ==0 ) || (dtip[event_timer].cmp_irq ==0 )) -pr_warning ("davinci_timer_init: Invalid timer instance" -" setup. Results unpredictable.\n" ); +pr_warn ("davinci_timer_init: Invalid timer instance setup. Results unpredictable.\n" );else { timers[TID_CLOCKEVENT ].opts |=TIMER_OPTS_USE_COMPARE ; clockevent_davinci.features =CLOCK_EVT_FEAT_ONESHOT ;
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 3/8 arm: mach-ep93xx: Convert pr_warning to pr_warn
In reply to Joe PerchesUse the more common pr_warn.
Other miscellanea:
o Coalesce formats
--- arch/arm/mach-ep93xx/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-ep93xx/core.c +2 -2
@@ -454,9 +454,9 @@ void __init ep93xx_register_i2c(struct i2c_gpio_platform_data *data,* CMOS driver. */ if (data->sda_is_open_drain && data->sda_pin !=EP93XX_GPIO_LINE_EEDAT ) -pr_warning ("sda != EEDAT, open drain has no effect\n" ); +pr_warn ("sda != EEDAT, open drain has no effect\n" );if (data->scl_is_open_drain && data->scl_pin !=EP93XX_GPIO_LINE_EECLK ) -pr_warning ("scl != EECLK, open drain has no effect\n" ); +pr_warn ("scl != EECLK, open drain has no effect\n" ); __raw_writel((data->sda_is_open_drain << 1) | (data->scl_is_open_drain << 0),
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
PATCH 4/8 arm: mach-imx: Convert pr_warning to pr_warn
In reply to Joe PerchesUse the more common pr_warn.
--- arch/arm/mach-imx/mach-armadillo5x0.c | 2 +- arch/arm/mach-imx/mach-mx31_3ds.c | 4 ++-- arch/arm/mach-imx/mach-mx31lite.c | 2 +- arch/arm/mach-imx/mach-pcm037.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/mach-imx/mach-armadillo5x0.c +1 -1
@@ -537,7 +537,7 @@ static void __init armadillo5x0_init(void)gpio_free (ARMADILLO5X0_RTC_GPIO ); }if (armadillo5x0_i2c_rtc.irq ==0 ) -pr_warning ("armadillo5x0_init: failed to get RTC IRQ\n" ); +pr_warn ("armadillo5x0_init: failed to get RTC IRQ\n" );i2c_register_board_info (1 , &armadillo5x0_i2c_rtc,1 );/* USB */
arch/arm/mach-imx/mach-mx31_3ds.c +2 -2
@@ -307,7 +307,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev, ret =gpio_request_array (mx31_3ds_sdhc1_gpios,ARRAY_SIZE (mx31_3ds_sdhc1_gpios));if (ret) { -pr_warning ("Unable to request the SD/MMC GPIOs.\n" ); +pr_warn ("Unable to request the SD/MMC GPIOs.\n" );return ret; }
@@ -316,7 +316,7 @@ static int mx31_3ds_sdhc1_init(struct device *dev,IRQF_TRIGGER_FALLING |IRQF_TRIGGER_RISING , "sdhc1-detect", data);if (ret) { -pr_warning ("Unable to request the SD/MMC card-detect IRQ.\n" ); +pr_warn ("Unable to request the SD/MMC card-detect IRQ.\n" ); goto gpio_free; }
arch/arm/mach-imx/mach-mx31lite.c +1 -1
@@ -270,7 +270,7 @@ static void __init mx31lite_init(void)/* SMSC9117 IRQ pin */ ret =gpio_request (IOMUX_TO_GPIO (MX31_PIN_SFS6 ),"sms9117-irq" );if (ret) -pr_warning ("could not get LAN irq gpio\n" ); +pr_warn ("could not get LAN irq gpio\n" );else {gpio_direction_input (IOMUX_TO_GPIO (MX31_PIN_SFS6 )); smsc911x_resources[1].start =
arch/arm/mach-imx/mach-pcm037.c +2 -2
@@ -58,7 +58,7 @@ static int __init pcm037_variant_setup(char *str)if (!strcmp ("eet" , str)) pcm037_instance =PCM037_EET ;else if (strcmp ("pcm970" , str)) -pr_warning ("Unknown pcm037 baseboard variant %s\n" , str); +pr_warn ("Unknown pcm037 baseboard variant %s\n" , str);return 1 ; }
@@ -624,7 +624,7 @@ static void __init pcm037_init(void)/* LAN9217 IRQ pin */ ret =gpio_request (IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 ),"lan9217-irq" );if (ret) -pr_warning ("could not get LAN irq gpio\n" ); +pr_warn ("could not get LAN irq gpio\n" );else {gpio_direction_input (IOMUX_TO_GPIO (MX31_PIN_GPIO3_1 )); smsc911x_resources[1].start =
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Shawn Guo
AppliedRe: [PATCH 4/8] arm: mach-imx: Convert pr_warning to pr_warn
Quoted 3 lines · Joe Perches
Use the more common
pr_warn.Signed-off-by Joe Perches <[email protected]>
Applied, thanks.
PATCH 5/8 arm: mach-omap2: Convert pr_warning to pr_warn
In reply to Joe PerchesUse the more common pr_warn.
Other miscellanea:
o Realign arguments
--- arch/arm/mach-omap2/display.c | 2 +- arch/arm/mach-omap2/hdq1w.c | 4 ++-- arch/arm/mach-omap2/i2c.c | 2 +- arch/arm/mach-omap2/msdi.c | 4 ++-- arch/arm/mach-omap2/mux.c | 2 +- arch/arm/mach-omap2/omap_hwmod.c | 26 +++++++++++++------------- arch/arm/mach-omap2/pdata-quirks.c | 4 ++-- arch/arm/mach-omap2/pm34xx.c | 2 +- arch/arm/mach-omap2/smartreflex-class3.c | 4 ++-- arch/arm/mach-omap2/sr_device.c | 2 +- arch/arm/mach-omap2/vc.c | 2 +- arch/arm/mach-omap2/voltage.c | 22 +++++++++++----------- arch/arm/mach-omap2/wd_timer.c | 4 ++-- 13 files changed, 40 insertions(+), 40 deletions(-)
arch/arm/mach-omap2/display.c +1 -1
@@ -544,7 +544,7 @@ int omap_dss_reset(struct omap_hwmod *oh) MAX_MODULE_SOFTRESET_WAIT, c);if (c ==MAX_MODULE_SOFTRESET_WAIT ) -pr_warning ("dss_core: waiting for reset to finish failed\n" ); +pr_warn ("dss_core: waiting for reset to finish failed\n" );else pr_debug ("dss_core: softreset done\n" );
arch/arm/mach-omap2/hdq1w.c +2 -2
@@ -67,8 +67,8 @@ int omap_hdq1w_reset(struct omap_hwmod *oh) MAX_MODULE_SOFTRESET_WAIT, c);if (c ==MAX_MODULE_SOFTRESET_WAIT ) -pr_warning ("%s: %s: softreset failed (waited %d usec)\n" , - __func__, oh->name,MAX_MODULE_SOFTRESET_WAIT ); +pr_warn ("%s: %s: softreset failed (waited %d usec)\n" , + __func__, oh->name,MAX_MODULE_SOFTRESET_WAIT );else pr_debug ("%s: %s: softreset in %d usec\n" , __func__, oh->name, c);
arch/arm/mach-omap2/i2c.c +1 -1
@@ -99,7 +99,7 @@ int omap_i2c_reset(struct omap_hwmod *oh) MAX_MODULE_SOFTRESET_WAIT, c);if (c ==MAX_MODULE_SOFTRESET_WAIT ) -pr_warning ("%s: %s: softreset failed (waited %d usec)\n" , +pr_warn ("%s: %s: softreset failed (waited %d usec)\n" , __func__, oh->name,MAX_MODULE_SOFTRESET_WAIT );else pr_debug("%s: %s: softreset in %d usec\n", __func__,
arch/arm/mach-omap2/msdi.c +2 -2
@@ -76,8 +76,8 @@ int omap_msdi_reset(struct omap_hwmod *oh) MAX_MODULE_SOFTRESET_WAIT, c);if (c ==MAX_MODULE_SOFTRESET_WAIT ) -pr_warning ("%s: %s: softreset failed (waited %d usec)\n" , - __func__, oh->name,MAX_MODULE_SOFTRESET_WAIT ); +pr_warn ("%s: %s: softreset failed (waited %d usec)\n" , + __func__, oh->name,MAX_MODULE_SOFTRESET_WAIT );else pr_debug ("%s: %s: softreset in %d usec\n" , __func__, oh->name, c);
arch/arm/mach-omap2/mux.c +1 -1
@@ -814,7 +814,7 @@ int __init omap_mux_late_init(void) "hwmod_io", omap_mux_late_init);if (ret) -pr_warning ("mux: Failed to setup hwmod io irq %d\n" , ret); +pr_warn ("mux: Failed to setup hwmod io irq %d\n" , ret);return 0 ; }
arch/arm/mach-omap2/omap_hwmod.c +13 -13
@@ -769,8 +769,8 @@ static int _init_main_clk(struct omap_hwmod *oh) oh->_clk =clk_get (NULL , oh->main_clk);if (IS_ERR (oh->_clk)) { -pr_warning ("omap_hwmod: %s: cannot clk_get main_clk %s\n" , - oh->name, oh->main_clk); +pr_warn ("omap_hwmod: %s: cannot clk_get main_clk %s\n" , + oh->name, oh->main_clk);return -EINVAL ; }/*
@@ -814,8 +814,8 @@ static int _init_interface_clks(struct omap_hwmod *oh) c =clk_get (NULL , os->clk);if (IS_ERR (c)) { -pr_warning ("omap_hwmod: %s: cannot clk_get interface_clk %s\n" , - oh->name, os->clk); +pr_warn ("omap_hwmod: %s: cannot clk_get interface_clk %s\n" , + oh->name, os->clk); ret = -EINVAL ;continue ; }
@@ -851,8 +851,8 @@ static int _init_opt_clks(struct omap_hwmod *oh)for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i >0 ; i--, oc++) { c =clk_get (NULL , oc->clk);if (IS_ERR (c)) { -pr_warning ("omap_hwmod: %s: cannot clk_get opt_clk %s\n" , - oh->name, oc->clk); +pr_warn ("omap_hwmod: %s: cannot clk_get opt_clk %s\n" , + oh->name, oc->clk); ret = -EINVAL ;continue ; }
@@ -1576,7 +1576,7 @@ static int _init_clkdm(struct omap_hwmod *oh) oh->clkdm =clkdm_lookup (oh->clkdm_name);if (!oh->clkdm) { -pr_warning ("omap_hwmod: %s: could not associate to clkdm %s\n" , +pr_warn ("omap_hwmod: %s: could not associate to clkdm %s\n" , oh->name, oh->clkdm_name);return 0 ; }
@@ -1616,7 +1616,7 @@ static int _init_clocks(struct omap_hwmod *oh, void *data)if (!ret) oh->_state = _HWMOD_STATE_CLKS_INITED;else -pr_warning ("omap_hwmod: %s: cannot _init_clocks\n" , oh->name); +pr_warn ("omap_hwmod: %s: cannot _init_clocks\n" , oh->name);return ret; }
@@ -1739,7 +1739,7 @@ static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)_disable_clocks (oh);if (ret == -EBUSY ) -pr_warning ("omap_hwmod: %s: failed to hardreset\n" , oh->name); +pr_warn ("omap_hwmod: %s: failed to hardreset\n" , oh->name);if (!ret) {/*
@@ -1953,8 +1953,8 @@ static int _ocp_softreset(struct omap_hwmod *oh) c =_wait_softreset_complete (oh);if (c ==MAX_MODULE_SOFTRESET_WAIT ) { -pr_warning ("omap_hwmod: %s: softreset failed (waited %d usec)\n" , - oh->name,MAX_MODULE_SOFTRESET_WAIT ); +pr_warn ("omap_hwmod: %s: softreset failed (waited %d usec)\n" , + oh->name,MAX_MODULE_SOFTRESET_WAIT ); ret = -ETIMEDOUT ; goto dis_opt_clks; }else {
@@ -2618,8 +2618,8 @@ static int __init _setup_reset(struct omap_hwmod *oh)if (oh->rst_lines_cnt ==0 ) { r =_enable (oh);if (r) { -pr_warning ("omap_hwmod: %s: cannot be enabled for reset (%d)\n" , - oh->name, oh->_state); +pr_warn ("omap_hwmod: %s: cannot be enabled for reset (%d)\n" , + oh->name, oh->_state);return -EINVAL ; } }
arch/arm/mach-omap2/pdata-quirks.c +2 -2
@@ -244,8 +244,8 @@ static void __init nokia_n900_legacy_init(void)/* set IBE to 1 */ rx51_secure_update_aux_cr (BIT (6 ),0 ); }else { -pr_warning ("RX-51: Not enabling ARM errata 430973 workaround\n" ); -pr_warning ("Thumb binaries may crash randomly without this workaround\n" ); +pr_warn ("RX-51: Not enabling ARM errata 430973 workaround\n" ); +pr_warn ("Thumb binaries may crash randomly without this workaround\n" ); }pr_info ("RX-51: Registring OMAP3 HWRNG device\n" );
arch/arm/mach-omap2/pm34xx.c +1 -1
@@ -465,7 +465,7 @@ int __init omap3_pm_init(void)int ret;if (!omap3_has_io_chain_ctrl ()) -pr_warning ("PM: no software I/O chain control; some wakeups may be lost\n" ); +pr_warn ("PM: no software I/O chain control; some wakeups may be lost\n" );pm_errata_configure ();
arch/arm/mach-omap2/smartreflex-class3.c +2 -2
@@ -20,8 +20,8 @@ static int sr_class3_enable(struct omap_sr *sr)unsigned long volt =voltdm_get_voltage (sr->voltdm);if (!volt) { -pr_warning ("%s: Curr voltage unknown. Cannot enable %s\n" , - __func__, sr->name); +pr_warn ("%s: Curr voltage unknown. Cannot enable %s\n" , + __func__, sr->name);return -ENODATA ; }
arch/arm/mach-omap2/sr_device.c +1 -1
@@ -154,7 +154,7 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) pdev =omap_device_build (name, i, oh, sr_data,sizeof (*sr_data));if (IS_ERR (pdev)) -pr_warning ("%s: Could not build omap_device for %s: %s.\n\n" , +pr_warn ("%s: Could not build omap_device for %s: %s\n" , __func__, name, oh->name); exit: i++;
arch/arm/mach-omap2/vc.c +1 -1
@@ -198,7 +198,7 @@ int omap_vc_bypass_scale(struct voltagedomain *voltdm, loop_cnt++;if (retries_cnt >10 ) { -pr_warning ("%s: Retry count exceeded\n" , __func__); +pr_warn ("%s: Retry count exceeded\n" , __func__);return -ETIMEDOUT ; }
arch/arm/mach-omap2/voltage.c +11 -11
@@ -55,7 +55,7 @@ static LIST_HEAD(voltdm_list);unsigned long voltdm_get_voltage (struct voltagedomain *voltdm) {if (!voltdm ||IS_ERR (voltdm)) { -pr_warning ("%s: VDD specified does not exist!\n" , __func__); +pr_warn ("%s: VDD specified does not exist!\n" , __func__);return 0 ; }
@@ -77,7 +77,7 @@ int voltdm_scale(struct voltagedomain *voltdm,unsigned long volt =0 ;if (!voltdm ||IS_ERR (voltdm)) { -pr_warning ("%s: VDD specified does not exist!\n" , __func__); +pr_warn ("%s: VDD specified does not exist!\n" , __func__);return -EINVAL ; }
@@ -96,8 +96,8 @@ int voltdm_scale(struct voltagedomain *voltdm, }if (!volt) { -pr_warning ("%s: not scaling. OPP voltage for %lu, not found.\n" , - __func__, target_volt); +pr_warn ("%s: not scaling. OPP voltage for %lu, not found.\n" , + __func__, target_volt);return -EINVAL ; }
@@ -122,7 +122,7 @@ void voltdm_reset(struct voltagedomain *voltdm)unsigned long target_volt;if (!voltdm ||IS_ERR (voltdm)) { -pr_warning ("%s: VDD specified does not exist!\n" , __func__); +pr_warn ("%s: VDD specified does not exist!\n" , __func__);return ; }
@@ -152,7 +152,7 @@ void omap_voltage_get_volttable(struct voltagedomain *voltdm, struct omap_volt_data **volt_data) {if (!voltdm ||IS_ERR (voltdm)) { -pr_warning ("%s: VDD specified does not exist!\n" , __func__); +pr_warn ("%s: VDD specified does not exist!\n" , __func__);return ; }
@@ -180,12 +180,12 @@ struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,int i;if (!voltdm ||IS_ERR (voltdm)) { -pr_warning ("%s: VDD specified does not exist!\n" , __func__); +pr_warn ("%s: VDD specified does not exist!\n" , __func__);return ERR_PTR (-EINVAL ); }if (!voltdm->volt_data) { -pr_warning ("%s: voltage table does not exist for vdd_%s\n" , +pr_warn ("%s: voltage table does not exist for vdd_%s\n" , __func__, voltdm->name);return ERR_PTR (-ENODATA ); }
@@ -214,7 +214,7 @@ int omap_voltage_register_pmic(struct voltagedomain *voltdm, struct omap_voltdm_pmic *pmic) {if (!voltdm ||IS_ERR (voltdm)) { -pr_warning ("%s: VDD specified does not exist!\n" , __func__); +pr_warn ("%s: VDD specified does not exist!\n" , __func__);return -EINVAL ; }
@@ -237,7 +237,7 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm, int voltscale_method) {if (!voltdm ||IS_ERR (voltdm)) { -pr_warning ("%s: VDD specified does not exist!\n" , __func__); +pr_warn ("%s: VDD specified does not exist!\n" , __func__);return ; }
@@ -279,7 +279,7 @@ int __init omap_voltage_late_init(void) sys_ck =clk_get (NULL , voltdm->sys_clk.name);if (IS_ERR (sys_ck)) { -pr_warning ("%s: Could not get sys clk.\n" , __func__); +pr_warn ("%s: Could not get sys clk.\n" , __func__);return -EINVAL ; } voltdm->sys_clk.rate =clk_get_rate (sys_ck);
arch/arm/mach-omap2/wd_timer.c +2 -2
@@ -93,8 +93,8 @@ int omap2_wd_timer_reset(struct omap_hwmod *oh)udelay (oh->class->sysc->srst_udelay);if (c ==MAX_MODULE_SOFTRESET_WAIT ) -pr_warning ("%s: %s: softreset failed (waited %d usec)\n" , - __func__, oh->name,MAX_MODULE_SOFTRESET_WAIT ); +pr_warn ("%s: %s: softreset failed (waited %d usec)\n" , + __func__, oh->name,MAX_MODULE_SOFTRESET_WAIT );else pr_debug ("%s: %s: softreset in %d usec\n" , __func__, oh->name, c);
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Tony Lindgren
maintainerRe: [PATCH 5/8] arm: mach-omap2: Convert pr_warning to pr_warn
Quoted 5 lines · Joe Perches
Use the more common
pr_warn.Other miscellanea:
o Realign arguments
Thanks I'll apply this into omap-for-v3.18/cleanup.
Regards,
Tony
PATCH 6/8 arm: mach-orion5x: Convert pr_warning to pr_warn
In reply to Joe PerchesUse the more common pr_warn.
Other miscellanea:
o Realign arguments
--- arch/arm/mach-orion5x/dns323-setup.c | 8 ++++---- arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- arch/arm/mach-orion5x/ts209-setup.c | 2 +- arch/arm/mach-orion5x/ts409-setup.c | 2 +- arch/arm/mach-orion5x/ts78xx-setup.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-orion5x/dns323-setup.c +4 -4
@@ -550,7 +550,7 @@ static int __init dns323_identify_rev(void)break ; }if (i >=1000 ) { -pr_warning ("DNS-323: Timeout accessing PHY, assuming rev B1\n" ); +pr_warn ("DNS-323: Timeout accessing PHY, assuming rev B1\n" );return DNS323_REV_B1 ; } writel((3 << 21) /* phy ID reg */ |
@@ -562,7 +562,7 @@ static int __init dns323_identify_rev(void)break ; }if (i >=1000 ) { -pr_warning ("DNS-323: Timeout reading PHY, assuming rev B1\n" ); +pr_warn ("DNS-323: Timeout reading PHY, assuming rev B1\n" );return DNS323_REV_B1 ; }pr_debug ("DNS-323: Ethernet PHY ID 0x%x\n" , reg &0xffff );
@@ -577,8 +577,8 @@ static int __init dns323_identify_rev(void)case 0x0e10 :/* MV88E1118 */ return DNS323_REV_C1 ;default : -pr_warning ("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n" , - reg &0xffff ); +pr_warn ("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n" , + reg &0xffff ); }return DNS323_REV_B1 ; }
arch/arm/mach-orion5x/terastation_pro2-setup.c +1 -1
@@ -349,7 +349,7 @@ static void __init tsp2_init(void)gpio_free (TSP2_RTC_GPIO ); }if (tsp2_i2c_rtc.irq ==0 ) -pr_warning ("tsp2_init: failed to get RTC IRQ\n" ); +pr_warn ("tsp2_init: failed to get RTC IRQ\n" );i2c_register_board_info (0 , &tsp2_i2c_rtc,1 );/* register Terastation Pro II specific power-off method */
arch/arm/mach-orion5x/ts209-setup.c +1 -1
@@ -314,7 +314,7 @@ static void __init qnap_ts209_init(void)gpio_free (TS209_RTC_GPIO ); }if (qnap_ts209_i2c_rtc.irq ==0 ) -pr_warning ("qnap_ts209_init: failed to get RTC IRQ\n" ); +pr_warn ("qnap_ts209_init: failed to get RTC IRQ\n" );i2c_register_board_info (0 , &qnap_ts209_i2c_rtc,1 );/* register tsx09 specific power-off method */
arch/arm/mach-orion5x/ts409-setup.c +1 -1
@@ -302,7 +302,7 @@ static void __init qnap_ts409_init(void)gpio_free (TS409_RTC_GPIO ); }if (qnap_ts409_i2c_rtc.irq ==0 ) -pr_warning ("qnap_ts409_init: failed to get RTC IRQ\n" ); +pr_warn ("qnap_ts409_init: failed to get RTC IRQ\n" );i2c_register_board_info (0 , &qnap_ts409_i2c_rtc,1 );platform_device_register (&ts409_leds);
arch/arm/mach-orion5x/ts78xx-setup.c +2 -2
@@ -403,8 +403,8 @@ static void ts78xx_fpga_supports(void)/* enable devices if magic matches */ switch ((ts78xx_fpga.id >>8 ) &0xffffff ) {case TS7800_FPGA_MAGIC : -pr_warning ("unrecognised FPGA revision 0x%.2x\n" , - ts78xx_fpga.id &0xff ); +pr_warn ("unrecognised FPGA revision 0x%.2x\n" , + ts78xx_fpga.id &0xff ); ts78xx_fpga.supports.ts_rtc.present =1 ; ts78xx_fpga.supports.ts_nand.present =1 ; ts78xx_fpga.supports.ts_rng.present =1 ;
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Re: [PATCH 6/8] arm: mach-orion5x: Convert pr_warning to pr_warn
Quoted 7 lines · Joe Perches
Use the more common
pr_warn.Other miscellanea:
o Realign arguments
Signed-off-by Joe Perches <[email protected]>
Andrew
Quoted 98 lines
--- arch/arm/mach-orion5x/dns323-setup.c | 8 ++++---- arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- arch/arm/mach-orion5x/ts209-setup.c | 2 +- arch/arm/mach-orion5x/ts409-setup.c | 2 +- arch/arm/mach-orion5x/ts78xx-setup.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)arch/arm/mach-orion5x/dns323-setup.c +4
-4@@ -550,7 +550,7 @@ static int __init dns323_identify_rev(void)break ; }if (i >=1000 ) { -pr_warning ("DNS-323: Timeout accessing PHY, assuming rev B1\n" ); +pr_warn ("DNS-323: Timeout accessing PHY, assuming rev B1\n" );return DNS323_REV_B1 ; } writel((3 << 21) /* phy ID reg */ |@@ -562,7 +562,7 @@ static int __init dns323_identify_rev(void)break ; }if (i >=1000 ) { -pr_warning ("DNS-323: Timeout reading PHY, assuming rev B1\n" ); +pr_warn ("DNS-323: Timeout reading PHY, assuming rev B1\n" );return DNS323_REV_B1 ; }pr_debug ("DNS-323: Ethernet PHY ID 0x%x\n" , reg &0xffff );@@ -577,8 +577,8 @@ static int __init dns323_identify_rev(void)case 0x0e10 :/* MV88E1118 */ return DNS323_REV_C1 ;default : -pr_warning ("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n" , - reg &0xffff ); +pr_warn ("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n" , + reg &0xffff ); }return DNS323_REV_B1 ; }arch/arm/mach-orion5x/terastation_pro2-setup.c +1
-1@@ -349,7 +349,7 @@ static void __init tsp2_init(void)gpio_free (TSP2_RTC_GPIO ); }if (tsp2_i2c_rtc.irq ==0 ) -pr_warning ("tsp2_init: failed to get RTC IRQ\n" ); +pr_warn ("tsp2_init: failed to get RTC IRQ\n" );i2c_register_board_info (0 , &tsp2_i2c_rtc,1 );/* register Terastation Pro II specific power-off method */ arch/arm/mach-orion5x/ts209-setup.c +1
-1@@ -314,7 +314,7 @@ static void __init qnap_ts209_init(void)gpio_free (TS209_RTC_GPIO ); }if (qnap_ts209_i2c_rtc.irq ==0 ) -pr_warning ("qnap_ts209_init: failed to get RTC IRQ\n" ); +pr_warn ("qnap_ts209_init: failed to get RTC IRQ\n" );i2c_register_board_info (0 , &qnap_ts209_i2c_rtc,1 );/* register tsx09 specific power-off method */ arch/arm/mach-orion5x/ts409-setup.c +1
-1@@ -302,7 +302,7 @@ static void __init qnap_ts409_init(void)gpio_free (TS409_RTC_GPIO ); }if (qnap_ts409_i2c_rtc.irq ==0 ) -pr_warning ("qnap_ts409_init: failed to get RTC IRQ\n" ); +pr_warn ("qnap_ts409_init: failed to get RTC IRQ\n" );i2c_register_board_info (0 , &qnap_ts409_i2c_rtc,1 );platform_device_register (&ts409_leds);arch/arm/mach-orion5x/ts78xx-setup.c +2
-2@@ -403,8 +403,8 @@ static void ts78xx_fpga_supports(void)/* enable devices if magic matches */ switch ((ts78xx_fpga.id >>8 ) &0xffffff ) {case TS7800_FPGA_MAGIC : -pr_warning ("unrecognised FPGA revision 0x%.2x\n" , - ts78xx_fpga.id &0xff ); +pr_warn ("unrecognised FPGA revision 0x%.2x\n" , + ts78xx_fpga.id &0xff ); ts78xx_fpga.supports.ts_rtc.present =1 ; ts78xx_fpga.supports.ts_nand.present =1 ; ts78xx_fpga.supports.ts_rng.present =1 ;Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Jason Cooper
AppliedRe: [PATCH 6/8] arm: mach-orion5x: Convert pr_warning to pr_warn
In reply to Joe PerchesJoe,
Quoted 6 lines · Joe Perches
Use the more common
pr_warn.Other miscellanea:
o Realign arguments
Quoted 8 lines
Signed-off-by Joe Perches <[email protected]>--- arch/arm/mach-orion5x/dns323-setup.c | 8 ++++---- arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- arch/arm/mach-orion5x/ts209-setup.c | 2 +- arch/arm/mach-orion5x/ts409-setup.c | 2 +- arch/arm/mach-orion5x/ts78xx-setup.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-)
Applied to mvebu/soc with Andrew's Ack.
thx,
Jason.
PATCH 7/8 arm: mach-pxa: Convert pr_warning to pr_warn
In reply to Joe PerchesUse the more common pr_warn.
Other miscellanea:
o Coalesce formats
o Realign arguments
--- arch/arm/mach-pxa/em-x270.c | 4 ++-- arch/arm/mach-pxa/gumstix.c | 3 +-- arch/arm/mach-pxa/mfp-pxa2xx.c | 12 +++++------- arch/arm/mach-pxa/poodle.c | 2 +- arch/arm/mach-pxa/pxa3xx-ulpi.c | 6 +++--- arch/arm/mach-pxa/raumfeld.c | 26 +++++++++++++------------- 6 files changed, 25 insertions(+), 28 deletions(-)
arch/arm/mach-pxa/em-x270.c +2 -2
@@ -378,7 +378,7 @@ static void __init em_x270_init_nand(void) err =gpio_request (GPIO11_NAND_CS ,"NAND CS" );if (err) { -pr_warning ("EM-X270: failed to request NAND CS gpio\n" ); +pr_warn ("EM-X270: failed to request NAND CS gpio\n" );return ; }
@@ -386,7 +386,7 @@ static void __init em_x270_init_nand(void) err =gpio_request (nand_rb,"NAND R/B" );if (err) { -pr_warning ("EM-X270: failed to request NAND R/B gpio\n" ); +pr_warn ("EM-X270: failed to request NAND R/B gpio\n" );gpio_free (GPIO11_NAND_CS );return ; }
arch/arm/mach-pxa/gumstix.c +1 -2
@@ -140,8 +140,7 @@ static void gumstix_setup_bt_clock(void)int timeout =500 ;if (!(OSCC &OSCC_OOK )) -pr_warning ("32kHz clock was not on. Bootloader may need to " -"be updated\n" ); +pr_warn ("32kHz clock was not on. Bootloader may need to be updated\n" );else return ;
arch/arm/mach-pxa/mfp-pxa2xx.c +5 -7
@@ -93,8 +93,8 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)break ;default :/* warning and fall through, treat as MFP_LPM_DEFAULT */ -pr_warning ("%s: GPIO%d: unsupported low power mode\n" , - __func__, gpio); +pr_warn ("%s: GPIO%d: unsupported low power mode\n" , + __func__, gpio);break ; }
@@ -107,14 +107,12 @@ static int __mfp_config_gpio(unsigned gpio, unsigned long c)* configurations of those pins not able to wakeup */ if ((c &MFP_LPM_CAN_WAKEUP ) && !gpio_desc[gpio].can_wakeup) { -pr_warning ("%s: GPIO%d unable to wakeup\n" , - __func__, gpio); +pr_warn ("%s: GPIO%d unable to wakeup\n" , __func__, gpio);return -EINVAL ; }if ((c &MFP_LPM_CAN_WAKEUP ) && is_out) { -pr_warning ("%s: output GPIO%d unable to wakeup\n" , - __func__, gpio); +pr_warn ("%s: output GPIO%d unable to wakeup\n" , __func__, gpio);return -EINVAL ; }
@@ -126,7 +124,7 @@ static inline int __mfp_validate(int mfp)int gpio =mfp_to_gpio (mfp);if ((mfp >MFP_PIN_GPIO127 ) || !gpio_desc[gpio].valid) { -pr_warning ("%s: GPIO%d is invalid pin\n" , __func__, gpio); +pr_warn ("%s: GPIO%d is invalid pin\n" , __func__, gpio);return -1 ; }
arch/arm/mach-pxa/poodle.c +1 -1
@@ -446,7 +446,7 @@ static void __init poodle_init(void) ret =platform_add_devices (devices,ARRAY_SIZE (devices));if (ret) -pr_warning ("poodle: Unable to register LoCoMo device\n" ); +pr_warn ("poodle: Unable to register LoCoMo device\n" );pxa_set_fb_info (&poodle_locomo_device.dev, &poodle_fb_info);pxa_set_udc_info (&udc_info);
arch/arm/mach-pxa/pxa3xx-ulpi.c +3 -3
@@ -74,7 +74,7 @@ static int pxa310_ulpi_poll(void)cpu_relax (); } -pr_warning ("%s: ULPI access timed out!\n" , __func__); +pr_warn ("%s: ULPI access timed out!\n" , __func__);return -ETIMEDOUT ; }
@@ -84,7 +84,7 @@ static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)int err;if (pxa310_ulpi_get_phymode () !=SYNCH ) { -pr_warning ("%s: PHY is not in SYNCH mode!\n" , __func__); +pr_warn ("%s: PHY is not in SYNCH mode!\n" , __func__);return -EBUSY ; }
@@ -101,7 +101,7 @@ static int pxa310_ulpi_read(struct usb_phy *otg, u32 reg)static int pxa310_ulpi_write (struct usb_phy *otg,u32 val,u32 reg) {if (pxa310_ulpi_get_phymode () !=SYNCH ) { -pr_warning ("%s: PHY is not in SYNCH mode!\n" , __func__); +pr_warn ("%s: PHY is not in SYNCH mode!\n" , __func__);return -EBUSY ; }
arch/arm/mach-pxa/raumfeld.c +13 -13
@@ -521,7 +521,7 @@ static void __init raumfeld_w1_init(void) "W1 external pullup enable");if (ret <0 ) -pr_warning ("Unable to request GPIO_W1_PULLUP_ENABLE\n" ); +pr_warn ("Unable to request GPIO_W1_PULLUP_ENABLE\n" );else gpio_direction_output (GPIO_W1_PULLUP_ENABLE ,0 );
@@ -600,7 +600,7 @@ static void __init raumfeld_lcd_init(void) ret =gpio_request (GPIO_TFT_VA_EN ,"display VA enable" );if (ret <0 ) -pr_warning ("Unable to request GPIO_TFT_VA_EN\n" ); +pr_warn ("Unable to request GPIO_TFT_VA_EN\n" );else gpio_direction_output (GPIO_TFT_VA_EN ,1 );
@@ -608,7 +608,7 @@ static void __init raumfeld_lcd_init(void) ret =gpio_request (GPIO_DISPLAY_ENABLE ,"display enable" );if (ret <0 ) -pr_warning ("Unable to request GPIO_DISPLAY_ENABLE\n" ); +pr_warn ("Unable to request GPIO_DISPLAY_ENABLE\n" );else gpio_direction_output (GPIO_DISPLAY_ENABLE ,1 );
@@ -814,17 +814,17 @@ static void __init raumfeld_power_init(void)/* Set PEN2 high to enable maximum charge current */ ret =gpio_request (GPIO_CHRG_PEN2 ,"CHRG_PEN2" );if (ret <0 ) -pr_warning ("Unable to request GPIO_CHRG_PEN2\n" ); +pr_warn ("Unable to request GPIO_CHRG_PEN2\n" );else gpio_direction_output (GPIO_CHRG_PEN2 ,1 ); ret =gpio_request (GPIO_CHARGE_DC_OK ,"CABLE_DC_OK" );if (ret <0 ) -pr_warning ("Unable to request GPIO_CHARGE_DC_OK\n" ); +pr_warn ("Unable to request GPIO_CHARGE_DC_OK\n" ); ret =gpio_request (GPIO_CHARGE_USB_SUSP ,"CHARGE_USB_SUSP" );if (ret <0 ) -pr_warning ("Unable to request GPIO_CHARGE_USB_SUSP\n" ); +pr_warn ("Unable to request GPIO_CHARGE_USB_SUSP\n" );else gpio_direction_output (GPIO_CHARGE_USB_SUSP ,0 );
@@ -976,19 +976,19 @@ static void __init raumfeld_audio_init(void) ret =gpio_request (GPIO_CODEC_RESET ,"cs4270 reset" );if (ret <0 ) -pr_warning ("unable to request GPIO_CODEC_RESET\n" ); +pr_warn ("unable to request GPIO_CODEC_RESET\n" );else gpio_direction_output (GPIO_CODEC_RESET ,1 ); ret =gpio_request (GPIO_SPDIF_RESET ,"ak4104 s/pdif reset" );if (ret <0 ) -pr_warning ("unable to request GPIO_SPDIF_RESET\n" ); +pr_warn ("unable to request GPIO_SPDIF_RESET\n" );else gpio_direction_output (GPIO_SPDIF_RESET ,1 ); ret =gpio_request (GPIO_MCLK_RESET ,"MCLK reset" );if (ret <0 ) -pr_warning ("unable to request GPIO_MCLK_RESET\n" ); +pr_warn ("unable to request GPIO_MCLK_RESET\n" );else gpio_direction_output (GPIO_MCLK_RESET ,1 );
@@ -1019,20 +1019,20 @@ static void __init raumfeld_common_init(void) ret =gpio_request (GPIO_W2W_RESET ,"Wi2Wi reset" );if (ret <0 ) -pr_warning ("Unable to request GPIO_W2W_RESET\n" ); +pr_warn ("Unable to request GPIO_W2W_RESET\n" );else gpio_direction_output (GPIO_W2W_RESET ,0 ); ret =gpio_request (GPIO_W2W_PDN ,"Wi2Wi powerup" );if (ret <0 ) -pr_warning ("Unable to request GPIO_W2W_PDN\n" ); +pr_warn ("Unable to request GPIO_W2W_PDN\n" );else gpio_direction_output (GPIO_W2W_PDN ,0 );/* this can be used to switch off the device */ ret =gpio_request (GPIO_SHUTDOWN_SUPPLY ,"supply shutdown" );if (ret <0 ) -pr_warning ("Unable to request GPIO_SHUTDOWN_SUPPLY\n" ); +pr_warn ("Unable to request GPIO_SHUTDOWN_SUPPLY\n" );else gpio_direction_output (GPIO_SHUTDOWN_SUPPLY ,0 );
@@ -1051,7 +1051,7 @@ static void __init raumfeld_controller_init(void) ret =gpio_request (GPIO_SHUTDOWN_BATT ,"battery shutdown" );if (ret <0 ) -pr_warning ("Unable to request GPIO_SHUTDOWN_BATT\n" ); +pr_warn ("Unable to request GPIO_SHUTDOWN_BATT\n" );else gpio_direction_output (GPIO_SHUTDOWN_BATT ,0 );
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Re: [PATCH 7/8] arm: mach-pxa: Convert pr_warning to pr_warn
Quoted 8 lines · Joe Perches
Use the more common
pr_warn.Other miscellanea:
o Coalesce formats
o Realign argumentsSigned-off-by Joe Perches <[email protected]>
Applied to pxa/cleanup branch, thanks.
--
Robert
PATCH 8/8 arm: mach-u300: Convert pr_warning to pr_warn
In reply to Joe PerchesUse the more common pr_warn.
Other miscellanea:
o Coalesce formats
o Realign arguments
o typo fixes of Siple to Simple
--- arch/arm/mach-u300/dummyspichip.c | 65 +++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 36 deletions(-)
arch/arm/mach-u300/dummyspichip.c +29 -36
@@ -80,8 +80,8 @@ static ssize_t dummy_looptest(struct device *dev, "in 8bit mode\n"); status =spi_w8r8 (spi,0xAA );if (status <0 ) -pr_warning ("Siple test 1: FAILURE: spi_write_then_read " -"failed with status %d\n" , status); +pr_warn ("Simple test 1: FAILURE: spi_write_then_read failed with status %d\n" , + status);else pr_info ("Simple test 1: SUCCESS!\n" );
@@ -89,8 +89,8 @@ static ssize_t dummy_looptest(struct device *dev, "in 8bit mode (full FIFO)\n"); status =spi_write_then_read (spi, &txbuf[0 ],8 , &rxbuf[0 ],8 );if (status <0 ) -pr_warning ("Simple test 2: FAILURE: spi_write_then_read() " -"failed with status %d\n" , status); +pr_warn ("Simple test 2: FAILURE: spi_write_then_read() failed with status %d\n" , + status);else pr_info ("Simple test 2: SUCCESS!\n" );
@@ -98,8 +98,8 @@ static ssize_t dummy_looptest(struct device *dev, "in 8bit mode (see if we overflow FIFO)\n"); status =spi_write_then_read (spi, &txbuf[0 ],14 , &rxbuf[0 ],14 );if (status <0 ) -pr_warning ("Simple test 3: FAILURE: failed with status %d " -"(probably FIFO overrun)\n" , status); +pr_warn ("Simple test 3: FAILURE: failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 3: SUCCESS!\n" );
@@ -107,14 +107,14 @@ static ssize_t dummy_looptest(struct device *dev, "bytes garbage with spi_read() in 8bit mode\n"); status =spi_write (spi, &txbuf[0 ],8 );if (status <0 ) -pr_warning ("Simple test 4 step 1: FAILURE: spi_write() " -"failed with status %d\n" , status); +pr_warn ("Simple test 4 step 1: FAILURE: spi_write() failed with status %d\n" , + status);else pr_info ("Simple test 4 step 1: SUCCESS!\n" ); status =spi_read (spi, &rxbuf[0 ],8 );if (status <0 ) -pr_warning ("Simple test 4 step 2: FAILURE: spi_read() " -"failed with status %d\n" , status); +pr_warn ("Simple test 4 step 2: FAILURE: spi_read() failed with status %d\n" , + status);else pr_info ("Simple test 4 step 2: SUCCESS!\n" );
@@ -122,16 +122,14 @@ static ssize_t dummy_looptest(struct device *dev, "14 bytes garbage with spi_read() in 8bit mode\n"); status =spi_write (spi, &txbuf[0 ],14 );if (status <0 ) -pr_warning ("Simple test 5 step 1: FAILURE: spi_write() " -"failed with status %d (probably FIFO overrun)\n" , - status); +pr_warn ("Simple test 5 step 1: FAILURE: spi_write() failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 5 step 1: SUCCESS!\n" ); status =spi_read (spi, &rxbuf[0 ],14 );if (status <0 ) -pr_warning ("Simple test 5 step 2: FAILURE: spi_read() " -"failed with status %d (probably FIFO overrun)\n" , - status); +pr_warn ("Simple test 5 step 2: FAILURE: spi_read() failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 5: SUCCESS!\n" );
@@ -140,16 +138,14 @@ static ssize_t dummy_looptest(struct device *dev, DMA_TEST_SIZE, DMA_TEST_SIZE); status =spi_write (spi, &bigtxbuf_virtual[0 ],DMA_TEST_SIZE );if (status <0 ) -pr_warning ("Simple test 6 step 1: FAILURE: spi_write() " -"failed with status %d (probably FIFO overrun)\n" , - status); +pr_warn ("Simple test 6 step 1: FAILURE: spi_write() failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 6 step 1: SUCCESS!\n" ); status =spi_read (spi, &bigrxbuf_virtual[0 ],DMA_TEST_SIZE );if (status <0 ) -pr_warning ("Simple test 6 step 2: FAILURE: spi_read() " -"failed with status %d (probably FIFO overrun)\n" , - status); +pr_warn ("Simple test 6 step 2: FAILURE: spi_read() failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 6: SUCCESS!\n" );
@@ -169,18 +165,17 @@ static ssize_t dummy_looptest(struct device *dev,pr_info ("Simple test 7: SUCCESS! (expected failure with " "status EIO)\n" ); else if (status < 0) - pr_warning("Siple test 7: FAILURE: spi_write_then_read " - "failed with status %d\n", status); + pr_warn("Simple test 7: FAILURE: spi_write_then_read failed with status %d\n", + status); else - pr_warning("Siple test 7: FAILURE: spi_write_then_read " - "succeeded but it was expected to fail!\n"); + pr_warn("Simple test 7: FAILURE: spi_write_then_read succeeded but it was expected to fail!\n");pr_info ("Simple test 8: write 8 bytes, read back 8 bytes garbage " "in 16bit mode (full FIFO)\n" ); status =spi_write_then_read (spi, &txbuf[0 ],8 , &rxbuf[0 ],8 );if (status <0 ) -pr_warning ("Simple test 8: FAILURE: spi_write_then_read() " -"failed with status %d\n" , status); +pr_warn ("Simple test 8: FAILURE: spi_write_then_read() failed with status %d\n" , + status);else pr_info ("Simple test 8: SUCCESS!\n" );
@@ -188,8 +183,8 @@ static ssize_t dummy_looptest(struct device *dev, "in 16bit mode (see if we overflow FIFO)\n"); status =spi_write_then_read (spi, &txbuf[0 ],14 , &rxbuf[0 ],14 );if (status <0 ) -pr_warning ("Simple test 9: FAILURE: failed with status %d " -"(probably FIFO overrun)\n" , status); +pr_warn ("Simple test 9: FAILURE: failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 9: SUCCESS!\n" );
@@ -198,17 +193,15 @@ static ssize_t dummy_looptest(struct device *dev, DMA_TEST_SIZE, DMA_TEST_SIZE); status =spi_write (spi, &bigtxbuf_virtual[0 ],DMA_TEST_SIZE );if (status <0 ) -pr_warning ("Simple test 10 step 1: FAILURE: spi_write() " -"failed with status %d (probably FIFO overrun)\n" , - status); +pr_warn ("Simple test 10 step 1: FAILURE: spi_write() failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 10 step 1: SUCCESS!\n" ); status =spi_read (spi, &bigrxbuf_virtual[0 ],DMA_TEST_SIZE );if (status <0 ) -pr_warning ("Simple test 10 step 2: FAILURE: spi_read() " -"failed with status %d (probably FIFO overrun)\n" , - status); +pr_warn ("Simple test 10 step 2: FAILURE: spi_read() failed with status %d (probably FIFO overrun)\n" , + status);else pr_info ("Simple test 10: SUCCESS!\n" );
Signature · 1 line
1.8.1.2.459.gbcd45b4.dirty
Re: [PATCH 8/8] arm: mach-u300: Convert pr_warning to pr_warn
Quoted 9 lines · Joe Perches
Use the more common
pr_warn.Other miscellanea:
o Coalesce formats
o Realign arguments
o typo fixes of Siple to SimpleSigned-off-by Joe Perches <[email protected]>
Patch applied.
Yours,
Linus Walleij