lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-ID: <20140913191612.GB24502@lunn.ch> Date: Sat, 13 Sep 2014 21:16:12 +0200 From: Andrew Lunn <andrew@...n.ch> To: Joe Perches <joe@...ches.com> Cc: linux-arm-kernel@...ts.infradead.org, Jason Cooper <jason@...edaemon.net>, Andrew Lunn <andrew@...n.ch>, Sebastian Hesselbarth <sebastian.hesselbarth@...il.com>, Russell King <linux@....linux.org.uk>, Alexander Clouter <alex@...riz.org.uk>, linux-kernel@...r.kernel.org Subject: Re: [PATCH 6/8] arm: mach-orion5x: Convert pr_warning to pr_warn On Sat, Sep 13, 2014 at 11:31:17AM -0700, Joe Perches wrote: > Use the more common pr_warn. > > Other miscellanea: > > o Realign arguments > > Signed-off-by: Joe Perches <joe@...ches.com> Acked-by: Andrew Lunn <andrew@...n.ch> Andrew > --- > 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(-) > > diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c > index 56edeab..09d2a26 100644 > --- a/arch/arm/mach-orion5x/dns323-setup.c > +++ b/arch/arm/mach-orion5x/dns323-setup.c > @@ -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; > } > diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c > index 6208d12..1208674 100644 > --- a/arch/arm/mach-orion5x/terastation_pro2-setup.c > +++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c > @@ -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 */ > diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c > index 9136797..c725b7c 100644 > --- a/arch/arm/mach-orion5x/ts209-setup.c > +++ b/arch/arm/mach-orion5x/ts209-setup.c > @@ -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 */ > diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c > index 5c079d31..cf2ab53 100644 > --- a/arch/arm/mach-orion5x/ts409-setup.c > +++ b/arch/arm/mach-orion5x/ts409-setup.c > @@ -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); > > diff --git a/arch/arm/mach-orion5x/ts78xx-setup.c b/arch/arm/mach-orion5x/ts78xx-setup.c > index db16dae..1b704d3 100644 > --- a/arch/arm/mach-orion5x/ts78xx-setup.c > +++ b/arch/arm/mach-orion5x/ts78xx-setup.c > @@ -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; > -- > 1.8.1.2.459.gbcd45b4.dirty > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists