linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
@ 2017-02-17  7:11 Joe Perches
  2017-02-17  7:11 ` [PATCH 01/35] alpha: Convert remaining uses of " Joe Perches
                   ` (36 more replies)
  0 siblings, 37 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Alexander Shishkin, Karol Herbst, Pekka Paalanen,
	Richard Weinberger, Fabio Estevam, linux-kernel,
	linux-arm-kernel, linuxppc-dev, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel, linux-acpi, drbd-dev,
	virtualization, linux-crypto, linux-ide, gigaset307x-common,
	linux-media, linux-omap, linux-mtd, devicetree, acpi4asus-user,
	platform-driver-x86, linux-scsi, linux-fbdev, alsa-devel
  Cc: linux-alpha, adi-buildroot-devel, linux-ia64, linux-sh,
	sparclinux, amd-gfx, dri-devel, linux-input, netdev

There are ~4300 uses of pr_warn and ~250 uses of the older
pr_warning in the kernel source tree.

Make the use of pr_warn consistent across all kernel files.

This excludes all files in tools/ as there is a separate
define pr_warning for that directory tree and pr_warn is
not used in tools/.

Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.

Miscellanea:

o Coalesce formats and realign arguments

Some files not compiled - no cross-compilers

Joe Perches (35):
  alpha: Convert remaining uses of pr_warning to pr_warn
  ARM: ep93xx: Convert remaining uses of pr_warning to pr_warn
  arm64: Convert remaining uses of pr_warning to pr_warn
  arch/blackfin: Convert remaining uses of pr_warning to pr_warn
  ia64: Convert remaining use of pr_warning to pr_warn
  powerpc: Convert remaining uses of pr_warning to pr_warn
  sh: Convert remaining uses of pr_warning to pr_warn
  sparc: Convert remaining use of pr_warning to pr_warn
  x86: Convert remaining uses of pr_warning to pr_warn
  drivers/acpi: Convert remaining uses of pr_warning to pr_warn
  block/drbd: Convert remaining uses of pr_warning to pr_warn
  gdrom: Convert remaining uses of pr_warning to pr_warn
  drivers/char: Convert remaining use of pr_warning to pr_warn
  clocksource: Convert remaining use of pr_warning to pr_warn
  drivers/crypto: Convert remaining uses of pr_warning to pr_warn
  fmc: Convert remaining use of pr_warning to pr_warn
  drivers/gpu: Convert remaining uses of pr_warning to pr_warn
  drivers/ide: Convert remaining uses of pr_warning to pr_warn
  drivers/input: Convert remaining uses of pr_warning to pr_warn
  drivers/isdn: Convert remaining uses of pr_warning to pr_warn
  drivers/macintosh: Convert remaining uses of pr_warning to pr_warn
  drivers/media: Convert remaining use of pr_warning to pr_warn
  drivers/mfd: Convert remaining uses of pr_warning to pr_warn
  drivers/mtd: Convert remaining uses of pr_warning to pr_warn
  drivers/of: Convert remaining uses of pr_warning to pr_warn
  drivers/oprofile: Convert remaining uses of pr_warning to pr_warn
  drivers/platform: Convert remaining uses of pr_warning to pr_warn
  drivers/rapidio: Convert remaining use of pr_warning to pr_warn
  drivers/scsi: Convert remaining use of pr_warning to pr_warn
  drivers/sh: Convert remaining use of pr_warning to pr_warn
  drivers/tty: Convert remaining uses of pr_warning to pr_warn
  drivers/video: Convert remaining uses of pr_warning to pr_warn
  kernel/trace: Convert remaining uses of pr_warning to pr_warn
  lib: Convert remaining uses of pr_warning to pr_warn
  sound/soc: Convert remaining uses of pr_warning to pr_warn

 arch/alpha/kernel/perf_event.c                     |  4 +-
 arch/arm/mach-ep93xx/core.c                        |  4 +-
 arch/arm64/include/asm/syscall.h                   |  8 ++--
 arch/arm64/kernel/hw_breakpoint.c                  |  8 ++--
 arch/arm64/kernel/smp.c                            |  4 +-
 arch/blackfin/kernel/nmi.c                         |  2 +-
 arch/blackfin/kernel/ptrace.c                      |  2 +-
 arch/blackfin/mach-bf533/boards/stamp.c            |  2 +-
 arch/blackfin/mach-bf537/boards/cm_bf537e.c        |  2 +-
 arch/blackfin/mach-bf537/boards/cm_bf537u.c        |  2 +-
 arch/blackfin/mach-bf537/boards/stamp.c            |  2 +-
 arch/blackfin/mach-bf537/boards/tcm_bf537.c        |  2 +-
 arch/blackfin/mach-bf561/boards/cm_bf561.c         |  2 +-
 arch/blackfin/mach-bf561/boards/ezkit.c            |  2 +-
 arch/blackfin/mm/isram-driver.c                    |  4 +-
 arch/ia64/kernel/setup.c                           |  6 +--
 arch/powerpc/kernel/pci-common.c                   |  4 +-
 arch/powerpc/mm/init_64.c                          |  5 +--
 arch/powerpc/mm/mem.c                              |  3 +-
 arch/powerpc/platforms/512x/mpc512x_shared.c       |  4 +-
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c    |  7 ++--
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c         |  2 +-
 arch/powerpc/platforms/pasemi/dma_lib.c            |  4 +-
 arch/powerpc/platforms/powernv/opal.c              |  8 ++--
 arch/powerpc/platforms/powernv/pci-ioda.c          | 10 ++---
 arch/powerpc/platforms/ps3/device-init.c           | 14 +++----
 arch/powerpc/platforms/ps3/mm.c                    |  4 +-
 arch/powerpc/platforms/ps3/os-area.c               |  2 +-
 arch/powerpc/platforms/pseries/iommu.c             |  8 ++--
 arch/powerpc/platforms/pseries/setup.c             |  4 +-
 arch/powerpc/sysdev/fsl_pci.c                      |  9 ++---
 arch/powerpc/sysdev/mpic.c                         | 10 ++---
 arch/powerpc/sysdev/xics/icp-native.c              | 10 ++---
 arch/powerpc/sysdev/xics/ics-opal.c                |  4 +-
 arch/powerpc/sysdev/xics/ics-rtas.c                |  4 +-
 arch/powerpc/sysdev/xics/xics-common.c             |  8 ++--
 arch/sh/boards/mach-sdk7786/nmi.c                  |  2 +-
 arch/sh/drivers/pci/fixups-sdk7786.c               |  2 +-
 arch/sh/kernel/io_trapped.c                        |  2 +-
 arch/sh/kernel/setup.c                             |  2 +-
 arch/sh/mm/consistent.c                            |  5 +--
 arch/sparc/kernel/smp_64.c                         |  5 +--
 arch/x86/kernel/amd_gart_64.c                      | 12 ++----
 arch/x86/kernel/apic/apic.c                        | 46 ++++++++++------------
 arch/x86/kernel/apic/apic_noop.c                   |  2 +-
 arch/x86/kernel/setup_percpu.c                     |  4 +-
 arch/x86/kernel/tboot.c                            | 15 ++++---
 arch/x86/kernel/tsc_sync.c                         |  8 ++--
 arch/x86/mm/kmmio.c                                |  8 ++--
 arch/x86/mm/mmio-mod.c                             |  5 +--
 arch/x86/mm/numa.c                                 | 12 +++---
 arch/x86/mm/numa_emulation.c                       |  6 +--
 arch/x86/mm/testmmiotrace.c                        |  5 +--
 arch/x86/oprofile/op_x86_model.h                   |  6 +--
 arch/x86/platform/olpc/olpc-xo15-sci.c             |  2 +-
 arch/x86/platform/sfi/sfi.c                        |  3 +-
 arch/x86/xen/debugfs.c                             |  2 +-
 arch/x86/xen/setup.c                               |  2 +-
 drivers/acpi/apei/apei-base.c                      | 32 +++++++--------
 drivers/acpi/apei/einj.c                           |  4 +-
 drivers/acpi/apei/erst-dbg.c                       |  4 +-
 drivers/acpi/apei/ghes.c                           | 30 +++++++-------
 drivers/acpi/apei/hest.c                           | 10 ++---
 drivers/acpi/resource.c                            |  4 +-
 drivers/block/drbd/drbd_nl.c                       | 13 +++---
 drivers/cdrom/gdrom.c                              |  4 +-
 drivers/char/virtio_console.c                      |  2 +-
 drivers/clocksource/samsung_pwm_timer.c            |  4 +-
 drivers/crypto/n2_core.c                           | 12 +++---
 drivers/fmc/fmc-fakedev.c                          |  2 +-
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c   |  2 +-
 drivers/gpu/drm/amd/powerplay/inc/pp_debug.h       |  2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c    |  4 +-
 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 14 +++----
 .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c   |  4 +-
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c   |  4 +-
 drivers/ide/tx4938ide.c                            |  2 +-
 drivers/ide/tx4939ide.c                            |  5 +--
 drivers/input/gameport/gameport.c                  |  4 +-
 drivers/input/joystick/gamecon.c                   |  3 +-
 drivers/input/misc/apanel.c                        |  3 +-
 drivers/input/misc/xen-kbdfront.c                  |  8 ++--
 drivers/input/serio/serio.c                        |  8 ++--
 drivers/isdn/gigaset/interface.c                   |  2 +-
 drivers/isdn/hardware/mISDN/avmfritz.c             | 17 ++++----
 drivers/isdn/hardware/mISDN/hfcmulti.c             |  8 ++--
 drivers/isdn/hardware/mISDN/hfcpci.c               |  4 +-
 drivers/isdn/hardware/mISDN/hfcsusb.c              |  4 +-
 drivers/isdn/hardware/mISDN/mISDNipac.c            |  4 +-
 drivers/isdn/hardware/mISDN/mISDNisar.c            | 10 ++---
 drivers/isdn/hardware/mISDN/netjet.c               |  8 ++--
 drivers/isdn/hardware/mISDN/w6692.c                | 12 +++---
 drivers/isdn/mISDN/hwchannel.c                     |  8 ++--
 drivers/macintosh/windfarm_fcu_controls.c          |  5 +--
 drivers/macintosh/windfarm_lm87_sensor.c           |  4 +-
 drivers/macintosh/windfarm_pm72.c                  | 22 +++++------
 drivers/macintosh/windfarm_rm31.c                  |  6 +--
 drivers/media/platform/sh_vou.c                    |  4 +-
 drivers/mfd/db8500-prcmu.c                         |  2 +-
 drivers/mfd/sta2x11-mfd.c                          |  4 +-
 drivers/mfd/twl4030-power.c                        |  7 +---
 drivers/mtd/chips/cfi_cmdset_0002.c                | 12 ++++--
 drivers/mtd/nand/cmx270_nand.c                     |  4 +-
 drivers/mtd/ofpart.c                               |  4 +-
 drivers/of/fdt.c                                   | 20 +++++-----
 drivers/oprofile/oprofile_perf.c                   |  8 ++--
 drivers/platform/x86/asus-laptop.c                 |  2 +-
 drivers/platform/x86/eeepc-laptop.c                |  2 +-
 drivers/platform/x86/intel_oaktrail.c              | 10 ++---
 drivers/rapidio/rio-sysfs.c                        |  4 +-
 drivers/scsi/a3000.c                               |  2 +-
 drivers/sh/intc/core.c                             |  4 +-
 drivers/tty/hvc/hvcs.c                             |  2 +-
 drivers/tty/tty_io.c                               |  4 +-
 drivers/video/fbdev/aty/radeon_base.c              |  4 +-
 drivers/video/fbdev/core/fbmon.c                   |  4 +-
 drivers/video/fbdev/pxafb.c                        |  7 ++--
 kernel/trace/trace_benchmark.c                     |  4 +-
 lib/cpu_rmap.c                                     |  2 +-
 lib/dma-debug.c                                    |  2 +-
 sound/soc/fsl/imx-audmux.c                         |  6 +--
 sound/soc/samsung/s3c-i2s-v2.c                     |  6 +--
 122 files changed, 367 insertions(+), 397 deletions(-)

-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 01/35] alpha: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 02/35] ARM: ep93xx: " Joe Perches
                   ` (35 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Peter Zijlstra, Arnaldo Carvalho de Melo, Alexander Shishkin
  Cc: Richard Henderson, Ivan Kokshaysky, Matt Turner, linux-kernel,
	linux-alpha

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/alpha

Prior to this patch, there were 2 uses of pr_warning and
0 uses of pr_warn in arch/alpha

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/alpha/kernel/perf_event.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/alpha/kernel/perf_event.c b/arch/alpha/kernel/perf_event.c
index 5c218aa3f3df..06c118ab640b 100644
--- a/arch/alpha/kernel/perf_event.c
+++ b/arch/alpha/kernel/perf_event.c
@@ -828,7 +828,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
 	if (unlikely(la_ptr >= alpha_pmu->num_pmcs)) {
 		/* This should never occur! */
 		irq_err_count++;
-		pr_warning("PMI: silly index %ld\n", la_ptr);
+		pr_warn("PMI: silly index %ld\n", la_ptr);
 		wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);
 		return;
 	}
@@ -851,7 +851,7 @@ static void alpha_perf_event_irq_handler(unsigned long la_ptr,
 	if (unlikely(!event)) {
 		/* This should never occur! */
 		irq_err_count++;
-		pr_warning("PMI: No event at index %d!\n", idx);
+		pr_warn("PMI: No event at index %d!\n", idx);
 		wrperfmon(PERFMON_CMD_ENABLE, cpuc->idx_mask);
 		return;
 	}
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 02/35] ARM: ep93xx: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
  2017-02-17  7:11 ` [PATCH 01/35] alpha: Convert remaining uses of " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17 16:26   ` Hartley Sweeten
  2017-02-17  7:11 ` [PATCH 03/35] arm64: " Joe Perches
                   ` (34 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Hartley Sweeten, Ryan Mallon; +Cc: Russell King, linux-arm-kernel, linux-kernel

To enable eventual removal of pr_warning.

This makes pr_warn use consistent for arch/arm

Prior to this patch, there were 2 uses of pr_warning and
405 uses of pr_warn in arch/arm

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/arm/mach-ep93xx/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index c393b1b0310d..d6e907b6cc31 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -346,9 +346,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),
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 03/35] arm64: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
  2017-02-17  7:11 ` [PATCH 01/35] alpha: Convert remaining uses of " Joe Perches
  2017-02-17  7:11 ` [PATCH 02/35] ARM: ep93xx: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17 10:52   ` Mark Rutland
  2017-02-17  7:11 ` [PATCH 04/35] arch/blackfin: " Joe Perches
                   ` (33 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Will Deacon, Mark Rutland; +Cc: Catalin Marinas, linux-arm-kernel, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/arm64

Prior to this patch, there were 7 uses of pr_warning and
27 uses of pr_warn in arch/arm64

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/arm64/include/asm/syscall.h  | 8 ++++----
 arch/arm64/kernel/hw_breakpoint.c | 8 ++++----
 arch/arm64/kernel/smp.c           | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
index 709a574468f0..231f2c3fcf81 100644
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -68,8 +68,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]));
 	}
 
@@ -92,8 +92,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;
 	}
 
diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
index 0296e7924240..6fa79ffd0c43 100644
--- a/arch/arm64/kernel/hw_breakpoint.c
+++ b/arch/arm64/kernel/hw_breakpoint.c
@@ -62,7 +62,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;
 	}
 }
@@ -123,7 +123,7 @@ static u64 read_wb_reg(int reg, int n)
 	GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
 	GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_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;
@@ -138,7 +138,7 @@ static void write_wb_reg(int reg, int n, u64 val)
 	GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
 	GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_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();
 }
@@ -156,7 +156,7 @@ static enum dbg_active_el debug_exception_level(int privilege)
 	case AARCH64_BREAKPOINT_EL1:
 		return DBG_ACTIVE_EL1;
 	default:
-		pr_warning("invalid breakpoint privilege level %d\n", privilege);
+		pr_warn("invalid breakpoint privilege level %d\n", privilege);
 		return -EINVAL;
 	}
 }
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 827d52d78b67..9c396e34c090 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -925,8 +925,8 @@ void smp_send_stop(void)
 		udelay(1);
 
 	if (num_online_cpus() > 1)
-		pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
-			   cpumask_pr_args(cpu_online_mask));
+		pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
+			cpumask_pr_args(cpu_online_mask));
 }
 
 /*
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 04/35] arch/blackfin: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (2 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 03/35] arm64: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 05/35] ia64: Convert remaining use " Joe Perches
                   ` (32 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: Steven Miao, adi-buildroot-devel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/blackfin

Prior to this patch, there were 11 uses of pr_warning and
0 uses of pr_warn in arch/blackfin

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/blackfin/kernel/nmi.c                  | 2 +-
 arch/blackfin/kernel/ptrace.c               | 2 +-
 arch/blackfin/mach-bf533/boards/stamp.c     | 2 +-
 arch/blackfin/mach-bf537/boards/cm_bf537e.c | 2 +-
 arch/blackfin/mach-bf537/boards/cm_bf537u.c | 2 +-
 arch/blackfin/mach-bf537/boards/stamp.c     | 2 +-
 arch/blackfin/mach-bf537/boards/tcm_bf537.c | 2 +-
 arch/blackfin/mach-bf561/boards/cm_bf561.c  | 2 +-
 arch/blackfin/mach-bf561/boards/ezkit.c     | 2 +-
 arch/blackfin/mm/isram-driver.c             | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/blackfin/kernel/nmi.c b/arch/blackfin/kernel/nmi.c
index 9919d29287dc..bc837dc38998 100644
--- a/arch/blackfin/kernel/nmi.c
+++ b/arch/blackfin/kernel/nmi.c
@@ -126,7 +126,7 @@ static inline int nmi_wdt_set_timeout(unsigned long t)
 	max_t = -1 / sclk;
 	cnt = t * sclk;
 	if (t > max_t) {
-		pr_warning("NMI: timeout value is too large\n");
+		pr_warn("NMI: timeout value is too large\n");
 		return -EINVAL;
 	}
 
diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index 360d99645163..28dbbaf79896 100644
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -98,7 +98,7 @@ put_reg(struct task_struct *task, unsigned long regno, unsigned long data)
 		break;
 	case PT_SYSCFG:	/* don't let userspace screw with this */
 		if ((data & ~1) != 0x6)
-			pr_warning("ptrace: ignore syscfg write of %#lx\n", data);
+			pr_warn("ptrace: ignore syscfg write of %#lx\n", data);
 		break;		/* regs->syscfg = data; break; */
 	default:
 		if (regno < sizeof(*regs)) {
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index 23eada79439c..365fed0c7685 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -869,7 +869,7 @@ static int __init stamp_init(void)
 #endif
 
 	if (net2272_init())
-		pr_warning("unable to configure net2272; it probably won't work\n");
+		pr_warn("unable to configure net2272; it probably won't work\n");
 
 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 	return 0;
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
index 1e1014df5e9e..8c5250da0577 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c
@@ -904,7 +904,7 @@ static int __init cm_bf537e_init(void)
 #endif
 
 	if (net2272_init())
-		pr_warning("unable to configure net2272; it probably won't work\n");
+		pr_warn("unable to configure net2272; it probably won't work\n");
 
 	return 0;
 }
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
index d056db9e5592..5cb4808a3304 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c
@@ -761,7 +761,7 @@ static int __init cm_bf537u_init(void)
 #endif
 
 	if (net2272_init())
-		pr_warning("unable to configure net2272; it probably won't work\n");
+		pr_warn("unable to configure net2272; it probably won't work\n");
 
 	return 0;
 }
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index eaec7b4832a2..f9168094427b 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -2964,7 +2964,7 @@ static int __init stamp_init(void)
 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 
 	if (net2272_init())
-		pr_warning("unable to configure net2272; it probably won't work\n");
+		pr_warn("unable to configure net2272; it probably won't work\n");
 
 	return 0;
 }
diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
index ed309c9a62b6..de4a4d705527 100644
--- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c
@@ -751,7 +751,7 @@ static int __init tcm_bf537_init(void)
 #endif
 
 	if (net2272_init())
-		pr_warning("unable to configure net2272; it probably won't work\n");
+		pr_warn("unable to configure net2272; it probably won't work\n");
 
 	return 0;
 }
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 10c57771822d..f95ca2026cc4 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -533,7 +533,7 @@ static int __init cm_bf561_init(void)
 #endif
 
 	if (net2272_init())
-		pr_warning("unable to configure net2272; it probably won't work\n");
+		pr_warn("unable to configure net2272; it probably won't work\n");
 
 	return 0;
 }
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 57d1c43726d9..0c640286c8bd 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -654,7 +654,7 @@ static int __init ezkit_init(void)
 #endif
 
 	if (net2272_init())
-		pr_warning("unable to configure net2272; it probably won't work\n");
+		pr_warn("unable to configure net2272; it probably won't work\n");
 
 	spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 	return 0;
diff --git a/arch/blackfin/mm/isram-driver.c b/arch/blackfin/mm/isram-driver.c
index 7e2e674ed444..020c706fee28 100644
--- a/arch/blackfin/mm/isram-driver.c
+++ b/arch/blackfin/mm/isram-driver.c
@@ -363,7 +363,7 @@ static __init int isram_test_init(void)
 			break;
 	}
 	if (!l1inst) {
-		pr_warning("SKIP: could not allocate L1 inst\n");
+		pr_warn("SKIP: could not allocate L1 inst\n");
 		return 0;
 	}
 	pr_info("INFO: testing %#x bytes (%p - %p)\n",
@@ -372,7 +372,7 @@ static __init int isram_test_init(void)
 	sdram = kmalloc(test_len * 2, GFP_KERNEL);
 	if (!sdram) {
 		sram_free(l1inst);
-		pr_warning("SKIP: could not allocate sdram\n");
+		pr_warn("SKIP: could not allocate sdram\n");
 		return 0;
 	}
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 05/35] ia64: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (3 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 04/35] arch/blackfin: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 06/35] powerpc: Convert remaining uses " Joe Perches
                   ` (31 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: Tony Luck, Fenghua Yu, linux-ia64

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/ia64

Prior to this patch, there was 1 use of pr_warning and
1 use of pr_warn in arch/ia64

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/ia64/kernel/setup.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index d68322966f33..8593d93fbbd7 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -294,11 +294,9 @@ static void __init setup_crashkernel(unsigned long total, int *n)
 		}
 
 		if (!check_crashkernel_memory(base, size)) {
-			pr_warning("crashkernel: There would be kdump memory "
-				"at %ld GB but this is unusable because it "
-				"must\nbe below 4 GB. Change the memory "
-				"configuration of the machine.\n",
+			pr_warn("crashkernel: There would be kdump memory at %ld GB but this is unusable because it must be below 4 GB.\n",
 				(unsigned long)(base >> 30));
+			pr_warn("crashkernel: Change the memory configuration of the machine.\n");
 			return;
 		}
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 06/35] powerpc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (4 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 05/35] ia64: Convert remaining use " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-20  4:40   ` Michael Ellerman
  2017-02-20 17:25   ` Geoff Levand
  2017-02-17  7:11 ` [PATCH 07/35] sh: " Joe Perches
                   ` (30 subsequent siblings)
  36 siblings, 2 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Anatolij Gustschin, Scott Wood, Kumar Gala,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman,
	Geoff Levand
  Cc: linuxppc-dev, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/powerpc

Prior to this patch, there were 36 uses of pr_warning and
217 uses of pr_warn in arch/powerpc

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/powerpc/kernel/pci-common.c                |  4 ++--
 arch/powerpc/mm/init_64.c                       |  5 ++---
 arch/powerpc/mm/mem.c                           |  3 +--
 arch/powerpc/platforms/512x/mpc512x_shared.c    |  4 ++--
 arch/powerpc/platforms/85xx/socrates_fpga_pic.c |  7 +++----
 arch/powerpc/platforms/86xx/mpc86xx_hpcn.c      |  2 +-
 arch/powerpc/platforms/pasemi/dma_lib.c         |  4 ++--
 arch/powerpc/platforms/powernv/opal.c           |  8 ++++----
 arch/powerpc/platforms/powernv/pci-ioda.c       | 10 +++++-----
 arch/powerpc/platforms/ps3/device-init.c        | 14 +++++++-------
 arch/powerpc/platforms/ps3/mm.c                 |  4 ++--
 arch/powerpc/platforms/ps3/os-area.c            |  2 +-
 arch/powerpc/platforms/pseries/iommu.c          |  8 +++-----
 arch/powerpc/platforms/pseries/setup.c          |  4 ++--
 arch/powerpc/sysdev/fsl_pci.c                   |  9 +++------
 arch/powerpc/sysdev/mpic.c                      | 10 ++++------
 arch/powerpc/sysdev/xics/icp-native.c           | 10 ++++------
 arch/powerpc/sysdev/xics/ics-opal.c             |  4 ++--
 arch/powerpc/sysdev/xics/ics-rtas.c             |  4 ++--
 arch/powerpc/sysdev/xics/xics-common.c          |  8 ++++----
 20 files changed, 56 insertions(+), 68 deletions(-)

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 74bec5498972..338f7f7dbfb2 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -1267,8 +1267,8 @@ static void pcibios_allocate_bus_resources(struct pci_bus *bus)
 						i + PCI_BRIDGE_RESOURCES) == 0)
 				continue;
 		}
-		pr_warning("PCI: Cannot allocate resource region "
-			   "%d of PCI bridge %d, will remap\n", i, bus->number);
+		pr_warn("PCI: Cannot allocate resource region %d of PCI bridge %d, will remap\n",
+			i, bus->number);
 	clear_resource:
 		/* The resource might be figured out when doing
 		 * reassignment based on the resources required
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 6aa3b76aa0d6..55221447e995 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -192,9 +192,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
 
 		rc = vmemmap_create_mapping(start, page_size, __pa(p));
 		if (rc < 0) {
-			pr_warning(
-				"vmemmap_populate: Unable to create vmemmap mapping: %d\n",
-				rc);
+			pr_warn("%s: Unable to create vmemmap mapping: %d\n",
+				__func__, rc);
 			return -EFAULT;
 		}
 	}
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 9ee536ec0739..7dbb48bd4593 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -141,8 +141,7 @@ int arch_add_memory(int nid, u64 start, u64 size, bool for_device)
 	start = (unsigned long)__va(start);
 	rc = create_section_mapping(start, start + size);
 	if (rc) {
-		pr_warning(
-			"Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",
+		pr_warn("Unable to create mapping for hot added memory 0x%llx..0x%llx: %d\n",
 			start, start + size, rc);
 		return -EFAULT;
 	}
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
index 6b4f4cb7009a..1592b7ce9635 100644
--- a/arch/powerpc/platforms/512x/mpc512x_shared.c
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -387,8 +387,8 @@ static unsigned int __init get_fifo_size(struct device_node *np,
 	if (fp)
 		return *fp;
 
-	pr_warning("no %s property in %s node, defaulting to %d\n",
-		   prop_name, np->full_name, DEFAULT_FIFO_SIZE);
+	pr_warn("no %s property in %s node, defaulting to %d\n",
+		prop_name, np->full_name, DEFAULT_FIFO_SIZE);
 
 	return DEFAULT_FIFO_SIZE;
 }
diff --git a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
index 82f8490b5aa7..38d4ba9f37b5 100644
--- a/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
+++ b/arch/powerpc/platforms/85xx/socrates_fpga_pic.c
@@ -252,8 +252,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h,
 		/* type is configurable */
 		if (intspec[1] != IRQ_TYPE_LEVEL_LOW &&
 		    intspec[1] != IRQ_TYPE_LEVEL_HIGH) {
-			pr_warning("FPGA PIC: invalid irq type, "
-				   "setting default active low\n");
+			pr_warn("FPGA PIC: invalid irq type, setting default active low\n");
 			*out_flags = IRQ_TYPE_LEVEL_LOW;
 		} else {
 			*out_flags = intspec[1];
@@ -267,7 +266,7 @@ static int socrates_fpga_pic_host_xlate(struct irq_domain *h,
 	if (intspec[2] <= 2)
 		fpga_irq->irq_line = intspec[2];
 	else
-		pr_warning("FPGA PIC: invalid irq routing\n");
+		pr_warn("FPGA PIC: invalid irq routing\n");
 
 	return 0;
 }
@@ -293,7 +292,7 @@ void socrates_fpga_pic_init(struct device_node *pic)
 	for (i = 0; i < 3; i++) {
 		socrates_fpga_irqs[i] = irq_of_parse_and_map(pic, i);
 		if (!socrates_fpga_irqs[i]) {
-			pr_warning("FPGA PIC: can't get irq%d.\n", i);
+			pr_warn("FPGA PIC: can't get irq%d\n", i);
 			continue;
 		}
 		irq_set_chained_handler(socrates_fpga_irqs[i],
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index a0e989ed4b6f..524f88cfba8a 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -101,7 +101,7 @@ static int __init mpc86xx_hpcn_probe(void)
 
 	/* Be nice and don't give silent boot death.  Delete this in 2.6.27 */
 	if (of_machine_is_compatible("mpc86xx")) {
-		pr_warning("WARNING: your dts/dtb is old. You must update before the next kernel release\n");
+		pr_warn("WARNING: your dts/dtb is old. You must update before the next kernel release\n");
 		return 1;
 	}
 
diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index aafa01ba062f..2c72263ad6ab 100644
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -589,7 +589,7 @@ int pasemi_dma_init(void)
 	pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, 0);
 	while (pasemi_read_dma_reg(PAS_DMA_COM_RXSTA) & 1) {
 		if (time_after(jiffies, timeout)) {
-			pr_warning("Warning: Could not disable RX section\n");
+			pr_warn("Warning: Could not disable RX section\n");
 			break;
 		}
 	}
@@ -598,7 +598,7 @@ int pasemi_dma_init(void)
 	pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, 0);
 	while (pasemi_read_dma_reg(PAS_DMA_COM_TXSTA) & 1) {
 		if (time_after(jiffies, timeout)) {
-			pr_warning("Warning: Could not disable TX section\n");
+			pr_warn("Warning: Could not disable TX section\n");
 			break;
 		}
 	}
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 86d9fde93c17..1eb43b5495d8 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -220,8 +220,8 @@ int opal_message_notifier_register(enum opal_msg_type msg_type,
 					struct notifier_block *nb)
 {
 	if (!nb || msg_type >= OPAL_MSG_TYPE_MAX) {
-		pr_warning("%s: Invalid arguments, msg_type:%d\n",
-			   __func__, msg_type);
+		pr_warn("%s: Invalid arguments, msg_type:%d\n",
+			__func__, msg_type);
 		return -EINVAL;
 	}
 
@@ -262,8 +262,8 @@ static void opal_handle_message(void)
 
 	/* check for errors. */
 	if (ret) {
-		pr_warning("%s: Failed to retrieve opal message, err=%lld\n",
-				__func__, ret);
+		pr_warn("%s: Failed to retrieve opal message, err=%lld\n",
+			__func__, ret);
 		return;
 	}
 
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index e0f83c204ccc..da43d6f504d3 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1042,8 +1042,8 @@ static struct pnv_ioda_pe *pnv_ioda_setup_dev_PE(struct pci_dev *dev)
 
 	pe = pnv_ioda_alloc_pe(phb);
 	if (!pe) {
-		pr_warning("%s: Not enough PE# available, disabling device\n",
-			   pci_name(dev));
+		pr_warn("%s: Not enough PE# available, disabling device\n",
+			pci_name(dev));
 		return NULL;
 	}
 
@@ -1147,7 +1147,7 @@ static struct pnv_ioda_pe *pnv_ioda_setup_bus_PE(struct pci_bus *bus, bool all)
 		pe = pnv_ioda_alloc_pe(phb);
 
 	if (!pe) {
-		pr_warning("%s: Not enough PE# available for PCI bus %04x:%02x\n",
+		pr_warn("%s: Not enough PE# available for PCI bus %04x:%02x\n",
 			__func__, pci_domain_nr(bus), bus->number);
 		return NULL;
 	}
@@ -3113,7 +3113,7 @@ static void pnv_pci_ioda_create_dbgfs(void)
 		sprintf(name, "PCI%04x", hose->global_number);
 		phb->dbgfs = debugfs_create_dir(name, powerpc_debugfs_root);
 		if (!phb->dbgfs) {
-			pr_warning("%s: Error on creating debugfs on PHB#%x\n",
+			pr_warn("%s: Error on creating debugfs on PHB#%x\n",
 				__func__, hose->global_number);
 			continue;
 		}
@@ -3832,7 +3832,7 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
 	/* Reset IODA tables to a clean state */
 	rc = opal_pci_reset(phb_id, OPAL_RESET_PCI_IODA_TABLE, OPAL_ASSERT_RESET);
 	if (rc)
-		pr_warning("  OPAL Error %ld performing IODA table reset !\n", rc);
+		pr_warn("  OPAL Error %ld performing IODA table reset !\n", rc);
 
 	/*
 	 * If we're running in kdump kernel, the previous kernel never
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index e48462447ff0..dc971e1b358f 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -663,8 +663,8 @@ static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
 		if (rem)
 			break;
 	}
-	pr_warning("%s:%u: device %llu:%llu not found\n", __func__, __LINE__,
-		   bus_id, dev_id);
+	pr_warn("%s:%u: device %llu:%llu not found\n",
+		__func__, __LINE__, bus_id, dev_id);
 	return;
 
 found:
@@ -859,11 +859,11 @@ static int ps3_probe_thread(void *data)
 
 		if (notify_event->event_type != notify_region_probe ||
 		    notify_event->bus_id != dev.sbd.bus_id) {
-			pr_warning("%s:%u: bad notify_event: event %llu, "
-				   "dev_id %llu, dev_type %llu\n",
-				   __func__, __LINE__, notify_event->event_type,
-				   notify_event->dev_id,
-				   notify_event->dev_type);
+			pr_warn("%s:%u: bad notify_event: event %llu, dev_id %llu, dev_type %llu\n",
+				__func__, __LINE__,
+				notify_event->event_type,
+				notify_event->dev_id,
+				notify_event->dev_type);
 			continue;
 		}
 
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index b0f34663b1ae..7f870ec29daf 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -607,8 +607,8 @@ static int dma_ioc0_map_pages(struct ps3_dma_region *r, unsigned long phys_addr,
 				       r->ioid,
 				       iopte_flag);
 		if (result) {
-			pr_warning("%s:%d: lv1_put_iopte failed: %s\n",
-				   __func__, __LINE__, ps3_result(result));
+			pr_warn("%s:%d: lv1_put_iopte failed: %s\n",
+				__func__, __LINE__, ps3_result(result));
 			goto fail_map;
 		}
 		DBG("%s: pg=%d bus=%#lx, lpar=%#lx, ioid=%#x\n", __func__,
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 3db53e8aff92..cdbfc5cfd6f3 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -699,7 +699,7 @@ static void os_area_queue_work_handler(struct work_struct *work)
 
 	error = update_flash_db();
 	if (error)
-		pr_warning("%s: Could not update FLASH ROM\n", __func__);
+		pr_warn("%s: Could not update FLASH ROM\n", __func__);
 
 	pr_debug(" <- %s:%d\n", __func__, __LINE__);
 }
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 4d757eaa46bf..22e1c4a5cbdb 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -781,16 +781,14 @@ static void remove_ddw(struct device_node *np, bool remove_prop)
 	ret = tce_clearrange_multi_pSeriesLP(0,
 		1ULL << (be32_to_cpu(dwp->window_shift) - PAGE_SHIFT), dwp);
 	if (ret)
-		pr_warning("%s failed to clear tces in window.\n",
-			 np->full_name);
+		pr_warn("%s failed to clear tces in window\n", np->full_name);
 	else
 		pr_debug("%s successfully cleared tces in window.\n",
 			 np->full_name);
 
 	ret = rtas_call(ddw_avail[2], 1, 1, NULL, liobn);
 	if (ret)
-		pr_warning("%s: failed to remove direct window: rtas returned "
-			"%d to ibm,remove-pe-dma-window(%x) %llx\n",
+		pr_warn("%s: failed to remove direct window: rtas returned %d to ibm,remove-pe-dma-window(%x) %llx\n",
 			np->full_name, ret, ddw_avail[2], liobn);
 	else
 		pr_debug("%s: successfully removed direct window: rtas returned "
@@ -801,7 +799,7 @@ static void remove_ddw(struct device_node *np, bool remove_prop)
 	if (remove_prop)
 		ret = of_remove_property(np, win64);
 	if (ret)
-		pr_warning("%s: failed to remove direct window property: %d\n",
+		pr_warn("%s: failed to remove direct window property: %d\n",
 			np->full_name, ret);
 }
 
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index b4d362ed03a1..d451de532135 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -363,8 +363,8 @@ void pseries_disable_reloc_on_exc(void)
 		mdelay(get_longbusy_msecs(rc));
 	}
 	if (rc != H_SUCCESS)
-		pr_warning("Warning: Failed to disable relocation on "
-			   "exceptions: %ld\n", rc);
+		pr_warn("Warning: Failed to disable relocation on exceptions: %ld\n",
+			rc);
 }
 EXPORT_SYMBOL(pseries_disable_reloc_on_exc);
 
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index d3a597456b6e..2b0f00c28dc0 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -449,9 +449,7 @@ static void setup_pci_atmu(struct pci_controller *hose)
 #endif
 		/* adjusting outbound windows could reclaim space in mem map */
 		if (paddr_hi < 0xffffffffull)
-			pr_warning("%s: WARNING: Outbound window cfg leaves "
-				"gaps in memory map. Adjusting the memory map "
-				"could reduce unnecessary bounce buffering.\n",
+			pr_warn("%s: WARNING: Outbound window cfg leaves gaps in memory map. Adjusting the memory map could reduce unnecessary bounce buffering.\n",
 				name);
 
 		pr_info("%s: DMA window size is 0x%llx\n", name,
@@ -532,7 +530,7 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary)
 	dev = pdev->dev.of_node;
 
 	if (!of_device_is_available(dev)) {
-		pr_warning("%s: disabled\n", dev->full_name);
+		pr_warn("%s: disabled\n", dev->full_name);
 		return -ENODEV;
 	}
 
@@ -809,8 +807,7 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
 	is_mpc83xx_pci = 1;
 
 	if (!of_device_is_available(dev)) {
-		pr_warning("%s: disabled by the firmware.\n",
-			   dev->full_name);
+		pr_warn("%s: disabled by the firmware\n", dev->full_name);
 		return -ENODEV;
 	}
 	pr_debug("Adding PCI host bridge %s\n", dev->full_name);
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index b9aac951a90f..b0df83487c5f 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1008,9 +1008,8 @@ static int mpic_host_map(struct irq_domain *h, unsigned int virq,
 	if (hw == mpic->spurious_vec)
 		return -EINVAL;
 	if (mpic->protected && test_bit(hw, mpic->protected)) {
-		pr_warning("mpic: Mapping of source 0x%x failed, "
-			   "source protected by firmware !\n",\
-			   (unsigned int)hw);
+		pr_warn("mpic: Mapping of source 0x%x failed, source protected by firmware !\n",
+			(unsigned int)hw);
 		return -EPERM;
 	}
 
@@ -1040,9 +1039,8 @@ static int mpic_host_map(struct irq_domain *h, unsigned int virq,
 		return 0;
 
 	if (hw >= mpic->num_sources) {
-		pr_warning("mpic: Mapping of source 0x%x failed, "
-			   "source out of range !\n",\
-			   (unsigned int)hw);
+		pr_warn("mpic: Mapping of source 0x%x failed, source out of range !\n",
+			(unsigned int)hw);
 		return -EINVAL;
 	}
 
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index 8a6a043e239b..97d2cf7dc66f 100644
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -251,18 +251,16 @@ static int __init icp_native_map_one_cpu(int hw_id, unsigned long addr,
 			  cpu, hw_id);
 
 	if (!request_mem_region(addr, size, rname)) {
-		pr_warning("icp_native: Could not reserve ICP MMIO"
-			   " for CPU %d, interrupt server #0x%x\n",
-			   cpu, hw_id);
+		pr_warn("icp_native: Could not reserve ICP MMIO for CPU %d, interrupt server #0x%x\n",
+			cpu, hw_id);
 		return -EBUSY;
 	}
 
 	icp_native_regs[cpu] = ioremap(addr, size);
 	kvmppc_set_xics_phys(cpu, addr);
 	if (!icp_native_regs[cpu]) {
-		pr_warning("icp_native: Failed ioremap for CPU %d, "
-			   "interrupt server #0x%x, addr %#lx\n",
-			   cpu, hw_id, addr);
+		pr_warn("icp_native: Failed ioremap for CPU %d, interrupt server #0x%x, addr %#lx\n",
+			cpu, hw_id, addr);
 		release_mem_region(addr, size);
 		return -ENOMEM;
 	}
diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c
index 1c6bf4b66f56..f85f916ba432 100644
--- a/arch/powerpc/sysdev/xics/ics-opal.c
+++ b/arch/powerpc/sysdev/xics/ics-opal.c
@@ -131,8 +131,8 @@ static int ics_opal_set_affinity(struct irq_data *d,
 
 	wanted_server = xics_get_irq_server(d->irq, cpumask, 1);
 	if (wanted_server < 0) {
-		pr_warning("%s: No online cpus in the mask %*pb for irq %d\n",
-			   __func__, cpumask_pr_args(cpumask), d->irq);
+		pr_warn("%s: No online cpus in the mask %*pb for irq %d\n",
+			__func__, cpumask_pr_args(cpumask), d->irq);
 		return -1;
 	}
 	server = ics_opal_mangle_server(wanted_server);
diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
index 78ee5c778ef8..17fc8e8c0524 100644
--- a/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -140,8 +140,8 @@ static int ics_rtas_set_affinity(struct irq_data *d,
 
 	irq_server = xics_get_irq_server(d->irq, cpumask, 1);
 	if (irq_server == -1) {
-		pr_warning("%s: No online cpus in the mask %*pb for irq %d\n",
-			   __func__, cpumask_pr_args(cpumask), d->irq);
+		pr_warn("%s: No online cpus in the mask %*pb for irq %d\n",
+			__func__, cpumask_pr_args(cpumask), d->irq);
 		return -1;
 	}
 
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index 69d858e51ac7..b25e2776e0b7 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -245,8 +245,8 @@ void xics_migrate_irqs_away(void)
 
 		/* This is expected during cpu offline. */
 		if (cpu_online(cpu))
-			pr_warning("IRQ %u affinity broken off cpu %u\n",
-			       virq, cpu);
+			pr_warn("IRQ %u affinity broken off cpu %u\n",
+				virq, cpu);
 
 		/* Reset affinity to all cpus */
 		raw_spin_unlock_irqrestore(&desc->lock, flags);
@@ -455,7 +455,7 @@ void __init xics_init(void)
 		    rc = icp_opal_init();
 	}
 	if (rc < 0) {
-		pr_warning("XICS: Cannot find a Presentation Controller !\n");
+		pr_warn("XICS: Cannot find a Presentation Controller !\n");
 		return;
 	}
 
@@ -470,7 +470,7 @@ void __init xics_init(void)
 	if (rc < 0)
 		rc = ics_opal_init();
 	if (rc < 0)
-		pr_warning("XICS: Cannot find a Source Controller !\n");
+		pr_warn("XICS: Cannot find a Source Controller !\n");
 
 	/* Initialize common bits */
 	xics_get_server_size();
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 07/35] sh: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (5 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 06/35] powerpc: Convert remaining uses " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 08/35] sparc: Convert remaining use " Joe Perches
                   ` (29 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: Yoshinori Sato, Rich Felker, linux-sh

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/sh

Prior to this patch, there were 6 uses of pr_warning and
1 use of pr_warn in arch/sh

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/sh/boards/mach-sdk7786/nmi.c    | 2 +-
 arch/sh/drivers/pci/fixups-sdk7786.c | 2 +-
 arch/sh/kernel/io_trapped.c          | 2 +-
 arch/sh/kernel/setup.c               | 2 +-
 arch/sh/mm/consistent.c              | 5 ++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/sh/boards/mach-sdk7786/nmi.c b/arch/sh/boards/mach-sdk7786/nmi.c
index edcfa1f568ba..7d6a6797ac7f 100644
--- a/arch/sh/boards/mach-sdk7786/nmi.c
+++ b/arch/sh/boards/mach-sdk7786/nmi.c
@@ -40,7 +40,7 @@ static int __init nmi_mode_setup(char *str)
 		nmi_mode = NMI_MODE_ANY;
 	else {
 		nmi_mode = NMI_MODE_UNKNOWN;
-		pr_warning("Unknown NMI mode %s\n", str);
+		pr_warn("Unknown NMI mode %s\n", str);
 	}
 
 	printk("Set NMI mode to %d\n", nmi_mode);
diff --git a/arch/sh/drivers/pci/fixups-sdk7786.c b/arch/sh/drivers/pci/fixups-sdk7786.c
index 36eb6fc3c18a..15ee04fcb2de 100644
--- a/arch/sh/drivers/pci/fixups-sdk7786.c
+++ b/arch/sh/drivers/pci/fixups-sdk7786.c
@@ -56,7 +56,7 @@ static int __init sdk7786_pci_init(void)
 
 		/* Warn about forced rerouting if slot#3 is occupied */
 		if ((data & PCIECR_PRST3) == 0) {
-			pr_warning("Unreachable card detected in slot#3\n");
+			pr_warn("Unreachable card detected in slot#3\n");
 			return -EBUSY;
 		}
 	} else
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
index 4d4e7a2a774b..1dd3f58b23f0 100644
--- a/arch/sh/kernel/io_trapped.c
+++ b/arch/sh/kernel/io_trapped.c
@@ -102,7 +102,7 @@ int register_trapped_io(struct trapped_io *tiop)
 
 	return 0;
  bad:
-	pr_warning("unable to install trapped io filter\n");
+	pr_warn("unable to install trapped io filter\n");
 	return -1;
 }
 EXPORT_SYMBOL_GPL(register_trapped_io);
diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c
index 3a44c753b642..cd9e18c39d80 100644
--- a/arch/sh/kernel/setup.c
+++ b/arch/sh/kernel/setup.c
@@ -345,7 +345,7 @@ void __init setup_arch(char **cmdline_p)
 /* processor boot mode configuration */
 int generic_mode_pins(void)
 {
-	pr_warning("generic_mode_pins(): missing mode pin configuration\n");
+	pr_warn("generic_mode_pins(): missing mode pin configuration\n");
 	return 0;
 }
 
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index 92b6976fde59..5c6212e817a5 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -134,8 +134,7 @@ int __init platform_resource_setup_memory(struct platform_device *pdev,
 
 	r = pdev->resource + pdev->num_resources - 1;
 	if (r->flags) {
-		pr_warning("%s: unable to find empty space for resource\n",
-			name);
+		pr_warn("%s: unable to find empty space for resource\n", name);
 		return -EINVAL;
 	}
 
@@ -145,7 +144,7 @@ int __init platform_resource_setup_memory(struct platform_device *pdev,
 
 	buf = dma_alloc_coherent(NULL, memsize, &dma_handle, GFP_KERNEL);
 	if (!buf) {
-		pr_warning("%s: unable to allocate memory\n", name);
+		pr_warn("%s: unable to allocate memory\n", name);
 		return -ENOMEM;
 	}
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 08/35] sparc: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (6 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 07/35] sh: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  8:39   ` Sam Ravnborg
  2017-02-17 15:20   ` David Miller
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
                   ` (28 subsequent siblings)
  36 siblings, 2 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: David S. Miller, sparclinux

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/sparc

Prior to this patch, there was 1 use of pr_warning and
8 uses of pr_warn in arch/sparc

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/sparc/kernel/smp_64.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index dcb12d9002e9..ca0f8faa79a9 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1564,9 +1564,8 @@ void __init setup_per_cpu_areas(void)
 					    pcpu_alloc_bootmem,
 					    pcpu_free_bootmem);
 		if (rc)
-			pr_warning("PERCPU: %s allocator failed (%d), "
-				   "falling back to page size\n",
-				   pcpu_fc_names[pcpu_chosen_fc], rc);
+			pr_warn("PERCPU: %s allocator failed (%d), falling back to page size\n",
+				pcpu_fc_names[pcpu_chosen_fc], rc);
 	}
 	if (rc < 0)
 		rc = pcpu_page_first_chunk(PERCPU_MODULE_RESERVE,
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (7 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 08/35] sparc: Convert remaining use " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:46   ` Pekka Paalanen
                     ` (5 more replies)
  2017-02-17  7:11 ` [PATCH 10/35] drivers/acpi: " Joe Perches
                   ` (27 subsequent siblings)
  36 siblings, 6 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Ning Sun, Steven Rostedt, Karol Herbst, Pekka Paalanen,
	Robert Richter, Len Brown, Boris Ostrovsky, Juergen Gross
  Cc: Thomas Gleixner, H. Peter Anvin, x86, linux-kernel, tboot-devel,
	nouveau, oprofile-list, sfi-devel, xen-devel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for arch/x86

Prior to this patch, there were 46 uses of pr_warning and
122 uses of pr_warn in arch/x86

Miscellanea:

o Coalesce a few formats and realign arguments
o Convert a couple of multiple line printks to single line

Signed-off-by: Joe Perches <joe@perches.com>
---
 arch/x86/kernel/amd_gart_64.c          | 12 +++------
 arch/x86/kernel/apic/apic.c            | 46 ++++++++++++++++------------------
 arch/x86/kernel/apic/apic_noop.c       |  2 +-
 arch/x86/kernel/setup_percpu.c         |  4 +--
 arch/x86/kernel/tboot.c                | 15 ++++++-----
 arch/x86/kernel/tsc_sync.c             |  8 +++---
 arch/x86/mm/kmmio.c                    |  8 +++---
 arch/x86/mm/mmio-mod.c                 |  5 ++--
 arch/x86/mm/numa.c                     | 12 ++++-----
 arch/x86/mm/numa_emulation.c           |  6 ++---
 arch/x86/mm/testmmiotrace.c            |  5 ++--
 arch/x86/oprofile/op_x86_model.h       |  6 ++---
 arch/x86/platform/olpc/olpc-xo15-sci.c |  2 +-
 arch/x86/platform/sfi/sfi.c            |  3 +--
 arch/x86/xen/debugfs.c                 |  2 +-
 arch/x86/xen/setup.c                   |  2 +-
 16 files changed, 63 insertions(+), 75 deletions(-)

diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index 63ff468a7986..6bb37027cd70 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -535,10 +535,8 @@ static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_size)
 	iommu_size -= round_up(a, PMD_PAGE_SIZE) - a;
 
 	if (iommu_size < 64*1024*1024) {
-		pr_warning(
-			"PCI-DMA: Warning: Small IOMMU %luMB."
-			" Consider increasing the AGP aperture in BIOS\n",
-				iommu_size >> 20);
+		pr_warn("PCI-DMA: Warning: Small IOMMU %luMB. Consider increasing the AGP aperture in BIOS\n",
+			iommu_size >> 20);
 	}
 
 	return iommu_size;
@@ -690,8 +688,7 @@ static __init int init_amd_gatt(struct agp_kern_info *info)
 
  nommu:
 	/* Should not happen anymore */
-	pr_warning("PCI-DMA: More than 4GB of RAM and no IOMMU\n"
-	       "falling back to iommu=soft.\n");
+	pr_warn("PCI-DMA: More than 4GB of RAM and no IOMMU - falling back to iommu=soft\n");
 	return -1;
 }
 
@@ -756,8 +753,7 @@ int __init gart_iommu_init(void)
 	    !gart_iommu_aperture ||
 	    (no_agp && init_amd_gatt(&info) < 0)) {
 		if (max_pfn > MAX_DMA32_PFN) {
-			pr_warning("More than 4GB of memory but GART IOMMU not available.\n");
-			pr_warning("falling back to iommu=soft.\n");
+			pr_warn("More than 4GB of memory but GART IOMMU not available - falling back to iommu=soft\n");
 		}
 		return 0;
 	}
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 4261b3282ad9..37e9129da8b3 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -685,8 +685,8 @@ calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc)
 
 	res = (((u64)deltapm) *  mult) >> 22;
 	do_div(res, 1000000);
-	pr_warning("APIC calibration not consistent "
-		   "with PM-Timer: %ldms instead of 100ms\n",(long)res);
+	pr_warn("APIC calibration not consistent with PM-Timer: %ldms instead of 100ms\n",
+		(long)res);
 
 	/* Correct the lapic counter value */
 	res = (((u64)(*delta)) * pm_100ms);
@@ -805,7 +805,7 @@ static int __init calibrate_APIC_clock(void)
 	 */
 	if (lapic_timer_frequency < (1000000 / HZ)) {
 		local_irq_enable();
-		pr_warning("APIC frequency too slow, disabling apic timer\n");
+		pr_warn("APIC frequency too slow, disabling apic timer\n");
 		return -1;
 	}
 
@@ -848,8 +848,8 @@ static int __init calibrate_APIC_clock(void)
 	local_irq_enable();
 
 	if (levt->features & CLOCK_EVT_FEAT_DUMMY) {
-		pr_warning("APIC timer disabled due to verification failure\n");
-			return -1;
+		pr_warn("APIC timer disabled due to verification failure\n");
+		return -1;
 	}
 
 	return 0;
@@ -923,7 +923,7 @@ static void local_apic_timer_interrupt(void)
 	 * spurious.
 	 */
 	if (!evt->event_handler) {
-		pr_warning("Spurious LAPIC timer interrupt on cpu %d\n", cpu);
+		pr_warn("Spurious LAPIC timer interrupt on cpu %d\n", cpu);
 		/* Switch it off */
 		lapic_timer_shutdown(evt);
 		return;
@@ -1503,11 +1503,11 @@ static int __init setup_nox2apic(char *str)
 		int apicid = native_apic_msr_read(APIC_ID);
 
 		if (apicid >= 255) {
-			pr_warning("Apicid: %08x, cannot enforce nox2apic\n",
-				   apicid);
+			pr_warn("Apicid: %08x, cannot enforce nox2apic\n",
+				apicid);
 			return 0;
 		}
-		pr_warning("x2apic already enabled.\n");
+		pr_warn("x2apic already enabled\n");
 		__x2apic_disable();
 	}
 	setup_clear_cpu_cap(X86_FEATURE_X2APIC);
@@ -1684,7 +1684,7 @@ static int __init apic_verify(void)
 	 */
 	features = cpuid_edx(1);
 	if (!(features & (1 << X86_FEATURE_APIC))) {
-		pr_warning("Could not enable APIC!\n");
+		pr_warn("Could not enable APIC!\n");
 		return -1;
 	}
 	set_cpu_cap(&boot_cpu_data, X86_FEATURE_APIC);
@@ -2102,9 +2102,8 @@ int __generic_processor_info(int apicid, int version, bool enabled)
 	    disabled_cpu_apicid == apicid) {
 		int thiscpu = num_processors + disabled_cpus;
 
-		pr_warning("APIC: Disabling requested cpu."
-			   " Processor %d/0x%x ignored.\n",
-			   thiscpu, apicid);
+		pr_warn("APIC: Disabling requested cpu - Processor %d/0x%x ignored\n",
+			thiscpu, apicid);
 
 		disabled_cpus++;
 		return -ENODEV;
@@ -2118,10 +2117,8 @@ int __generic_processor_info(int apicid, int version, bool enabled)
 	    apicid != boot_cpu_physical_apicid) {
 		int thiscpu = max + disabled_cpus - 1;
 
-		pr_warning(
-			"APIC: NR_CPUS/possible_cpus limit of %i almost"
-			" reached. Keeping one slot for boot cpu."
-			"  Processor %d/0x%x ignored.\n", max, thiscpu, apicid);
+		pr_warn("APIC: NR_CPUS/possible_cpus limit of %i almost reached. Keeping one slot for boot cpu. Processor %d/0x%x ignored.\n",
+			max, thiscpu, apicid);
 
 		disabled_cpus++;
 		return -ENODEV;
@@ -2131,9 +2128,8 @@ int __generic_processor_info(int apicid, int version, bool enabled)
 		int thiscpu = max + disabled_cpus;
 
 		if (enabled) {
-			pr_warning("APIC: NR_CPUS/possible_cpus limit of %i "
-				   "reached. Processor %d/0x%x ignored.\n",
-				   max, thiscpu, apicid);
+			pr_warn("APIC: NR_CPUS/possible_cpus limit of %i reached. Processor %d/0x%x ignored.\n",
+				max, thiscpu, apicid);
 		}
 
 		disabled_cpus++;
@@ -2164,13 +2160,13 @@ int __generic_processor_info(int apicid, int version, bool enabled)
 	 * Validate version
 	 */
 	if (version == 0x0) {
-		pr_warning("BIOS bug: APIC version is 0 for CPU %d/0x%x, fixing up to 0x10\n",
-			   cpu, apicid);
+		pr_warn("BIOS bug: APIC version is 0 for CPU %d/0x%x, fixing up to 0x10\n",
+			cpu, apicid);
 		version = 0x10;
 	}
 
 	if (version != boot_cpu_apic_version) {
-		pr_warning("BIOS bug: APIC version mismatch, boot CPU: %x, CPU %d: version %x\n",
+		pr_warn("BIOS bug: APIC version mismatch, boot CPU: %x, CPU %d: version %x\n",
 			boot_cpu_apic_version, cpu, version);
 	}
 
@@ -2625,8 +2621,8 @@ static int __init apic_set_verbosity(char *arg)
 	else if (strcmp("verbose", arg) == 0)
 		apic_verbosity = APIC_VERBOSE;
 	else {
-		pr_warning("APIC Verbosity level %s not recognised"
-			" use apic=verbose or apic=debug\n", arg);
+		pr_warn("APIC Verbosity level %s not recognised use apic=verbose or apic=debug\n",
+			arg);
 		return -EINVAL;
 	}
 
diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index b109e4389c92..47b6e5a0b574 100644
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -93,7 +93,7 @@ static void noop_vector_allocation_domain(int cpu, struct cpumask *retmask,
 					  const struct cpumask *mask)
 {
 	if (cpu != 0)
-		pr_warning("APIC: Vector allocated for non-BSP cpu\n");
+		pr_warn("APIC: Vector allocated for non-BSP cpu\n");
 	cpumask_copy(retmask, cpumask_of(cpu));
 }
 
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index 9820d6d977c6..e04562c44134 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -207,8 +207,8 @@ void __init setup_per_cpu_areas(void)
 					    pcpu_cpu_distance,
 					    pcpu_fc_alloc, pcpu_fc_free);
 		if (rc < 0)
-			pr_warning("%s allocator failed (%d), falling back to page size\n",
-				   pcpu_fc_names[pcpu_chosen_fc], rc);
+			pr_warn("%s allocator failed (%d), falling back to page size\n",
+				pcpu_fc_names[pcpu_chosen_fc], rc);
 	}
 	if (rc < 0)
 		rc = pcpu_page_first_chunk(PERCPU_FIRST_CHUNK_RESERVE,
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index b868fa1b812b..a6b57d8d0b9b 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -70,7 +70,7 @@ void __init tboot_probe(void)
 	 */
 	if (!e820_any_mapped(boot_params.tboot_addr,
 			     boot_params.tboot_addr, E820_RESERVED)) {
-		pr_warning("non-0 tboot_addr but it is not of type E820_RESERVED\n");
+		pr_warn("non-0 tboot_addr but it is not of type E820_RESERVED\n");
 		return;
 	}
 
@@ -78,13 +78,12 @@ void __init tboot_probe(void)
 	set_fixmap(FIX_TBOOT_BASE, boot_params.tboot_addr);
 	tboot = (struct tboot *)fix_to_virt(FIX_TBOOT_BASE);
 	if (memcmp(&tboot_uuid, &tboot->uuid, sizeof(tboot->uuid))) {
-		pr_warning("tboot at 0x%llx is invalid\n",
-			   boot_params.tboot_addr);
+		pr_warn("tboot at 0x%llx is invalid\n", boot_params.tboot_addr);
 		tboot = NULL;
 		return;
 	}
 	if (tboot->version < 5) {
-		pr_warning("tboot version is invalid: %u\n", tboot->version);
+		pr_warn("tboot version is invalid: %u\n", tboot->version);
 		tboot = NULL;
 		return;
 	}
@@ -287,7 +286,7 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
 
 	if (sleep_state >= ACPI_S_STATE_COUNT ||
 	    acpi_shutdown_map[sleep_state] == -1) {
-		pr_warning("unsupported sleep state 0x%x\n", sleep_state);
+		pr_warn("unsupported sleep state 0x%x\n", sleep_state);
 		return -1;
 	}
 
@@ -300,7 +299,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
 	if (!tboot_enabled())
 		return 0;
 
-	pr_warning("tboot is not able to suspend on platforms with reduced hardware sleep (ACPIv5)");
+	pr_warn("tboot is not able to suspend on platforms with reduced hardware sleep (ACPIv5)\n");
 	return -ENODEV;
 }
 
@@ -318,7 +317,7 @@ static int tboot_wait_for_aps(int num_aps)
 	}
 
 	if (timeout)
-		pr_warning("tboot wait for APs timeout\n");
+		pr_warn("tboot wait for APs timeout\n");
 
 	return !(atomic_read((atomic_t *)&tboot->num_in_wfs) == num_aps);
 }
@@ -511,7 +510,7 @@ int tboot_force_iommu(void)
 		return 0;
 
 	if (no_iommu || swiotlb || dmar_disabled)
-		pr_warning("Forcing Intel-IOMMU to enabled\n");
+		pr_warn("Forcing Intel-IOMMU to enabled\n");
 
 	dmar_disabled = 0;
 #ifdef CONFIG_SWIOTLB
diff --git a/arch/x86/kernel/tsc_sync.c b/arch/x86/kernel/tsc_sync.c
index 728f75378475..61de4fbf8f45 100644
--- a/arch/x86/kernel/tsc_sync.c
+++ b/arch/x86/kernel/tsc_sync.c
@@ -332,12 +332,12 @@ void check_tsc_sync_source(int cpu)
 		/* Force it to 0 if random warps brought us here */
 		atomic_set(&test_runs, 0);
 
-		pr_warning("TSC synchronization [CPU#%d -> CPU#%d]:\n",
+		pr_warn("TSC synchronization [CPU#%d -> CPU#%d]:\n",
 			smp_processor_id(), cpu);
-		pr_warning("Measured %Ld cycles TSC warp between CPUs, "
-			   "turning off TSC clock.\n", max_warp);
+		pr_warn("Measured %lld cycles TSC warp between CPUs, turning off TSC clock\n",
+			max_warp);
 		if (random_warps)
-			pr_warning("TSC warped randomly between CPUs\n");
+			pr_warn("TSC warped randomly between CPUs\n");
 		mark_tsc_unstable("check_tsc_sync_source failed");
 	}
 
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
index afc47f5c9531..ad70518cdcc7 100644
--- a/arch/x86/mm/kmmio.c
+++ b/arch/x86/mm/kmmio.c
@@ -187,8 +187,8 @@ static int arm_kmmio_fault_page(struct kmmio_fault_page *f)
 	int ret;
 	WARN_ONCE(f->armed, KERN_ERR pr_fmt("kmmio page already armed.\n"));
 	if (f->armed) {
-		pr_warning("double-arm: addr 0x%08lx, ref %d, old %d\n",
-			   f->addr, f->count, !!f->old_presence);
+		pr_warn("double-arm: addr 0x%08lx, ref %d, old %d\n",
+			f->addr, f->count, !!f->old_presence);
 	}
 	ret = clear_page_presence(f, true);
 	WARN_ONCE(ret < 0, KERN_ERR pr_fmt("arming at 0x%08lx failed.\n"),
@@ -335,8 +335,8 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
 		 * something external causing them (f.e. using a debugger while
 		 * mmio tracing enabled), or erroneous behaviour
 		 */
-		pr_warning("unexpected debug trap on CPU %d.\n",
-			   smp_processor_id());
+		pr_warn("unexpected debug trap on CPU %d\n",
+			smp_processor_id());
 		goto out;
 	}
 
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
index bef36622e408..706ae44d1af7 100644
--- a/arch/x86/mm/mmio-mod.c
+++ b/arch/x86/mm/mmio-mod.c
@@ -407,7 +407,7 @@ static void enter_uniprocessor(void)
 	}
 out:
 	if (num_online_cpus() > 1)
-		pr_warning("multiple CPUs still online, may miss events.\n");
+		pr_warn("multiple CPUs still online, may miss events\n");
 }
 
 static void leave_uniprocessor(void)
@@ -431,8 +431,7 @@ static void leave_uniprocessor(void)
 static void enter_uniprocessor(void)
 {
 	if (num_online_cpus() > 1)
-		pr_warning("multiple CPUs are online, may miss events. "
-			   "Suggest booting with maxcpus=1 kernel argument.\n");
+		pr_warn("multiple CPUs are online, may miss events. Suggest booting with maxcpus=1 kernel argument.\n");
 }
 
 static void leave_uniprocessor(void)
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
index 12dcad7297a5..3aa236f0a2fb 100644
--- a/arch/x86/mm/numa.c
+++ b/arch/x86/mm/numa.c
@@ -136,8 +136,8 @@ static int __init numa_add_memblk_to(int nid, u64 start, u64 end,
 
 	/* whine about and ignore invalid blks */
 	if (start > end || nid < 0 || nid >= MAX_NUMNODES) {
-		pr_warning("NUMA: Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n",
-			   nid, start, end - 1);
+		pr_warn("NUMA: Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n",
+			nid, start, end - 1);
 		return 0;
 	}
 
@@ -272,9 +272,9 @@ int __init numa_cleanup_meminfo(struct numa_meminfo *mi)
 					       bj->nid, bj->start, bj->end - 1);
 					return -EINVAL;
 				}
-				pr_warning("NUMA: Warning: node %d [mem %#010Lx-%#010Lx] overlaps with itself [mem %#010Lx-%#010Lx]\n",
-					   bi->nid, bi->start, bi->end - 1,
-					   bj->start, bj->end - 1);
+				pr_warn("NUMA: Warning: node %d [mem %#010Lx-%#010Lx] overlaps with itself [mem %#010Lx-%#010Lx]\n",
+					bi->nid, bi->start, bi->end - 1,
+					bj->start, bj->end - 1);
 			}
 
 			/*
@@ -364,7 +364,7 @@ static int __init numa_alloc_distance(void)
 	phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
 				      size, PAGE_SIZE);
 	if (!phys) {
-		pr_warning("NUMA: Warning: can't allocate distance table!\n");
+		pr_warn("NUMA: Warning: can't allocate distance table!\n");
 		/* don't retry until explicitly reset */
 		numa_distance = (void *)1LU;
 		return -ENOMEM;
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index a8f90ce3dedf..a6446ad3cd32 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -349,7 +349,7 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
 		goto no_emu;
 
 	if (numa_cleanup_meminfo(&ei) < 0) {
-		pr_warning("NUMA: Warning: constructed meminfo invalid, disabling emulation\n");
+		pr_warn("NUMA: Warning: constructed meminfo invalid, disabling emulation\n");
 		goto no_emu;
 	}
 
@@ -360,7 +360,7 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
 		phys = memblock_find_in_range(0, PFN_PHYS(max_pfn_mapped),
 					      phys_size, PAGE_SIZE);
 		if (!phys) {
-			pr_warning("NUMA: Warning: can't allocate copy of distance table, disabling emulation\n");
+			pr_warn("NUMA: Warning: can't allocate copy of distance table, disabling emulation\n");
 			goto no_emu;
 		}
 		memblock_reserve(phys, phys_size);
@@ -386,7 +386,7 @@ void __init numa_emulation(struct numa_meminfo *numa_meminfo, int numa_dist_cnt)
 		}
 	}
 	if (dfl_phys_nid == NUMA_NO_NODE) {
-		pr_warning("NUMA: Warning: can't determine default physical node, disabling emulation\n");
+		pr_warn("NUMA: Warning: can't determine default physical node, disabling emulation\n");
 		goto no_emu;
 	}
 
diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c
index 38868adf07ea..4a55e453296d 100644
--- a/arch/x86/mm/testmmiotrace.c
+++ b/arch/x86/mm/testmmiotrace.c
@@ -121,9 +121,8 @@ static int __init init(void)
 		return -ENXIO;
 	}
 
-	pr_warning("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, "
-		   "and writing 16 kB of rubbish in there.\n",
-		   size >> 10, mmio_address);
+	pr_warn("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, and writing 16 kB of rubbish in there\n",
+		size >> 10, mmio_address);
 	do_test(size);
 	do_test_bulk_ioremapping();
 	pr_info("All done.\n");
diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
index 71e8a67337e2..276cf79b5d24 100644
--- a/arch/x86/oprofile/op_x86_model.h
+++ b/arch/x86/oprofile/op_x86_model.h
@@ -67,13 +67,13 @@ static inline void op_x86_warn_in_use(int counter)
 	 * cannot be monitored by any other counter, contact your
 	 * hardware or BIOS vendor.
 	 */
-	pr_warning("oprofile: counter #%d on cpu #%d may already be used\n",
-		   counter, smp_processor_id());
+	pr_warn("oprofile: counter #%d on cpu #%d may already be used\n",
+		counter, smp_processor_id());
 }
 
 static inline void op_x86_warn_reserved(int counter)
 {
-	pr_warning("oprofile: counter #%d is already reserved\n", counter);
+	pr_warn("oprofile: counter #%d is already reserved\n", counter);
 }
 
 extern u64 op_x86_get_ctrl(struct op_x86_model_spec const *model,
diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index c0533fbc39e3..e46c73ba3b44 100644
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -43,7 +43,7 @@ static int set_lid_wake_behavior(bool wake_on_close)
 
 	status = acpi_execute_simple_method(NULL, "\\_SB.PCI0.LID.LIDW", wake_on_close);
 	if (ACPI_FAILURE(status)) {
-		pr_warning(PFX "failed to set lid behavior\n");
+		pr_warn(PFX "failed to set lid behavior\n");
 		return 1;
 	}
 
diff --git a/arch/x86/platform/sfi/sfi.c b/arch/x86/platform/sfi/sfi.c
index 6c7111bbd1e9..530655e8405e 100644
--- a/arch/x86/platform/sfi/sfi.c
+++ b/arch/x86/platform/sfi/sfi.c
@@ -39,8 +39,7 @@ static unsigned long sfi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
 static void __init mp_sfi_register_lapic(u8 id)
 {
 	if (MAX_LOCAL_APIC - id <= 0) {
-		pr_warning("Processor #%d invalid (max %d)\n",
-			id, MAX_LOCAL_APIC);
+		pr_warn("Processor #%d invalid (max %d)\n", id, MAX_LOCAL_APIC);
 		return;
 	}
 
diff --git a/arch/x86/xen/debugfs.c b/arch/x86/xen/debugfs.c
index 1daff5545c0a..358f92da8d9e 100644
--- a/arch/x86/xen/debugfs.c
+++ b/arch/x86/xen/debugfs.c
@@ -12,7 +12,7 @@ struct dentry * __init xen_init_debugfs(void)
 		d_xen_debug = debugfs_create_dir("xen", NULL);
 
 		if (!d_xen_debug)
-			pr_warning("Could not create 'xen' debugfs directory\n");
+			pr_warn("Could not create 'xen' debugfs directory\n");
 	}
 
 	return d_xen_debug;
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index a8c306cf8868..b92e924b9464 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -413,7 +413,7 @@ static unsigned long __init xen_set_identity_and_remap_chunk(
 
 		remap_range_size = xen_find_pfn_range(&remap_pfn);
 		if (!remap_range_size) {
-			pr_warning("Unable to find available pfn range, not remapping identity pages\n");
+			pr_warn("Unable to find available pfn range, not remapping identity pages\n");
 			xen_set_identity_and_release_chunk(cur_pfn,
 						cur_pfn + left, nr_pages);
 			break;
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 10/35] drivers/acpi: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (8 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 11/35] block/drbd: " Joe Perches
                   ` (26 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Rafael J. Wysocki, Len Brown; +Cc: linux-acpi, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/acpi

Prior to this patch, there were 20 uses of pr_warning and
45 uses of pr_warn in drivers/acpi

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/acpi/apei/apei-base.c | 32 ++++++++++++++++----------------
 drivers/acpi/apei/einj.c      |  4 ++--
 drivers/acpi/apei/erst-dbg.c  |  4 ++--
 drivers/acpi/apei/ghes.c      | 30 ++++++++++++++----------------
 drivers/acpi/apei/hest.c      | 10 +++++-----
 drivers/acpi/resource.c       |  4 ++--
 6 files changed, 41 insertions(+), 43 deletions(-)

diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c
index da370e1d31f4..63b7830c2498 100644
--- a/drivers/acpi/apei/apei-base.c
+++ b/drivers/acpi/apei/apei-base.c
@@ -178,9 +178,9 @@ int __apei_exec_run(struct apei_exec_context *ctx, u8 action,
 		if (ip == ctx->ip) {
 			if (entry->instruction >= ctx->instructions ||
 			    !ctx->ins_table[entry->instruction].run) {
-				pr_warning(FW_WARN APEI_PFX
+				pr_warn(FW_WARN APEI_PFX
 			"Invalid action table, unknown instruction type: %d\n",
-					   entry->instruction);
+					entry->instruction);
 				return -EINVAL;
 			}
 			run = ctx->ins_table[entry->instruction].run;
@@ -219,9 +219,9 @@ static int apei_exec_for_each_entry(struct apei_exec_context *ctx,
 		if (end)
 			*end = i;
 		if (ins >= ctx->instructions || !ins_table[ins].run) {
-			pr_warning(FW_WARN APEI_PFX
+			pr_warn(FW_WARN APEI_PFX
 			"Invalid action table, unknown instruction type: %d\n",
-				   ins);
+				ins);
 			return -EINVAL;
 		}
 		rc = func(ctx, entry, data);
@@ -587,18 +587,18 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr,
 	space_id = reg->space_id;
 	*paddr = get_unaligned(&reg->address);
 	if (!*paddr) {
-		pr_warning(FW_BUG APEI_PFX
+		pr_warn(FW_BUG APEI_PFX
 			   "Invalid physical address in GAR [0x%llx/%u/%u/%u/%u]\n",
-			   *paddr, bit_width, bit_offset, access_size_code,
-			   space_id);
+			*paddr, bit_width, bit_offset, access_size_code,
+			space_id);
 		return -EINVAL;
 	}
 
 	if (access_size_code < 1 || access_size_code > 4) {
-		pr_warning(FW_BUG APEI_PFX
+		pr_warn(FW_BUG APEI_PFX
 			   "Invalid access size code in GAR [0x%llx/%u/%u/%u/%u]\n",
-			   *paddr, bit_width, bit_offset, access_size_code,
-			   space_id);
+			*paddr, bit_width, bit_offset, access_size_code,
+			space_id);
 		return -EINVAL;
 	}
 	*access_bit_width = 1UL << (access_size_code + 2);
@@ -612,19 +612,19 @@ static int apei_check_gar(struct acpi_generic_address *reg, u64 *paddr,
 		*access_bit_width = 64;
 
 	if ((bit_width + bit_offset) > *access_bit_width) {
-		pr_warning(FW_BUG APEI_PFX
+		pr_warn(FW_BUG APEI_PFX
 			   "Invalid bit width + offset in GAR [0x%llx/%u/%u/%u/%u]\n",
-			   *paddr, bit_width, bit_offset, access_size_code,
-			   space_id);
+			*paddr, bit_width, bit_offset, access_size_code,
+			space_id);
 		return -EINVAL;
 	}
 
 	if (space_id != ACPI_ADR_SPACE_SYSTEM_MEMORY &&
 	    space_id != ACPI_ADR_SPACE_SYSTEM_IO) {
-		pr_warning(FW_BUG APEI_PFX
+		pr_warn(FW_BUG APEI_PFX
 			   "Invalid address space type in GAR [0x%llx/%u/%u/%u/%u]\n",
-			   *paddr, bit_width, bit_offset, access_size_code,
-			   space_id);
+			*paddr, bit_width, bit_offset, access_size_code,
+			space_id);
 		return -EINVAL;
 	}
 
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index ec50c32ea3da..730a594483f4 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -180,7 +180,7 @@ static int einj_get_available_error_type(u32 *type)
 static int einj_timedout(u64 *t)
 {
 	if ((s64)*t < SPIN_UNIT) {
-		pr_warning(FW_WARN "Firmware does not respond in time\n");
+		pr_warn(FW_WARN "Firmware does not respond in time\n");
 		return 1;
 	}
 	*t -= SPIN_UNIT;
@@ -320,7 +320,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type,
 	}
 	rc = einj_check_trigger_header(trigger_tab);
 	if (rc) {
-		pr_warning(FW_BUG "Invalid trigger error action table.\n");
+		pr_warn(FW_BUG "Invalid trigger error action table.\n");
 		goto out_rel_header;
 	}
 
diff --git a/drivers/acpi/apei/erst-dbg.c b/drivers/acpi/apei/erst-dbg.c
index 6330f557a2c8..795db6a8ddaf 100644
--- a/drivers/acpi/apei/erst-dbg.c
+++ b/drivers/acpi/apei/erst-dbg.c
@@ -126,9 +126,9 @@ static ssize_t erst_dbg_read(struct file *filp, char __user *ubuf,
 	if (rc < 0)
 		goto out;
 	if (len > ERST_DBG_RECORD_LEN_MAX) {
-		pr_warning(ERST_DBG_PFX
+		pr_warn(ERST_DBG_PFX
 			   "Record (ID: 0x%llx) length is too long: %zd\n",
-			   id, len);
+			id, len);
 		rc = -EIO;
 		goto out;
 	}
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index e53bef6cf53c..e86b0029b5a1 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -254,10 +254,9 @@ static struct ghes *ghes_new(struct acpi_hest_generic *generic)
 		goto err_free;
 	error_block_length = generic->error_block_length;
 	if (error_block_length > GHES_ESTATUS_MAX_SIZE) {
-		pr_warning(FW_WARN GHES_PFX
-			   "Error status block length is too long: %u for "
-			   "generic hardware error source: %d.\n",
-			   error_block_length, generic->header.source_id);
+		pr_warn(FW_WARN GHES_PFX
+			   "Error status block length is too long: %u for generic hardware error source: %d.\n",
+			error_block_length, generic->header.source_id);
 		error_block_length = GHES_ESTATUS_MAX_SIZE;
 	}
 	ghes->estatus = kmalloc(error_block_length, GFP_KERNEL);
@@ -345,9 +344,9 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
 	rc = apei_read(&buf_paddr, &g->error_status_address);
 	if (rc) {
 		if (!silent && printk_ratelimit())
-			pr_warning(FW_WARN GHES_PFX
+			pr_warn(FW_WARN GHES_PFX
 "Failed to read error status block address for hardware error source: %d.\n",
-				   g->header.source_id);
+				g->header.source_id);
 		return -EIO;
 	}
 	if (!buf_paddr)
@@ -378,7 +377,7 @@ static int ghes_read_estatus(struct ghes *ghes, int silent)
 
 err_read_block:
 	if (rc && !silent && printk_ratelimit())
-		pr_warning(FW_WARN GHES_PFX
+		pr_warn(FW_WARN GHES_PFX
 			   "Failed to read error status block!\n");
 	return rc;
 }
@@ -671,8 +670,8 @@ static void ghes_add_timer(struct ghes *ghes)
 	unsigned long expire;
 
 	if (!g->notify.poll_interval) {
-		pr_warning(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",
-			   g->header.source_id);
+		pr_warn(FW_WARN GHES_PFX "Poll interval is 0 for generic hardware error source: %d, disabled.\n",
+			g->header.source_id);
 		return;
 	}
 	expire = jiffies + msecs_to_jiffies(g->notify.poll_interval);
@@ -974,21 +973,20 @@ static int ghes_probe(struct platform_device *ghes_dev)
 		}
 		break;
 	case ACPI_HEST_NOTIFY_LOCAL:
-		pr_warning(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",
-			   generic->header.source_id);
+		pr_warn(GHES_PFX "Generic hardware error source: %d notified via local interrupt is not supported!\n",
+			generic->header.source_id);
 		goto err;
 	default:
-		pr_warning(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",
-			   generic->notify.type, generic->header.source_id);
+		pr_warn(FW_WARN GHES_PFX "Unknown notification type: %u for generic hardware error source: %d\n",
+			generic->notify.type, generic->header.source_id);
 		goto err;
 	}
 
 	rc = -EIO;
 	if (generic->error_block_length <
 	    sizeof(struct acpi_hest_generic_status)) {
-		pr_warning(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",
-			   generic->error_block_length,
-			   generic->header.source_id);
+		pr_warn(FW_BUG GHES_PFX "Invalid error block length: %u for generic hardware error source: %d\n",
+			generic->error_block_length, generic->header.source_id);
 		goto err;
 	}
 	ghes = ghes_new(generic);
diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 8f2a98e23bba..107ca7a32c13 100644
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -92,15 +92,15 @@ int apei_hest_parse(apei_hest_func_t func, void *data)
 	for (i = 0; i < hest_tab->error_source_count; i++) {
 		len = hest_esrc_len(hest_hdr);
 		if (!len) {
-			pr_warning(FW_WARN HEST_PFX
+			pr_warn(FW_WARN HEST_PFX
 				   "Unknown or unused hardware error source "
 				   "type: %d for hardware error source: %d.\n",
-				   hest_hdr->type, hest_hdr->source_id);
+				hest_hdr->type, hest_hdr->source_id);
 			return -EINVAL;
 		}
 		if ((void *)hest_hdr + len >
 		    (void *)hest_tab + hest_tab->header.length) {
-			pr_warning(FW_BUG HEST_PFX
+			pr_warn(FW_BUG HEST_PFX
 		"Table contents overflow for hardware error source: %d.\n",
 				hest_hdr->source_id);
 			return -EINVAL;
@@ -162,8 +162,8 @@ static int __init hest_parse_ghes(struct acpi_hest_header *hest_hdr, void *data)
 		ghes_dev = ghes_arr->ghes_devs[i];
 		hdr = *(struct acpi_hest_header **)ghes_dev->dev.platform_data;
 		if (hdr->source_id == hest_hdr->source_id) {
-			pr_warning(FW_WARN HEST_PFX "Duplicated hardware error source ID: %d.\n",
-				   hdr->source_id);
+			pr_warn(FW_WARN HEST_PFX "Duplicated hardware error source ID: %d.\n",
+				hdr->source_id);
 			return -EIO;
 		}
 	}
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index cd4c4271dc4c..0f490ff21121 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -420,8 +420,8 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi,
 		u8 pol = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
 
 		if (triggering != trig || polarity != pol) {
-			pr_warning("ACPI: IRQ %d override to %s, %s\n", gsi,
-				   t ? "level" : "edge", p ? "low" : "high");
+			pr_warn("ACPI: IRQ %d override to %s, %s\n",
+				gsi, t ? "level" : "edge", p ? "low" : "high");
 			triggering = trig;
 			polarity = pol;
 		}
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 11/35] block/drbd: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (9 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 10/35] drivers/acpi: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 12/35] gdrom: " Joe Perches
                   ` (25 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Philipp Reisner, Lars Ellenberg; +Cc: drbd-dev, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/block

Prior to this patch, there were 2 uses of pr_warning and
26 uses of pr_warn in drivers/block

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/block/drbd/drbd_nl.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 908c704e20aa..4a237b4418bb 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -251,19 +251,18 @@ static int drbd_adm_prepare(struct drbd_config_context *adm_ctx,
 	/* some more paranoia, if the request was over-determined */
 	if (adm_ctx->device && adm_ctx->resource &&
 	    adm_ctx->device->resource != adm_ctx->resource) {
-		pr_warning("request: minor=%u, resource=%s; but that minor belongs to resource %s\n",
-				adm_ctx->minor, adm_ctx->resource->name,
-				adm_ctx->device->resource->name);
+		pr_warn("request: minor=%u, resource=%s; but that minor belongs to resource %s\n",
+			adm_ctx->minor, adm_ctx->resource->name,
+			adm_ctx->device->resource->name);
 		drbd_msg_put_info(adm_ctx->reply_skb, "minor exists in different resource");
 		return ERR_INVALID_REQUEST;
 	}
 	if (adm_ctx->device &&
 	    adm_ctx->volume != VOLUME_UNSPECIFIED &&
 	    adm_ctx->volume != adm_ctx->device->vnr) {
-		pr_warning("request: minor=%u, volume=%u; but that minor is volume %u in %s\n",
-				adm_ctx->minor, adm_ctx->volume,
-				adm_ctx->device->vnr,
-				adm_ctx->device->resource->name);
+		pr_warn("request: minor=%u, volume=%u; but that minor is volume %u in %s\n",
+			adm_ctx->minor, adm_ctx->volume,
+			adm_ctx->device->vnr, adm_ctx->device->resource->name);
 		drbd_msg_put_info(adm_ctx->reply_skb, "minor exists as different volume");
 		return ERR_INVALID_REQUEST;
 	}
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 12/35] gdrom: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (10 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 11/35] block/drbd: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 13/35] drivers/char: Convert remaining use " Joe Perches
                   ` (24 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/cdrom

Prior to this patch, there were 2 uses of pr_warning and
0 uses of pr_warn in drivers/cdrom

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/cdrom/gdrom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index 1372763a948f..19a644bec07d 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -773,7 +773,7 @@ static int probe_gdrom(struct platform_device *devptr)
 	int err;
 	/* Start the device */
 	if (gdrom_execute_diagnostic() != 1) {
-		pr_warning("ATA Probe for GDROM failed\n");
+		pr_warn("ATA Probe for GDROM failed\n");
 		return -ENODEV;
 	}
 	/* Print out firmware ID */
@@ -838,7 +838,7 @@ static int probe_gdrom(struct platform_device *devptr)
 probe_fail_no_mem:
 	unregister_blkdev(gdrom_major, GDROM_DEV_NAME);
 	gdrom_major = 0;
-	pr_warning("Probe failed - error is 0x%X\n", err);
+	pr_warn("Probe failed - error is 0x%X\n", err);
 	return err;
 }
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 13/35] drivers/char: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (11 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 12/35] gdrom: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:53   ` Amit Shah
  2017-02-17  7:11 ` [PATCH 14/35] clocksource: " Joe Perches
                   ` (23 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Amit Shah, Arnd Bergmann, Greg Kroah-Hartman; +Cc: virtualization, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/char

Prior to this patch, there were 1 use of pr_warning and
40 uses of pr_warn in drivers/char

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/char/virtio_console.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 17857beb4892..96002610b845 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -2294,7 +2294,7 @@ static int __init init(void)
 
 	pdrvdata.debugfs_dir = debugfs_create_dir("virtio-ports", NULL);
 	if (!pdrvdata.debugfs_dir)
-		pr_warning("Error creating debugfs dir for virtio-ports\n");
+		pr_warn("Error creating debugfs dir for virtio-ports\n");
 	INIT_LIST_HEAD(&pdrvdata.consoles);
 	INIT_LIST_HEAD(&pdrvdata.portdevs);
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 14/35] clocksource: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (12 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 13/35] drivers/char: Convert remaining use " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 15/35] drivers/crypto: Convert remaining uses " Joe Perches
                   ` (22 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/clocksource

Prior to this patch, there was 1 use of pr_warning and
34 uses of pr_warn in drivers/clocksource

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/clocksource/samsung_pwm_timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c
index 0093ece661fe..fa4c6ddc7d95 100644
--- a/drivers/clocksource/samsung_pwm_timer.c
+++ b/drivers/clocksource/samsung_pwm_timer.c
@@ -433,8 +433,8 @@ static int __init samsung_pwm_alloc(struct device_node *np,
 
 	of_property_for_each_u32(np, "samsung,pwm-outputs", prop, cur, val) {
 		if (val >= SAMSUNG_PWM_NUM) {
-			pr_warning("%s: invalid channel index in samsung,pwm-outputs property\n",
-								__func__);
+			pr_warn("%s: invalid channel index in samsung,pwm-outputs property\n",
+				__func__);
 			continue;
 		}
 		pwm.variant.output_mask |= 1 << val;
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 15/35] drivers/crypto: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (13 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 14/35] clocksource: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 16/35] fmc: Convert remaining use " Joe Perches
                   ` (21 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Herbert Xu, David S. Miller; +Cc: linux-crypto, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/crypto

Prior to this patch, there were 3 uses of pr_warning and
12 uses of pr_warn in drivers/crypto

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/crypto/n2_core.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index c5aac25a5738..82ab91adfee7 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -365,8 +365,8 @@ static int n2_hash_cra_init(struct crypto_tfm *tfm)
 	fallback_tfm = crypto_alloc_ahash(fallback_driver_name, 0,
 					  CRYPTO_ALG_NEED_FALLBACK);
 	if (IS_ERR(fallback_tfm)) {
-		pr_warning("Fallback driver '%s' could not be loaded!\n",
-			   fallback_driver_name);
+		pr_warn("Fallback driver '%s' could not be loaded!\n",
+			fallback_driver_name);
 		err = PTR_ERR(fallback_tfm);
 		goto out;
 	}
@@ -402,16 +402,16 @@ static int n2_hmac_cra_init(struct crypto_tfm *tfm)
 	fallback_tfm = crypto_alloc_ahash(fallback_driver_name, 0,
 					  CRYPTO_ALG_NEED_FALLBACK);
 	if (IS_ERR(fallback_tfm)) {
-		pr_warning("Fallback driver '%s' could not be loaded!\n",
-			   fallback_driver_name);
+		pr_warn("Fallback driver '%s' could not be loaded!\n",
+			fallback_driver_name);
 		err = PTR_ERR(fallback_tfm);
 		goto out;
 	}
 
 	child_shash = crypto_alloc_shash(n2alg->child_alg, 0, 0);
 	if (IS_ERR(child_shash)) {
-		pr_warning("Child shash '%s' could not be loaded!\n",
-			   n2alg->child_alg);
+		pr_warn("Child shash '%s' could not be loaded!\n",
+			n2alg->child_alg);
 		err = PTR_ERR(child_shash);
 		goto out_free_fallback;
 	}
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 16/35] fmc: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (14 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 15/35] drivers/crypto: Convert remaining uses " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 17/35] drivers/gpu: Convert remaining uses " Joe Perches
                   ` (20 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Alessandro Rubini; +Cc: linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/fmc

Prior to this patch, there was 1 use of pr_warning and
0 uses of pr_warn in drivers/fmc

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/fmc/fmc-fakedev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/fmc/fmc-fakedev.c b/drivers/fmc/fmc-fakedev.c
index 941d0930969a..fc9ca763dd57 100644
--- a/drivers/fmc/fmc-fakedev.c
+++ b/drivers/fmc/fmc-fakedev.c
@@ -147,7 +147,7 @@ static void ff_work_fn(struct work_struct *work)
 
 	ff = ff_dev_create();
 	if (IS_ERR(ff)) {
-		pr_warning("%s: can't re-create FMC devices\n", __func__);
+		pr_warn("%s: can't re-create FMC devices\n", __func__);
 		return;
 	}
 	ret = fmc_device_register_n(ff->fmc, ff_nr_dev);
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (15 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 16/35] fmc: Convert remaining use " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17 14:22   ` Christian König
  2017-02-17  7:11 ` [PATCH 18/35] drivers/ide: " Joe Perches
                   ` (19 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel
  Cc: Alex Deucher, Christian König, David Airlie, amd-gfx, dri-devel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/gpu

Prior to this patch, there were 15 uses of pr_warning and
20 uses of pr_warn in drivers/gpu

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  2 +-
 drivers/gpu/drm/amd/powerplay/inc/pp_debug.h         |  2 +-
 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c      |  4 ++--
 drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c   | 14 +++++++-------
 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c |  4 ++--
 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c     |  4 ++--
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
index b1de9e8ccdbc..83266408634e 100644
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
@@ -1535,7 +1535,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)
 					if (vddc >= 2000 || vddc == 0)
 						return -EINVAL;
 				} else {
-					pr_warning("failed to retrieving EVV voltage!\n");
+					pr_warn("failed to retrieving EVV voltage!\n");
 					continue;
 				}
 
diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
index 072880130cfb..f3f9ebb631a5 100644
--- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
+++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
@@ -37,7 +37,7 @@
 #define PP_ASSERT_WITH_CODE(cond, msg, code)	\
 	do {					\
 		if (!(cond)) {			\
-			pr_warning("%s\n", msg);	\
+			pr_warn("%s\n", msg);	\
 			code;			\
 		}				\
 	} while (0)
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
index 0f7a77b7312e..5450f5ef8e89 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
@@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)
 			return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
 	}
-	pr_warning("can't get the offset of type %x member %x\n", type, member);
+	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;
 }
 
@@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value)
 		return SMU73_MAX_LEVELS_MVDD;
 	}
 
-	pr_warning("can't get the mac of %x\n", value);
+	pr_warn("can't get the mac of %x\n", value);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
index ad82161df831..51adf04ab4b3 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
@@ -122,7 +122,7 @@ static void iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
 		break;
 	default:
 		smu_data->power_tune_defaults = &defaults_iceland;
-		pr_warning("Unknown V.I. Device ID.\n");
+		pr_warn("Unknown V.I. Device ID.\n");
 		break;
 	}
 	return;
@@ -378,7 +378,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
 			return -EINVAL);
 
 	if (NULL == hwmgr->dyn_state.cac_leakage_table) {
-		pr_warning("CAC Leakage Table does not exist, using vddc.\n");
+		pr_warn("CAC Leakage Table does not exist, using vddc.\n");
 		return 0;
 	}
 
@@ -394,7 +394,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
 				*lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
 				*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE);
 			} else {
-				pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");
+				pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");
 				*lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
 				*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
 			}
@@ -414,7 +414,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
 					*lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
 					*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE;
 				} else {
-					pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");
+					pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");
 					*lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
 					*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
 				}
@@ -423,7 +423,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
 		}
 
 		if (!vol_found)
-			pr_warning("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");
+			pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");
 	}
 
 	return 0;
@@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)
 			return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
 	}
-	pr_warning("can't get the offset of type %x member %x\n", type, member);
+	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;
 }
 
@@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value)
 		return SMU71_MAX_LEVELS_MVDD;
 	}
 
-	pr_warning("can't get the mac of %x\n", value);
+	pr_warn("can't get the mac of %x\n", value);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
index 0e26900e459e..deec874d874f 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
@@ -2180,7 +2180,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member)
 			return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
 	}
-	pr_warning("can't get the offset of type %x member %x\n", type, member);
+	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;
 }
 
@@ -2207,7 +2207,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value)
 		return SMU7_UVD_MCLK_HANDSHAKE_DISABLE;
 	}
 
-	pr_warning("can't get the mac of %x\n", value);
+	pr_warn("can't get the mac of %x\n", value);
 	return 0;
 }
 
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
index 331b0aba4a13..4d1439a498eb 100644
--- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
+++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
@@ -2657,7 +2657,7 @@ uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)
 			return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold);
 		}
 	}
-	pr_warning("can't get the offset of type %x member %x\n", type, member);
+	pr_warn("can't get the offset of type %x member %x\n", type, member);
 	return 0;
 }
 
@@ -2681,7 +2681,7 @@ uint32_t tonga_get_mac_definition(uint32_t value)
 	case SMU_MAX_LEVELS_MVDD:
 		return SMU72_MAX_LEVELS_MVDD;
 	}
-	pr_warning("can't get the mac value %x\n", value);
+	pr_warn("can't get the mac value %x\n", value);
 
 	return 0;
 }
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 18/35] drivers/ide: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (16 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 17/35] drivers/gpu: Convert remaining uses " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17 15:20   ` David Miller
  2017-02-17  7:11 ` [PATCH 19/35] drivers/input: " Joe Perches
                   ` (18 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: David S. Miller; +Cc: linux-ide, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/ide

Prior to this patch, there were 2 uses of pr_warning and
0 uses of pr_warn in drivers/ide

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/ide/tx4938ide.c | 2 +-
 drivers/ide/tx4939ide.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index 40a3f55b08dd..962eb92501b5 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -46,7 +46,7 @@ static void tx4938ide_tune_ebusc(unsigned int ebus_ch,
 	while ((shwt * 4 + wt + (wt ? 2 : 3)) * cycle < t->cycle)
 		shwt++;
 	if (shwt > 7) {
-		pr_warning("tx4938ide: SHWT violation (%d)\n", shwt);
+		pr_warn("tx4938ide: SHWT violation (%d)\n", shwt);
 		shwt = 7;
 	}
 	pr_debug("tx4938ide: ebus %d, bus cycle %dns, WT %d, SHWT %d\n",
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 67d4a7d4acc8..7fa4ff6fc099 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -364,9 +364,8 @@ static int tx4939ide_dma_test_irq(ide_drive_t *drive)
 	case TX4939IDE_INT_HOST | TX4939IDE_INT_XFEREND:
 		dma_stat = tx4939ide_readb(base, TX4939IDE_DMA_Stat);
 		if (!(dma_stat & ATA_DMA_INTR))
-			pr_warning("%s: weird interrupt status. "
-				   "DMA_Stat %#02x int_ctl %#04x\n",
-				   hwif->name, dma_stat, ctl);
+			pr_warn("%s: weird interrupt status. DMA_Stat %#02x int_ctl %#04x\n",
+				hwif->name, dma_stat, ctl);
 		found = 1;
 		break;
 	}
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 19/35] drivers/input: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (17 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 18/35] drivers/ide: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 20/35] drivers/isdn: " Joe Perches
                   ` (17 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: Dmitry Torokhov, linux-input

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/input

Prior to this patch, there were 8 uses of pr_warning and
17 uses of pr_warn in drivers/input

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/input/gameport/gameport.c | 4 ++--
 drivers/input/joystick/gamecon.c  | 3 ++-
 drivers/input/misc/apanel.c       | 3 ++-
 drivers/input/misc/xen-kbdfront.c | 8 ++++----
 drivers/input/serio/serio.c       | 8 ++++----
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
index 4a2a9e370be7..092cc4188b57 100644
--- a/drivers/input/gameport/gameport.c
+++ b/drivers/input/gameport/gameport.c
@@ -385,8 +385,8 @@ static int gameport_queue_event(void *object, struct module *owner,
 	}
 
 	if (!try_module_get(owner)) {
-		pr_warning("Can't get module reference, dropping event %d\n",
-			   event_type);
+		pr_warn("Can't get module reference, dropping event %d\n",
+			event_type);
 		kfree(event);
 		retval = -EINVAL;
 		goto out;
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index eae14d512353..c43f087a496d 100644
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -870,7 +870,8 @@ static int gc_setup_pad(struct gc *gc, int idx, int pad_type)
 
 		err = gc_n64_init_ff(input_dev, idx);
 		if (err) {
-			pr_warning("Failed to initiate rumble for N64 device %d\n", idx);
+			pr_warn("Failed to initiate rumble for N64 device %d\n",
+				idx);
 			goto err_free_dev;
 		}
 
diff --git a/drivers/input/misc/apanel.c b/drivers/input/misc/apanel.c
index 53630afab606..aad1df04c854 100644
--- a/drivers/input/misc/apanel.c
+++ b/drivers/input/misc/apanel.c
@@ -314,7 +314,8 @@ static int __init apanel_init(void)
 		if (devno >= APANEL_DEV_MAX)
 			pr_notice(APANEL ": unknown device %u found\n", devno);
 		else if (device_chip[devno] != CHIP_NONE)
-			pr_warning(APANEL ": duplicate entry for devno %u\n", devno);
+			pr_warn(APANEL ": duplicate entry for devno %u\n",
+				devno);
 
 		else if (method != 1 && method != 2 && method != 4) {
 			pr_notice(APANEL ": unknown method %u for devno %u\n",
diff --git a/drivers/input/misc/xen-kbdfront.c b/drivers/input/misc/xen-kbdfront.c
index 3900875dec10..1fd911d4fadf 100644
--- a/drivers/input/misc/xen-kbdfront.c
+++ b/drivers/input/misc/xen-kbdfront.c
@@ -84,8 +84,8 @@ static irqreturn_t input_handler(int rq, void *dev_id)
 				input_report_key(dev, event->key.keycode,
 						 event->key.pressed);
 			else
-				pr_warning("unhandled keycode 0x%x\n",
-					   event->key.keycode);
+				pr_warn("unhandled keycode 0x%x\n",
+					event->key.keycode);
 			break;
 		case XENKBD_TYPE_POS:
 			input_report_abs(dev, ABS_X, event->pos.abs_x);
@@ -133,7 +133,7 @@ static int xenkbd_probe(struct xenbus_device *dev,
 		ret = xenbus_write(XBT_NIL, dev->nodename,
 				   "request-abs-pointer", "1");
 		if (ret) {
-			pr_warning("xenkbd: can't request abs-pointer");
+			pr_warn("xenkbd: can't request abs-pointer\n");
 			abs = 0;
 		}
 	}
@@ -327,7 +327,7 @@ static void xenkbd_backend_changed(struct xenbus_device *dev,
 			ret = xenbus_write(XBT_NIL, info->xbdev->nodename,
 					   "request-abs-pointer", "1");
 			if (ret)
-				pr_warning("xenkbd: can't request abs-pointer");
+				pr_warn("xenkbd: can't request abs-pointer\n");
 		}
 
 		xenbus_switch_state(dev, XenbusStateConnected);
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 1ca7f551e2da..048ae748c4d1 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -285,8 +285,8 @@ static int serio_queue_event(void *object, struct module *owner,
 	}
 
 	if (!try_module_get(owner)) {
-		pr_warning("Can't get module reference, dropping event %d\n",
-			   event_type);
+		pr_warn("Can't get module reference, dropping event %d\n",
+			event_type);
 		kfree(event);
 		retval = -EINVAL;
 		goto out;
@@ -823,8 +823,8 @@ static void serio_attach_driver(struct serio_driver *drv)
 
 	error = driver_attach(&drv->driver);
 	if (error)
-		pr_warning("driver_attach() failed for %s with error %d\n",
-			   drv->driver.name, error);
+		pr_warn("driver_attach() failed for %s with error %d\n",
+			drv->driver.name, error);
 }
 
 int __serio_register_driver(struct serio_driver *drv, struct module *owner, const char *mod_name)
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 20/35] drivers/isdn: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (18 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 19/35] drivers/input: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  8:49   ` Paul Bolle
  2017-02-17  7:11 ` [PATCH 21/35] drivers/macintosh: " Joe Perches
                   ` (16 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Paul Bolle; +Cc: Karsten Keil, gigaset307x-common, netdev, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/isdn

Prior to this patch, there were 20 uses of pr_warning and
3 uses of pr_warn in drivers/isdn

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/isdn/gigaset/interface.c        |  2 +-
 drivers/isdn/hardware/mISDN/avmfritz.c  | 17 +++++++++--------
 drivers/isdn/hardware/mISDN/hfcmulti.c  |  8 ++++----
 drivers/isdn/hardware/mISDN/hfcpci.c    |  4 ++--
 drivers/isdn/hardware/mISDN/hfcsusb.c   |  4 ++--
 drivers/isdn/hardware/mISDN/mISDNipac.c |  4 ++--
 drivers/isdn/hardware/mISDN/mISDNisar.c | 10 +++++-----
 drivers/isdn/hardware/mISDN/netjet.c    |  8 ++++----
 drivers/isdn/hardware/mISDN/w6692.c     | 12 ++++++------
 drivers/isdn/mISDN/hwchannel.c          |  8 ++++----
 10 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
index 600c79b030cd..4a2496d3f4ae 100644
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@ -510,7 +510,7 @@ void gigaset_if_init(struct cardstate *cs)
 	if (!IS_ERR(cs->tty_dev))
 		dev_set_drvdata(cs->tty_dev, cs);
 	else {
-		pr_warning("could not register device to the tty subsystem\n");
+		pr_warn("could not register device to the tty subsystem\n");
 		cs->tty_dev = NULL;
 	}
 	mutex_unlock(&cs->mutex);
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index e3fa1cd64470..af88a0a7112c 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -414,8 +414,8 @@ hdlc_empty_fifo(struct bchannel *bch, int count)
 	} else {
 		cnt = bchannel_get_rxbuf(bch, count);
 		if (cnt < 0) {
-			pr_warning("%s.B%d: No bufferspace for %d bytes\n",
-				   fc->name, bch->nr, count);
+			pr_warn("%s.B%d: No bufferspace for %d bytes\n",
+				fc->name, bch->nr, count);
 			return;
 		}
 		p = skb_put(bch->rx_skb, count);
@@ -551,8 +551,8 @@ HDLC_irq(struct bchannel *bch, u32 stat)
 	}
 	if (stat & HDLC_INT_RPR) {
 		if (stat & HDLC_STAT_RDO) {
-			pr_warning("%s: ch%d stat %x RDO\n",
-				   fc->name, bch->nr, stat);
+			pr_warn("%s: ch%d stat %x RDO\n",
+				fc->name, bch->nr, stat);
 			hdlc->ctrl.sr.xml = 0;
 			hdlc->ctrl.sr.cmd |= HDLC_CMD_RRS;
 			write_ctrl(bch, 1);
@@ -574,8 +574,8 @@ HDLC_irq(struct bchannel *bch, u32 stat)
 				    HDLC_STAT_CRCVFR) {
 					recv_Bchannel(bch, 0, false);
 				} else {
-					pr_warning("%s: got invalid frame\n",
-						   fc->name);
+					pr_warn("%s: got invalid frame\n",
+						fc->name);
 					skb_trim(bch->rx_skb, 0);
 				}
 			}
@@ -587,8 +587,9 @@ HDLC_irq(struct bchannel *bch, u32 stat)
 		 * restart transmitting the whole frame on HDLC
 		 * in transparent mode we send the next data
 		 */
-		pr_warning("%s: ch%d stat %x XDU %s\n", fc->name, bch->nr,
-			   stat, bch->tx_skb ? "tx_skb" : "no tx_skb");
+		pr_warn("%s: ch%d stat %x XDU %s\n",
+			fc->name, bch->nr,
+			stat, bch->tx_skb ? "tx_skb" : "no tx_skb");
 		if (bch->tx_skb && bch->tx_skb->len) {
 			if (!test_bit(FLG_TRANSPARENT, &bch->Flags))
 				bch->tx_idx = 0;
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c
index 480c2d7794eb..7749b684acbc 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -2262,8 +2262,8 @@ hfcmulti_rx(struct hfc_multi *hc, int ch)
 	if (bch) {
 		maxlen = bchannel_get_rxbuf(bch, Zsize);
 		if (maxlen < 0) {
-			pr_warning("card%d.B%d: No bufferspace for %d bytes\n",
-				   hc->id + 1, bch->nr, Zsize);
+			pr_warn("card%d.B%d: No bufferspace for %d bytes\n",
+				hc->id + 1, bch->nr, Zsize);
 			return;
 		}
 		sp = &bch->rx_skb;
@@ -2274,8 +2274,8 @@ hfcmulti_rx(struct hfc_multi *hc, int ch)
 		if (*sp == NULL) {
 			*sp = mI_alloc_skb(maxlen, GFP_ATOMIC);
 			if (*sp == NULL) {
-				pr_warning("card%d: No mem for dch rx_skb\n",
-					   hc->id + 1);
+				pr_warn("card%d: No mem for dch rx_skb\n",
+					hc->id + 1);
 				return;
 			}
 		}
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index ff48da61c94c..4d4fa6cb6412 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -579,8 +579,8 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *rxbz,
 	}
 	maxlen = bchannel_get_rxbuf(bch, fcnt_rx);
 	if (maxlen < 0) {
-		pr_warning("B%d: No bufferspace for %d bytes\n",
-			   bch->nr, fcnt_rx);
+		pr_warn("B%d: No bufferspace for %d bytes\n",
+			bch->nr, fcnt_rx);
 	} else {
 		ptr = skb_put(bch->rx_skb, fcnt_rx);
 		if (le16_to_cpu(*z2r) + fcnt_rx <= B_FIFO_SIZE + B_SUB_VAL)
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c
index 114f3bcba1b0..f9eaff9b4803 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -852,8 +852,8 @@ hfcsusb_rx_frame(struct usb_fifo *fifo, __u8 *data, unsigned int len,
 		if (maxlen < 0) {
 			if (rx_skb)
 				skb_trim(rx_skb, 0);
-			pr_warning("%s.B%d: No bufferspace for %d bytes\n",
-				   hw->name, fifo->bch->nr, len);
+			pr_warn("%s.B%d: No bufferspace for %d bytes\n",
+				hw->name, fifo->bch->nr, len);
 			spin_unlock(&hw->lock);
 			return;
 		}
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index 77dec28ba874..48b4225e9ba1 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -954,8 +954,8 @@ hscx_empty_fifo(struct hscx_hw *hscx, u8 count)
 		hscx_cmdr(hscx, 0x80); /* RMC */
 		if (hscx->bch.rx_skb)
 			skb_trim(hscx->bch.rx_skb, 0);
-		pr_warning("%s.B%d: No bufferspace for %d bytes\n",
-			   hscx->ip->name, hscx->bch.nr, count);
+		pr_warn("%s.B%d: No bufferspace for %d bytes\n",
+			hscx->ip->name, hscx->bch.nr, count);
 		return;
 	}
 	p = skb_put(hscx->bch.rx_skb, count);
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c
index feafa91c2ed9..d789378cd879 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -235,7 +235,7 @@ load_firmware(struct isar_hw *isar, const u8 *buf, int size)
 			goto reterror;
 		}
 		if (!poll_mbox(isar, 1000)) {
-			pr_warning("ISAR poll_mbox dkey failed\n");
+			pr_warn("ISAR poll_mbox dkey failed\n");
 			ret = -ETIME;
 			goto reterror;
 		}
@@ -445,8 +445,8 @@ isar_rcv_frame(struct isar_ch *ch)
 	case ISDN_P_B_MODEM_ASYNC:
 		maxlen = bchannel_get_rxbuf(&ch->bch, ch->is->clsb);
 		if (maxlen < 0) {
-			pr_warning("%s.B%d: No bufferspace for %d bytes\n",
-				   ch->is->name, ch->bch.nr, ch->is->clsb);
+			pr_warn("%s.B%d: No bufferspace for %d bytes\n",
+				ch->is->name, ch->bch.nr, ch->is->clsb);
 			ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
 			break;
 		}
@@ -456,8 +456,8 @@ isar_rcv_frame(struct isar_ch *ch)
 	case ISDN_P_B_HDLC:
 		maxlen = bchannel_get_rxbuf(&ch->bch, ch->is->clsb);
 		if (maxlen < 0) {
-			pr_warning("%s.B%d: No bufferspace for %d bytes\n",
-				   ch->is->name, ch->bch.nr, ch->is->clsb);
+			pr_warn("%s.B%d: No bufferspace for %d bytes\n",
+				ch->is->name, ch->bch.nr, ch->is->clsb);
 			ch->is->write_reg(ch->is->hw, ISAR_IIA, 0);
 			break;
 		}
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c
index afde4edef9ae..a21c5bcbf35c 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -393,8 +393,8 @@ read_dma(struct tiger_ch *bc, u32 idx, int cnt)
 	stat = bchannel_get_rxbuf(&bc->bch, cnt);
 	/* only transparent use the count here, HDLC overun is detected later */
 	if (stat == -ENOMEM) {
-		pr_warning("%s.B%d: No memory for %d bytes\n",
-			   card->name, bc->bch.nr, cnt);
+		pr_warn("%s.B%d: No memory for %d bytes\n",
+			card->name, bc->bch.nr, cnt);
 		return;
 	}
 	if (test_bit(FLG_TRANSPARENT, &bc->bch.Flags))
@@ -433,8 +433,8 @@ read_dma(struct tiger_ch *bc, u32 idx, int cnt)
 			recv_Bchannel(&bc->bch, 0, false);
 			stat = bchannel_get_rxbuf(&bc->bch, bc->bch.maxlen);
 			if (stat < 0) {
-				pr_warning("%s.B%d: No memory for %d bytes\n",
-					   card->name, bc->bch.nr, cnt);
+				pr_warn("%s.B%d: No memory for %d bytes\n",
+					card->name, bc->bch.nr, cnt);
 				return;
 			}
 		} else if (stat == -HDLC_CRC_ERROR) {
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c
index 3b067ea656bd..9be37546b210 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -485,8 +485,8 @@ W6692_empty_Bfifo(struct w6692_ch *wch, int count)
 		WriteW6692B(wch, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RACT);
 		if (wch->bch.rx_skb)
 			skb_trim(wch->bch.rx_skb, 0);
-		pr_warning("%s.B%d: No bufferspace for %d bytes\n",
-			   card->name, wch->bch.nr, count);
+		pr_warn("%s.B%d: No bufferspace for %d bytes\n",
+			card->name, wch->bch.nr, count);
 		return;
 	}
 	ptr = skb_put(wch->bch.rx_skb, count);
@@ -749,8 +749,8 @@ W6692B_interrupt(struct w6692_hw *card, int ch)
 				 wch->bch.nr, star);
 		}
 		if (star & W_B_STAR_XDOW) {
-			pr_warning("%s: B%d XDOW proto=%x\n", card->name,
-				   wch->bch.nr, wch->bch.state);
+			pr_warn("%s: B%d XDOW proto=%x\n",
+				card->name, wch->bch.nr, wch->bch.state);
 #ifdef ERROR_STATISTIC
 			wch->bch.err_xdu++;
 #endif
@@ -767,8 +767,8 @@ W6692B_interrupt(struct w6692_hw *card, int ch)
 			return; /* handle XDOW only once */
 	}
 	if (stat & W_B_EXI_XDUN) {
-		pr_warning("%s: B%d XDUN proto=%x\n", card->name,
-			   wch->bch.nr, wch->bch.state);
+		pr_warn("%s: B%d XDUN proto=%x\n",
+			card->name, wch->bch.nr, wch->bch.state);
 #ifdef ERROR_STATISTIC
 		wch->bch.err_xdu++;
 #endif
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c
index 84b4b0f7eb99..a79d7d3d1429 100644
--- a/drivers/isdn/mISDN/hwchannel.c
+++ b/drivers/isdn/mISDN/hwchannel.c
@@ -483,8 +483,8 @@ bchannel_get_rxbuf(struct bchannel *bch, int reqlen)
 	if (bch->rx_skb) {
 		len = skb_tailroom(bch->rx_skb);
 		if (len < reqlen) {
-			pr_warning("B%d no space for %d (only %d) bytes\n",
-				   bch->nr, reqlen, len);
+			pr_warn("B%d no space for %d (only %d) bytes\n",
+				bch->nr, reqlen, len);
 			if (test_bit(FLG_TRANSPARENT, &bch->Flags)) {
 				/* send what we have now and try a new buffer */
 				recv_Bchannel(bch, 0, true);
@@ -517,8 +517,8 @@ bchannel_get_rxbuf(struct bchannel *bch, int reqlen)
 	}
 	bch->rx_skb = mI_alloc_skb(len, GFP_ATOMIC);
 	if (!bch->rx_skb) {
-		pr_warning("B%d receive no memory for %d bytes\n",
-			   bch->nr, len);
+		pr_warn("B%d receive no memory for %d bytes\n",
+			bch->nr, len);
 		len = -ENOMEM;
 	}
 	return len;
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 21/35] drivers/macintosh: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (19 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 20/35] drivers/isdn: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 22/35] drivers/media: Convert remaining use " Joe Perches
                   ` (15 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Benjamin Herrenschmidt; +Cc: linuxppc-dev, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/macintosh

Prior to this patch, there were 10 uses of pr_warning and
1 use of pr_warn in drivers/macintosh

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/macintosh/windfarm_fcu_controls.c |  5 ++---
 drivers/macintosh/windfarm_lm87_sensor.c  |  4 ++--
 drivers/macintosh/windfarm_pm72.c         | 22 +++++++++++-----------
 drivers/macintosh/windfarm_rm31.c         |  6 +++---
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/drivers/macintosh/windfarm_fcu_controls.c b/drivers/macintosh/windfarm_fcu_controls.c
index 0226b796a21c..3d8d9eaf9b68 100644
--- a/drivers/macintosh/windfarm_fcu_controls.c
+++ b/drivers/macintosh/windfarm_fcu_controls.c
@@ -469,9 +469,8 @@ static void wf_fcu_lookup_fans(struct wf_fcu_priv *pv)
 			else
 				id = ((*reg) - 0x30) / 2;
 			if (id > 7) {
-				pr_warning("wf_fcu: Can't parse "
-				       "fan ID in device-tree for %s\n",
-					   np->full_name);
+				pr_warn("wf_fcu: Can't parse fan ID in device-tree for %s\n",
+					np->full_name);
 				break;
 			}
 			wf_fcu_add_fan(pv, name, type, id);
diff --git a/drivers/macintosh/windfarm_lm87_sensor.c b/drivers/macintosh/windfarm_lm87_sensor.c
index c071aab79dd1..93fb8660261d 100644
--- a/drivers/macintosh/windfarm_lm87_sensor.c
+++ b/drivers/macintosh/windfarm_lm87_sensor.c
@@ -126,8 +126,8 @@ static int wf_lm87_probe(struct i2c_client *client,
 		}
 	}
 	if (!name) {
-		pr_warning("wf_lm87: Unsupported sensor %s\n",
-			   client->dev.of_node->full_name);
+		pr_warn("wf_lm87: Unsupported sensor %s\n",
+			client->dev.of_node->full_name);
 		return -ENODEV;
 	}
 
diff --git a/drivers/macintosh/windfarm_pm72.c b/drivers/macintosh/windfarm_pm72.c
index e88cfb36a74d..1d3ac758a0c0 100644
--- a/drivers/macintosh/windfarm_pm72.c
+++ b/drivers/macintosh/windfarm_pm72.c
@@ -286,8 +286,8 @@ static void cpu_fans_tick_split(void)
 		/* Apply result directly to exhaust fan */
 		err = wf_control_set(cpu_rear_fans[cpu], sp->target);
 		if (err) {
-			pr_warning("wf_pm72: Fan %s reports error %d\n",
-			       cpu_rear_fans[cpu]->name, err);
+			pr_warn("wf_pm72: Fan %s reports error %d\n",
+				cpu_rear_fans[cpu]->name, err);
 			failure_state |= FAILURE_FAN;
 			break;
 		}
@@ -297,8 +297,8 @@ static void cpu_fans_tick_split(void)
 		DBG_LOTS("  CPU%d: intake = %d RPM\n", cpu, intake);
 		err = wf_control_set(cpu_front_fans[cpu], intake);
 		if (err) {
-			pr_warning("wf_pm72: Fan %s reports error %d\n",
-			       cpu_front_fans[cpu]->name, err);
+			pr_warn("wf_pm72: Fan %s reports error %d\n",
+				cpu_front_fans[cpu]->name, err);
 			failure_state |= FAILURE_FAN;
 			break;
 		}
@@ -368,22 +368,22 @@ static void cpu_fans_tick_combined(void)
 	for (cpu = 0; cpu < nr_chips; cpu++) {
 		err = wf_control_set(cpu_rear_fans[cpu], sp->target);
 		if (err) {
-			pr_warning("wf_pm72: Fan %s reports error %d\n",
-				   cpu_rear_fans[cpu]->name, err);
+			pr_warn("wf_pm72: Fan %s reports error %d\n",
+				cpu_rear_fans[cpu]->name, err);
 			failure_state |= FAILURE_FAN;
 		}
 		err = wf_control_set(cpu_front_fans[cpu], intake);
 		if (err) {
-			pr_warning("wf_pm72: Fan %s reports error %d\n",
-				   cpu_front_fans[cpu]->name, err);
+			pr_warn("wf_pm72: Fan %s reports error %d\n",
+				cpu_front_fans[cpu]->name, err);
 			failure_state |= FAILURE_FAN;
 		}
 		err = 0;
 		if (cpu_pumps[cpu])
 			err = wf_control_set(cpu_pumps[cpu], pump);
 		if (err) {
-			pr_warning("wf_pm72: Pump %s reports error %d\n",
-				   cpu_pumps[cpu]->name, err);
+			pr_warn("wf_pm72: Pump %s reports error %d\n",
+				cpu_pumps[cpu]->name, err);
 			failure_state |= FAILURE_FAN;
 		}
 	}
@@ -562,7 +562,7 @@ static void drives_fan_tick(void)
 
 	err = wf_sensor_get(drives_temp, &temp);
 	if (err) {
-		pr_warning("wf_pm72: drive bay temp sensor error %d\n", err);
+		pr_warn("wf_pm72: drive bay temp sensor error %d\n", err);
 		failure_state |= FAILURE_SENSOR;
 		wf_control_set_max(drives_fan);
 		return;
diff --git a/drivers/macintosh/windfarm_rm31.c b/drivers/macintosh/windfarm_rm31.c
index bdfcb8a8bfbb..8fb3f1aee96e 100644
--- a/drivers/macintosh/windfarm_rm31.c
+++ b/drivers/macintosh/windfarm_rm31.c
@@ -282,8 +282,8 @@ static void cpu_fans_tick(void)
 		for (i = 0; i < 3; i++) {
 			err = wf_control_set(cpu_fans[cpu][i], speed);
 			if (err) {
-				pr_warning("wf_rm31: Fan %s reports error %d\n",
-					   cpu_fans[cpu][i]->name, err);
+				pr_warn("wf_rm31: Fan %s reports error %d\n",
+					cpu_fans[cpu][i]->name, err);
 				failure_state |= FAILURE_FAN;
 			}
 		}
@@ -466,7 +466,7 @@ static void slots_fan_tick(void)
 
 	err = wf_sensor_get(slots_temp, &temp);
 	if (err) {
-		pr_warning("wf_rm31: slots temp sensor error %d\n", err);
+		pr_warn("wf_rm31: slots temp sensor error %d\n", err);
 		failure_state |= FAILURE_SENSOR;
 		wf_control_set_max(slots_fan);
 		return;
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 22/35] drivers/media: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (20 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 21/35] drivers/macintosh: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 23/35] drivers/mfd: Convert remaining uses " Joe Perches
                   ` (14 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: Mauro Carvalho Chehab, linux-media

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/media

Prior to this patch, there was 1 use of pr_warning and
310 uses of pr_warn in drivers/media

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/media/platform/sh_vou.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index ef2a519bcd4c..992d61a8b961 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -813,8 +813,8 @@ static u32 sh_vou_ntsc_mode(enum sh_vou_bus_fmt bus_fmt)
 {
 	switch (bus_fmt) {
 	default:
-		pr_warning("%s(): Invalid bus-format code %d, using default 8-bit\n",
-			   __func__, bus_fmt);
+		pr_warn("%s(): Invalid bus-format code %d, using default 8-bit\n",
+			__func__, bus_fmt);
 	case SH_VOU_BUS_8BIT:
 		return 1;
 	case SH_VOU_BUS_16BIT:
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 23/35] drivers/mfd: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (21 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 22/35] drivers/media: Convert remaining use " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-03-14 14:04   ` Lee Jones
  2017-03-23 10:52   ` Lee Jones
  2017-02-17  7:11 ` [PATCH 24/35] drivers/mtd: " Joe Perches
                   ` (13 subsequent siblings)
  36 siblings, 2 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Linus Walleij, Lee Jones, Tony Lindgren
  Cc: linux-arm-kernel, linux-kernel, linux-omap

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/mfd

Prior to this patch, there were 4 uses of pr_warning and
9 uses of pr_warn in drivers/mfd

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/mfd/db8500-prcmu.c  | 2 +-
 drivers/mfd/sta2x11-mfd.c   | 4 ++--
 drivers/mfd/twl4030-power.c | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
index ca38a6a14110..5c739ac752e8 100644
--- a/drivers/mfd/db8500-prcmu.c
+++ b/drivers/mfd/db8500-prcmu.c
@@ -2377,7 +2377,7 @@ static void ack_dbb_wakeup(void)
 
 static inline void print_unknown_header_warning(u8 n, u8 header)
 {
-	pr_warning("prcmu: Unknown message header (%d) in mailbox %d.\n",
+	pr_warn("prcmu: Unknown message header (%d) in mailbox %d\n",
 		header, n);
 }
 
diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
index 9292202039ee..3aeafa228baf 100644
--- a/drivers/mfd/sta2x11-mfd.c
+++ b/drivers/mfd/sta2x11-mfd.c
@@ -60,8 +60,8 @@ static struct sta2x11_mfd *sta2x11_mfd_find(struct pci_dev *pdev)
 	struct sta2x11_mfd *mfd;
 
 	if (!pdev && !list_empty(&sta2x11_mfd_list)) {
-		pr_warning("%s: Unspecified device, "
-			    "using first instance\n", __func__);
+		pr_warn("%s: Unspecified device, using first instance\n",
+			__func__);
 		return list_entry(sta2x11_mfd_list.next,
 				  struct sta2x11_mfd, list);
 	}
diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
index 1beb722f6080..8be023ba8e3e 100644
--- a/drivers/mfd/twl4030-power.c
+++ b/drivers/mfd/twl4030-power.c
@@ -502,9 +502,7 @@ static int load_twl4030_script(const struct twl4030_power_data *pdata,
 	}
 	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
 		if (!order)
-			pr_warning("TWL4030: Bad order of scripts (sleep "\
-					"script before wakeup) Leads to boot"\
-					"failure on some boards\n");
+			pr_warn("TWL4030: Bad order of scripts (sleep script before wakeup) Leads to boot failure on some boards\n");
 		err = twl4030_config_sleep_sequence(address);
 	}
 out:
@@ -929,8 +927,7 @@ static int twl4030_power_probe(struct platform_device *pdev)
 		err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
 				      TWL4030_PM_MASTER_CFG_P123_TRANSITION);
 		if (err) {
-			pr_warning("TWL4030 Unable to read registers\n");
-
+			pr_warn("TWL4030 Unable to read registers\n");
 		} else if (!(val & SEQ_OFFSYNC)) {
 			val |= SEQ_OFFSYNC;
 			err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 24/35] drivers/mtd: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (22 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 23/35] drivers/mfd: Convert remaining uses " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-04-19 20:11   ` Brian Norris
  2017-02-17  7:11 ` [PATCH 25/35] drivers/of: " Joe Perches
                   ` (12 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Boris Brezillon, Richard Weinberger, David Woodhouse,
	Brian Norris, Marek Vasut, Cyrille Pitchen
  Cc: linux-mtd, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/mtd

Prior to this patch, there were 7 uses of pr_warning and
31 uses of pr_warn in drivers/mtd

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c | 12 ++++++++----
 drivers/mtd/nand/cmx270_nand.c      |  4 ++--
 drivers/mtd/ofpart.c                |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 9dca881bb378..56aa6b75213d 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -323,7 +323,8 @@ static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd)
 	 * it should report a size of 8KBytes (0x0020*256).
 	 */
 	cfi->cfiq->EraseRegionInfo[0] = 0x002003ff;
-	pr_warning("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n", mtd->name);
+	pr_warn("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n",
+		mtd->name);
 }
 
 static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
@@ -333,7 +334,8 @@ static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
 
 	if ((cfi->cfiq->EraseRegionInfo[0] & 0xffff) == 0x003f) {
 		cfi->cfiq->EraseRegionInfo[0] |= 0x0040;
-		pr_warning("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n", mtd->name);
+		pr_warn("%s: Bad S29GL064N CFI data; adjust from 64 to 128 sectors\n",
+			mtd->name);
 	}
 }
 
@@ -344,7 +346,8 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd)
 
 	if ((cfi->cfiq->EraseRegionInfo[1] & 0xffff) == 0x007e) {
 		cfi->cfiq->EraseRegionInfo[1] &= ~0x0040;
-		pr_warning("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n", mtd->name);
+		pr_warn("%s: Bad S29GL032N CFI data; adjust from 127 to 63 sectors\n",
+			mtd->name);
 	}
 }
 
@@ -358,7 +361,8 @@ static void fixup_s29ns512p_sectors(struct mtd_info *mtd)
 	 * which is not permitted by CFI.
 	 */
 	cfi->cfiq->EraseRegionInfo[0] = 0x020001ff;
-	pr_warning("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n", mtd->name);
+	pr_warn("%s: Bad S29NS512P CFI data; adjust to 512 sectors\n",
+		mtd->name);
 }
 
 /* Used to fix CFI-Tables of chips without Extended Query Tables */
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c
index 226ac0bcafc6..949b9400dcb7 100644
--- a/drivers/mtd/nand/cmx270_nand.c
+++ b/drivers/mtd/nand/cmx270_nand.c
@@ -145,7 +145,7 @@ static int __init cmx270_init(void)
 
 	ret = gpio_request(GPIO_NAND_CS, "NAND CS");
 	if (ret) {
-		pr_warning("CM-X270: failed to request NAND CS gpio\n");
+		pr_warn("CM-X270: failed to request NAND CS gpio\n");
 		return ret;
 	}
 
@@ -153,7 +153,7 @@ static int __init cmx270_init(void)
 
 	ret = gpio_request(GPIO_NAND_RB, "NAND R/B");
 	if (ret) {
-		pr_warning("CM-X270: failed to request NAND R/B gpio\n");
+		pr_warn("CM-X270: failed to request NAND R/B gpio\n");
 		goto err_gpio_request;
 	}
 
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c
index 464470122493..2861c7079d7b 100644
--- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/ofpart.c
@@ -166,8 +166,8 @@ static int parse_ofoldpart_partitions(struct mtd_info *master,
 	if (!part)
 		return 0; /* No partitions found */
 
-	pr_warning("Device tree uses obsolete partition map binding: %s\n",
-			dp->full_name);
+	pr_warn("Device tree uses obsolete partition map binding: %s\n",
+		dp->full_name);
 
 	nr_parts = plen / sizeof(part[0]);
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 25/35] drivers/of: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (23 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 24/35] drivers/mtd: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 26/35] drivers/oprofile: " Joe Perches
                   ` (11 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Rob Herring, Frank Rowand; +Cc: devicetree, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/of

Prior to this patch, there were 5 uses of pr_warning and
19 uses of pr_warn in drivers/of

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/of/fdt.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index e5ce4b59e162..b9b1dc75e05d 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -514,8 +514,8 @@ static void *__unflatten_device_tree(const void *blob,
 	/* Second pass, do actual unflattening */
 	unflatten_dt_nodes(blob, mem, dad, mynodes);
 	if (be32_to_cpup(mem + size) != 0xdeadbeef)
-		pr_warning("End of tree marker overwritten: %08x\n",
-			   be32_to_cpup(mem + size));
+		pr_warn("End of tree marker overwritten: %08x\n",
+			be32_to_cpup(mem + size));
 
 	if (detached && mynodes) {
 		of_node_set_flag(*mynodes, OF_DETACHED);
@@ -1133,25 +1133,25 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size)
 	size &= PAGE_MASK;
 
 	if (base > MAX_MEMBLOCK_ADDR) {
-		pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
-				base, base + size);
+		pr_warn("Ignoring memory block 0x%llx - 0x%llx\n",
+			base, base + size);
 		return;
 	}
 
 	if (base + size - 1 > MAX_MEMBLOCK_ADDR) {
-		pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
-				((u64)MAX_MEMBLOCK_ADDR) + 1, base + size);
+		pr_warn("Ignoring memory range 0x%llx - 0x%llx\n",
+			((u64)MAX_MEMBLOCK_ADDR) + 1, base + size);
 		size = MAX_MEMBLOCK_ADDR - base + 1;
 	}
 
 	if (base + size < phys_offset) {
-		pr_warning("Ignoring memory block 0x%llx - 0x%llx\n",
-			   base, base + size);
+		pr_warn("Ignoring memory block 0x%llx - 0x%llx\n",
+			base, base + size);
 		return;
 	}
 	if (base < phys_offset) {
-		pr_warning("Ignoring memory range 0x%llx - 0x%llx\n",
-			   base, phys_offset);
+		pr_warn("Ignoring memory range 0x%llx - 0x%llx\n",
+			base, phys_offset);
 		size -= phys_offset - base;
 		base = phys_offset;
 	}
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 26/35] drivers/oprofile: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (24 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 25/35] drivers/of: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17 14:07   ` Robert Richter
  2017-02-17  7:11 ` [PATCH 27/35] drivers/platform: " Joe Perches
                   ` (10 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Robert Richter; +Cc: oprofile-list, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/oprofile

Prior to this patch, there were 2 uses of pr_warning and
0 uses of pr_warn in drivers/oprofile

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/oprofile/oprofile_perf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c
index d5b2732b1b81..6718440ab8da 100644
--- a/drivers/oprofile/oprofile_perf.c
+++ b/drivers/oprofile/oprofile_perf.c
@@ -45,8 +45,8 @@ static void op_overflow_handler(struct perf_event *event,
 	if (id != num_counters)
 		oprofile_add_sample(regs, id);
 	else
-		pr_warning("oprofile: ignoring spurious overflow "
-				"on cpu %u\n", cpu);
+		pr_warn("oprofile: ignoring spurious overflow on cpu %u\n",
+			cpu);
 }
 
 /*
@@ -87,8 +87,8 @@ static int op_create_counter(int cpu, int event)
 
 	if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
 		perf_event_release_kernel(pevent);
-		pr_warning("oprofile: failed to enable event %d "
-				"on CPU %d\n", event, cpu);
+		pr_warn("oprofile: failed to enable event %d on CPU %d\n",
+			event, cpu);
 		return -EBUSY;
 	}
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 27/35] drivers/platform: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (25 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 26/35] drivers/oprofile: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:45   ` Andy Shevchenko
  2017-02-17  7:11 ` [PATCH 28/35] drivers/rapidio: Convert remaining use " Joe Perches
                   ` (9 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Corentin Chary, Darren Hart, Andy Shevchenko
  Cc: acpi4asus-user, platform-driver-x86, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/platform

Prior to this patch, there were 7 uses of pr_warning and
108 uses of pr_warn in drivers/platform

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/platform/x86/asus-laptop.c    |  2 +-
 drivers/platform/x86/eeepc-laptop.c   |  2 +-
 drivers/platform/x86/intel_oaktrail.c | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 28551f5a2e07..7f248f84f49a 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -1163,7 +1163,7 @@ static void asus_als_switch(struct asus_laptop *asus, int value)
 		ret = write_acpi_int(asus->handle, METHOD_ALS_CONTROL, value);
 	}
 	if (ret)
-		pr_warning("Error setting light sensor switch\n");
+		pr_warn("Error setting light sensor switch\n");
 
 	asus->light_switch = value;
 }
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 8cdf315f9730..09f93eb49230 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -585,7 +585,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
 
 	port = acpi_get_pci_dev(handle);
 	if (!port) {
-		pr_warning("Unable to find port\n");
+		pr_warn("Unable to find port\n");
 		goto out_unlock;
 	}
 
diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
index 6aa33c4a809f..133b2f04643d 100644
--- a/drivers/platform/x86/intel_oaktrail.c
+++ b/drivers/platform/x86/intel_oaktrail.c
@@ -257,7 +257,7 @@ static int oaktrail_backlight_init(void)
 
 	if (IS_ERR(bd)) {
 		oaktrail_bl_device = NULL;
-		pr_warning("Unable to register backlight device\n");
+		pr_warn("Unable to register backlight device\n");
 		return PTR_ERR(bd);
 	}
 
@@ -327,20 +327,20 @@ static int __init oaktrail_init(void)
 
 	ret = platform_driver_register(&oaktrail_driver);
 	if (ret) {
-		pr_warning("Unable to register platform driver\n");
+		pr_warn("Unable to register platform driver\n");
 		goto err_driver_reg;
 	}
 
 	oaktrail_device = platform_device_alloc(DRIVER_NAME, -1);
 	if (!oaktrail_device) {
-		pr_warning("Unable to allocate platform device\n");
+		pr_warn("Unable to allocate platform device\n");
 		ret = -ENOMEM;
 		goto err_device_alloc;
 	}
 
 	ret = platform_device_add(oaktrail_device);
 	if (ret) {
-		pr_warning("Unable to add platform device\n");
+		pr_warn("Unable to add platform device\n");
 		goto err_device_add;
 	}
 
@@ -352,7 +352,7 @@ static int __init oaktrail_init(void)
 
 	ret = oaktrail_rfkill_init();
 	if (ret) {
-		pr_warning("Setup rfkill failed\n");
+		pr_warn("Setup rfkill failed\n");
 		goto err_rfkill;
 	}
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 28/35] drivers/rapidio: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (26 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 27/35] drivers/platform: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 29/35] drivers/scsi: " Joe Perches
                   ` (8 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Matt Porter, Alexandre Bounine; +Cc: linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/rapidio

Prior to this patch, there was 1 use of pr_warning and
2 uses of pr_warn in drivers/rapidio

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/rapidio/rio-sysfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index eda41563d06d..945c4b1d9717 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -278,8 +278,8 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev)
 	}
 
 	if (err)
-		pr_warning("RIO: Failed to create attribute file(s) for %s\n",
-			   rio_name(rdev));
+		pr_warn("RIO: Failed to create attribute file(s) for %s\n",
+			rio_name(rdev));
 
 	return err;
 }
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 29/35] drivers/scsi: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (27 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 28/35] drivers/rapidio: Convert remaining use " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 30/35] drivers/sh: " Joe Perches
                   ` (7 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: James E.J. Bottomley, Martin K. Petersen; +Cc: linux-scsi, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/scsi

Prior to this patch, there was 1 use of pr_warning and
96 uses of pr_warn in drivers/scsi

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/scsi/a3000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c
index e6375b4de79e..2be0f577abbf 100644
--- a/drivers/scsi/a3000.c
+++ b/drivers/scsi/a3000.c
@@ -38,7 +38,7 @@ static irqreturn_t a3000_intr(int irq, void *data)
 		spin_unlock_irqrestore(instance->host_lock, flags);
 		return IRQ_HANDLED;
 	}
-	pr_warning("Non-serviced A3000 SCSI-interrupt? ISTR = %02x\n", status);
+	pr_warn("Non-serviced A3000 SCSI-interrupt? ISTR = %02x\n", status);
 	return IRQ_NONE;
 }
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 30/35] drivers/sh: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (28 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 29/35] drivers/scsi: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 31/35] drivers/tty: Convert remaining uses " Joe Perches
                   ` (6 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: Yoshinori Sato, Rich Felker, linux-sh

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/sh

Prior to this patch, there was 1 use of pr_warning and
0 uses of pr_warn in drivers/sh

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/sh/intc/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 8e72bcbd3d6d..2258597f354a 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -100,8 +100,8 @@ static void __init intc_register_irq(struct intc_desc *desc,
 		primary = 1;
 
 	if (!data[0] && !data[1])
-		pr_warning("missing unique irq mask for irq %d (vect 0x%04x)\n",
-			   irq, irq2evt(irq));
+		pr_warn("missing unique irq mask for irq %d (vect 0x%04x)\n",
+			irq, irq2evt(irq));
 
 	data[0] = data[0] ? data[0] : intc_get_mask_handle(desc, d, enum_id, 1);
 	data[1] = data[1] ? data[1] : intc_get_prio_handle(desc, d, enum_id, 1);
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 31/35] drivers/tty: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (29 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 30/35] drivers/sh: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 32/35] drivers/video: " Joe Perches
                   ` (5 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Jiri Slaby; +Cc: linuxppc-dev, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/tty

Prior to this patch, there were 2 uses of pr_warning and
23 uses of pr_warn in drivers/tty

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/tty/hvc/hvcs.c | 2 +-
 drivers/tty/tty_io.c   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
index 7823d6d998cf..99bb875178d7 100644
--- a/drivers/tty/hvc/hvcs.c
+++ b/drivers/tty/hvc/hvcs.c
@@ -1575,7 +1575,7 @@ static int __init hvcs_module_init(void)
 	 */
 	rc = driver_create_file(&(hvcs_vio_driver.driver), &driver_attr_rescan);
 	if (rc)
-		pr_warning("HVCS: Failed to create rescan file (err %d)\n", rc);
+		pr_warn("HVCS: Failed to create rescan file (err %d)\n", rc);
 
 	return 0;
 }
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index a1fd3f7d487a..e9ba3d06d8e1 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2842,8 +2842,8 @@ static void tty_warn_deprecated_flags(struct serial_struct __user *ss)
 	flags &= ASYNC_DEPRECATED;
 
 	if (flags && __ratelimit(&depr_flags))
-		pr_warning("%s: '%s' is using deprecated serial flags (with no effect): %.8x\n",
-				__func__, get_task_comm(comm, current), flags);
+		pr_warn("%s: '%s' is using deprecated serial flags (with no effect): %.8x\n",
+			__func__, get_task_comm(comm, current), flags);
 }
 
 /*
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 32/35] drivers/video: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (30 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 31/35] drivers/tty: Convert remaining uses " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-03-21 15:17   ` Bartlomiej Zolnierkiewicz
  2017-02-17  7:11 ` [PATCH 33/35] kernel/trace: " Joe Perches
                   ` (4 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Benjamin Herrenschmidt
  Cc: Bartlomiej Zolnierkiewicz, linux-fbdev, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for drivers/video

Prior to this patch, there were 6 uses of pr_warning and
25 uses of pr_warn in drivers/video

Signed-off-by: Joe Perches <joe@perches.com>
---
 drivers/video/fbdev/aty/radeon_base.c | 4 ++--
 drivers/video/fbdev/core/fbmon.c      | 4 ++--
 drivers/video/fbdev/pxafb.c           | 7 +++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c
index 218339a4edaa..6b4c7872b375 100644
--- a/drivers/video/fbdev/aty/radeon_base.c
+++ b/drivers/video/fbdev/aty/radeon_base.c
@@ -2453,8 +2453,8 @@ static int radeonfb_pci_register(struct pci_dev *pdev,
 		err |= sysfs_create_bin_file(&rinfo->pdev->dev.kobj,
 						&edid2_attr);
 	if (err)
-		pr_warning("%s() Creating sysfs files failed, continuing\n",
-			   __func__);
+		pr_warn("%s() Creating sysfs files failed, continuing\n",
+			__func__);
 
 	/* save current mode regs before we switch into the new one
 	 * so we can restore this upon __exit
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 62c0cf79674f..687ebb053438 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -1073,9 +1073,9 @@ void fb_edid_add_monspecs(unsigned char *edid, struct fb_monspecs *specs)
 	for (i = specs->modedb_len + num; i < specs->modedb_len + num + svd_n; i++) {
 		int idx = svd[i - specs->modedb_len - num];
 		if (!idx || idx >= ARRAY_SIZE(cea_modes)) {
-			pr_warning("Reserved SVD code %d\n", idx);
+			pr_warn("Reserved SVD code %d\n", idx);
 		} else if (!cea_modes[idx].xres) {
-			pr_warning("Unimplemented SVD code %d\n", idx);
+			pr_warn("Unimplemented SVD code %d\n", idx);
 		} else {
 			memcpy(&m[i], cea_modes + idx, sizeof(m[i]));
 			pr_debug("Adding SVD #%d: %ux%u@%u\n", idx,
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index ef73f14d7ba0..b21a89b03fb4 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -645,7 +645,7 @@ static void overlay1fb_disable(struct pxafb_layer *ofb)
 	lcd_writel(ofb->fbi, FBR1, ofb->fbi->fdadr[DMA_OV1] | 0x3);
 
 	if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)
-		pr_warning("%s: timeout disabling overlay1\n", __func__);
+		pr_warn("%s: timeout disabling overlay1\n", __func__);
 
 	lcd_writel(ofb->fbi, LCCR5, lccr5);
 }
@@ -710,7 +710,7 @@ static void overlay2fb_disable(struct pxafb_layer *ofb)
 	lcd_writel(ofb->fbi, FBR4, ofb->fbi->fdadr[DMA_OV2_Cr] | 0x3);
 
 	if (wait_for_completion_timeout(&ofb->branch_done, 1 * HZ) == 0)
-		pr_warning("%s: timeout disabling overlay2\n", __func__);
+		pr_warn("%s: timeout disabling overlay2\n", __func__);
 }
 
 static struct pxafb_layer_ops ofb_ops[] = {
@@ -1187,8 +1187,7 @@ int pxafb_smart_flush(struct fb_info *info)
 	lcd_writel(fbi, LCCR0, fbi->reg_lccr0 | LCCR0_ENB);
 
 	if (wait_for_completion_timeout(&fbi->command_done, HZ/2) == 0) {
-		pr_warning("%s: timeout waiting for command done\n",
-				__func__);
+		pr_warn("%s: timeout waiting for command done\n", __func__);
 		ret = -ETIMEDOUT;
 	}
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 33/35] kernel/trace: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (31 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 32/35] drivers/video: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17 14:59   ` Steven Rostedt
  2017-02-17  7:11 ` [PATCH 34/35] lib: " Joe Perches
                   ` (3 subsequent siblings)
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Steven Rostedt; +Cc: linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for kernel/trace

Prior to this patch, there were 2 uses of pr_warning and
79 uses of pr_warn in kernel/trace

Signed-off-by: Joe Perches <joe@perches.com>
---
 kernel/trace/trace_benchmark.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/trace/trace_benchmark.c b/kernel/trace/trace_benchmark.c
index e49fbe901cfc..483e8b3fcb27 100644
--- a/kernel/trace/trace_benchmark.c
+++ b/kernel/trace/trace_benchmark.c
@@ -169,14 +169,14 @@ static int benchmark_event_kthread(void *arg)
 int trace_benchmark_reg(void)
 {
 	if (!ok_to_run) {
-		pr_warning("trace benchmark cannot be started via kernel command line\n");
+		pr_warn("trace benchmark cannot be started via kernel command line\n");
 		return -EBUSY;
 	}
 
 	bm_event_thread = kthread_run(benchmark_event_kthread,
 				      NULL, "event_benchmark");
 	if (IS_ERR(bm_event_thread)) {
-		pr_warning("trace benchmark failed to create kernel thread\n");
+		pr_warn("trace benchmark failed to create kernel thread\n");
 		return PTR_ERR(bm_event_thread);
 	}
 
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 34/35] lib: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (32 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 33/35] kernel/trace: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17  7:11 ` [PATCH 35/35] sound/soc: " Joe Perches
                   ` (2 subsequent siblings)
  36 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for lib

Prior to this patch, there were 2 uses of pr_warning and
59 uses of pr_warn in lib

Signed-off-by: Joe Perches <joe@perches.com>
---
 lib/cpu_rmap.c  | 2 +-
 lib/dma-debug.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cpu_rmap.c b/lib/cpu_rmap.c
index f610b2a10b3e..fa9778e57eab 100644
--- a/lib/cpu_rmap.c
+++ b/lib/cpu_rmap.c
@@ -258,7 +258,7 @@ irq_cpu_rmap_notify(struct irq_affinity_notify *notify, const cpumask_t *mask)
 
 	rc = cpu_rmap_update(glue->rmap, glue->index, mask);
 	if (rc)
-		pr_warning("irq_cpu_rmap_notify: update failed: %d\n", rc);
+		pr_warn("irq_cpu_rmap_notify: update failed: %d\n", rc);
 }
 
 /**
diff --git a/lib/dma-debug.c b/lib/dma-debug.c
index 60c57ec936db..bccb92a85268 100644
--- a/lib/dma-debug.c
+++ b/lib/dma-debug.c
@@ -176,7 +176,7 @@ static inline void dump_entry_trace(struct dma_debug_entry *entry)
 {
 #ifdef CONFIG_STACKTRACE
 	if (entry) {
-		pr_warning("Mapped at:\n");
+		pr_warn("Mapped at:\n");
 		print_stack_trace(&entry->stacktrace, 0);
 	}
 #endif
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* [PATCH 35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (33 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 34/35] lib: " Joe Perches
@ 2017-02-17  7:11 ` Joe Perches
  2017-02-17 20:28   ` Nicolin Chen
  2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
  2017-02-23 15:28 ` Rob Herring
  36 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-17  7:11 UTC (permalink / raw)
  To: Timur Tabi, Nicolin Chen, Xiubo Li, Fabio Estevam,
	Krzysztof Kozlowski, Sangbeom Kim, Sylwester Nawrocki
  Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
	alsa-devel, linuxppc-dev, linux-kernel

To enable eventual removal of pr_warning

This makes pr_warn use consistent for sound/soc

Prior to this patch, there were 5 uses of pr_warning and
10 uses of pr_warn in sound/soc

Signed-off-by: Joe Perches <joe@perches.com>
---
 sound/soc/fsl/imx-audmux.c     | 6 +++---
 sound/soc/samsung/s3c-i2s-v2.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index fc57da341d61..41e877d2b400 100644
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -152,7 +152,7 @@ static void audmux_debugfs_init(void)
 
 	audmux_debugfs_root = debugfs_create_dir("audmux", NULL);
 	if (!audmux_debugfs_root) {
-		pr_warning("Failed to create AUDMUX debugfs root\n");
+		pr_warn("Failed to create AUDMUX debugfs root\n");
 		return;
 	}
 
@@ -160,8 +160,8 @@ static void audmux_debugfs_init(void)
 		snprintf(buf, sizeof(buf), "ssi%lu", i);
 		if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,
 					 (void *)i, &audmux_debugfs_fops))
-			pr_warning("Failed to create AUDMUX port %lu debugfs file\n",
-				   i);
+			pr_warn("Failed to create AUDMUX port %lu debugfs file\n",
+				i);
 	}
 }
 
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 644f186fd35c..7423e4257a1b 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -669,13 +669,13 @@ static int s3c2412_i2s_suspend(struct snd_soc_dai *dai)
 		iismod = readl(i2s->regs + S3C2412_IISMOD);
 
 		if (iismod & S3C2412_IISCON_RXDMA_ACTIVE)
-			pr_warning("%s: RXDMA active?\n", __func__);
+			pr_warn("%s: RXDMA active?\n", __func__);
 
 		if (iismod & S3C2412_IISCON_TXDMA_ACTIVE)
-			pr_warning("%s: TXDMA active?\n", __func__);
+			pr_warn("%s: TXDMA active?\n", __func__);
 
 		if (iismod & S3C2412_IISCON_IIS_ACTIVE)
-			pr_warning("%s: IIS active\n", __func__);
+			pr_warn("%s: IIS active\n", __func__);
 	}
 
 	return 0;
-- 
2.10.0.rc2.1.g053435c

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 27/35] drivers/platform: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 27/35] drivers/platform: " Joe Perches
@ 2017-02-17  7:45   ` Andy Shevchenko
  0 siblings, 0 replies; 75+ messages in thread
From: Andy Shevchenko @ 2017-02-17  7:45 UTC (permalink / raw)
  To: Joe Perches
  Cc: Corentin Chary, Darren Hart, Andy Shevchenko, acpi4asus-user,
	Platform Driver, linux-kernel

On Fri, Feb 17, 2017 at 9:11 AM, Joe Perches <joe@perches.com> wrote:
> To enable eventual removal of pr_warning
>
> This makes pr_warn use consistent for drivers/platform
>
> Prior to this patch, there were 7 uses of pr_warning and
> 108 uses of pr_warn in drivers/platform

Acked-by: Andy Shevchenko <andy.shevchenko@gmail.com>

>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  drivers/platform/x86/asus-laptop.c    |  2 +-
>  drivers/platform/x86/eeepc-laptop.c   |  2 +-
>  drivers/platform/x86/intel_oaktrail.c | 10 +++++-----
>  3 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
> index 28551f5a2e07..7f248f84f49a 100644
> --- a/drivers/platform/x86/asus-laptop.c
> +++ b/drivers/platform/x86/asus-laptop.c
> @@ -1163,7 +1163,7 @@ static void asus_als_switch(struct asus_laptop *asus, int value)
>                 ret = write_acpi_int(asus->handle, METHOD_ALS_CONTROL, value);
>         }
>         if (ret)
> -               pr_warning("Error setting light sensor switch\n");
> +               pr_warn("Error setting light sensor switch\n");
>
>         asus->light_switch = value;
>  }
> diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
> index 8cdf315f9730..09f93eb49230 100644
> --- a/drivers/platform/x86/eeepc-laptop.c
> +++ b/drivers/platform/x86/eeepc-laptop.c
> @@ -585,7 +585,7 @@ static void eeepc_rfkill_hotplug(struct eeepc_laptop *eeepc, acpi_handle handle)
>
>         port = acpi_get_pci_dev(handle);
>         if (!port) {
> -               pr_warning("Unable to find port\n");
> +               pr_warn("Unable to find port\n");
>                 goto out_unlock;
>         }
>
> diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
> index 6aa33c4a809f..133b2f04643d 100644
> --- a/drivers/platform/x86/intel_oaktrail.c
> +++ b/drivers/platform/x86/intel_oaktrail.c
> @@ -257,7 +257,7 @@ static int oaktrail_backlight_init(void)
>
>         if (IS_ERR(bd)) {
>                 oaktrail_bl_device = NULL;
> -               pr_warning("Unable to register backlight device\n");
> +               pr_warn("Unable to register backlight device\n");
>                 return PTR_ERR(bd);
>         }
>
> @@ -327,20 +327,20 @@ static int __init oaktrail_init(void)
>
>         ret = platform_driver_register(&oaktrail_driver);
>         if (ret) {
> -               pr_warning("Unable to register platform driver\n");
> +               pr_warn("Unable to register platform driver\n");
>                 goto err_driver_reg;
>         }
>
>         oaktrail_device = platform_device_alloc(DRIVER_NAME, -1);
>         if (!oaktrail_device) {
> -               pr_warning("Unable to allocate platform device\n");
> +               pr_warn("Unable to allocate platform device\n");
>                 ret = -ENOMEM;
>                 goto err_device_alloc;
>         }
>
>         ret = platform_device_add(oaktrail_device);
>         if (ret) {
> -               pr_warning("Unable to add platform device\n");
> +               pr_warn("Unable to add platform device\n");
>                 goto err_device_add;
>         }
>
> @@ -352,7 +352,7 @@ static int __init oaktrail_init(void)
>
>         ret = oaktrail_rfkill_init();
>         if (ret) {
> -               pr_warning("Setup rfkill failed\n");
> +               pr_warn("Setup rfkill failed\n");
>                 goto err_rfkill;
>         }
>
> --
> 2.10.0.rc2.1.g053435c
>



-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
@ 2017-02-17  7:46   ` Pekka Paalanen
  2017-02-17  8:06   ` Juergen Gross
                     ` (4 subsequent siblings)
  5 siblings, 0 replies; 75+ messages in thread
From: Pekka Paalanen @ 2017-02-17  7:46 UTC (permalink / raw)
  To: Joe Perches
  Cc: Ning Sun, Steven Rostedt, Karol Herbst, Robert Richter,
	Len Brown, Boris Ostrovsky, Juergen Gross, Thomas Gleixner,
	H. Peter Anvin, x86, linux-kernel, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel

[-- Attachment #1: Type: text/plain, Size: 4312 bytes --]

On Thu, 16 Feb 2017 23:11:22 -0800
Joe Perches <joe@perches.com> wrote:

> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for arch/x86
> 
> Prior to this patch, there were 46 uses of pr_warning and
> 122 uses of pr_warn in arch/x86
> 
> Miscellanea:
> 
> o Coalesce a few formats and realign arguments
> o Convert a couple of multiple line printks to single line
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/x86/kernel/amd_gart_64.c          | 12 +++------
>  arch/x86/kernel/apic/apic.c            | 46 ++++++++++++++++------------------
>  arch/x86/kernel/apic/apic_noop.c       |  2 +-
>  arch/x86/kernel/setup_percpu.c         |  4 +--
>  arch/x86/kernel/tboot.c                | 15 ++++++-----
>  arch/x86/kernel/tsc_sync.c             |  8 +++---
>  arch/x86/mm/kmmio.c                    |  8 +++---
>  arch/x86/mm/mmio-mod.c                 |  5 ++--
>  arch/x86/mm/numa.c                     | 12 ++++-----
>  arch/x86/mm/numa_emulation.c           |  6 ++---
>  arch/x86/mm/testmmiotrace.c            |  5 ++--
>  arch/x86/oprofile/op_x86_model.h       |  6 ++---
>  arch/x86/platform/olpc/olpc-xo15-sci.c |  2 +-
>  arch/x86/platform/sfi/sfi.c            |  3 +--
>  arch/x86/xen/debugfs.c                 |  2 +-
>  arch/x86/xen/setup.c                   |  2 +-
>  16 files changed, 63 insertions(+), 75 deletions(-)
> 

Hi,

seems fine to me, even though I haven't been involved in the kernel
side for years.

For the hunks quoted below *only*:
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>

> diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
> index afc47f5c9531..ad70518cdcc7 100644
> --- a/arch/x86/mm/kmmio.c
> +++ b/arch/x86/mm/kmmio.c
> @@ -187,8 +187,8 @@ static int arm_kmmio_fault_page(struct kmmio_fault_page *f)
>  	int ret;
>  	WARN_ONCE(f->armed, KERN_ERR pr_fmt("kmmio page already armed.\n"));
>  	if (f->armed) {
> -		pr_warning("double-arm: addr 0x%08lx, ref %d, old %d\n",
> -			   f->addr, f->count, !!f->old_presence);
> +		pr_warn("double-arm: addr 0x%08lx, ref %d, old %d\n",
> +			f->addr, f->count, !!f->old_presence);
>  	}
>  	ret = clear_page_presence(f, true);
>  	WARN_ONCE(ret < 0, KERN_ERR pr_fmt("arming at 0x%08lx failed.\n"),
> @@ -335,8 +335,8 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
>  		 * something external causing them (f.e. using a debugger while
>  		 * mmio tracing enabled), or erroneous behaviour
>  		 */
> -		pr_warning("unexpected debug trap on CPU %d.\n",
> -			   smp_processor_id());
> +		pr_warn("unexpected debug trap on CPU %d\n",
> +			smp_processor_id());
>  		goto out;
>  	}
>  
> diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
> index bef36622e408..706ae44d1af7 100644
> --- a/arch/x86/mm/mmio-mod.c
> +++ b/arch/x86/mm/mmio-mod.c
> @@ -407,7 +407,7 @@ static void enter_uniprocessor(void)
>  	}
>  out:
>  	if (num_online_cpus() > 1)
> -		pr_warning("multiple CPUs still online, may miss events.\n");
> +		pr_warn("multiple CPUs still online, may miss events\n");
>  }
>  
>  static void leave_uniprocessor(void)
> @@ -431,8 +431,7 @@ static void leave_uniprocessor(void)
>  static void enter_uniprocessor(void)
>  {
>  	if (num_online_cpus() > 1)
> -		pr_warning("multiple CPUs are online, may miss events. "
> -			   "Suggest booting with maxcpus=1 kernel argument.\n");
> +		pr_warn("multiple CPUs are online, may miss events. Suggest booting with maxcpus=1 kernel argument.\n");
>  }
>  
>  static void leave_uniprocessor(void)

> diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c
> index 38868adf07ea..4a55e453296d 100644
> --- a/arch/x86/mm/testmmiotrace.c
> +++ b/arch/x86/mm/testmmiotrace.c
> @@ -121,9 +121,8 @@ static int __init init(void)
>  		return -ENXIO;
>  	}
>  
> -	pr_warning("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, "
> -		   "and writing 16 kB of rubbish in there.\n",
> -		   size >> 10, mmio_address);
> +	pr_warn("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, and writing 16 kB of rubbish in there\n",
> +		size >> 10, mmio_address);
>  	do_test(size);
>  	do_test_bulk_ioremapping();
>  	pr_info("All done.\n");


Thanks,
pq

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 13/35] drivers/char: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 13/35] drivers/char: Convert remaining use " Joe Perches
@ 2017-02-17  7:53   ` Amit Shah
  0 siblings, 0 replies; 75+ messages in thread
From: Amit Shah @ 2017-02-17  7:53 UTC (permalink / raw)
  To: Joe Perches
  Cc: Arnd Bergmann, Greg Kroah-Hartman, virtualization, linux-kernel

On (Thu) 16 Feb 2017 [23:11:26], Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/char
> 
> Prior to this patch, there were 1 use of pr_warning and
> 40 uses of pr_warn in drivers/char
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Reviewed-by: Amit Shah <amit@kernel.org>

Thanks,

		Amit
-- 
http://log.amitshah.net/

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
  2017-02-17  7:46   ` Pekka Paalanen
@ 2017-02-17  8:06   ` Juergen Gross
  2017-02-17 11:17   ` Thomas Gleixner
                     ` (3 subsequent siblings)
  5 siblings, 0 replies; 75+ messages in thread
From: Juergen Gross @ 2017-02-17  8:06 UTC (permalink / raw)
  To: Joe Perches, Ning Sun, Steven Rostedt, Karol Herbst,
	Pekka Paalanen, Robert Richter, Len Brown, Boris Ostrovsky
  Cc: Thomas Gleixner, H. Peter Anvin, x86, linux-kernel, tboot-devel,
	nouveau, oprofile-list, sfi-devel, xen-devel

On 17/02/17 08:11, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for arch/x86
> 
> Prior to this patch, there were 46 uses of pr_warning and
> 122 uses of pr_warn in arch/x86
> 
> Miscellanea:
> 
> o Coalesce a few formats and realign arguments
> o Convert a couple of multiple line printks to single line
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/x86/kernel/amd_gart_64.c          | 12 +++------
>  arch/x86/kernel/apic/apic.c            | 46 ++++++++++++++++------------------
>  arch/x86/kernel/apic/apic_noop.c       |  2 +-
>  arch/x86/kernel/setup_percpu.c         |  4 +--
>  arch/x86/kernel/tboot.c                | 15 ++++++-----
>  arch/x86/kernel/tsc_sync.c             |  8 +++---
>  arch/x86/mm/kmmio.c                    |  8 +++---
>  arch/x86/mm/mmio-mod.c                 |  5 ++--
>  arch/x86/mm/numa.c                     | 12 ++++-----
>  arch/x86/mm/numa_emulation.c           |  6 ++---
>  arch/x86/mm/testmmiotrace.c            |  5 ++--
>  arch/x86/oprofile/op_x86_model.h       |  6 ++---
>  arch/x86/platform/olpc/olpc-xo15-sci.c |  2 +-
>  arch/x86/platform/sfi/sfi.c            |  3 +--
>  arch/x86/xen/debugfs.c                 |  2 +-
>  arch/x86/xen/setup.c                   |  2 +-
>  16 files changed, 63 insertions(+), 75 deletions(-)

Xen parts:

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 08/35] sparc: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 08/35] sparc: Convert remaining use " Joe Perches
@ 2017-02-17  8:39   ` Sam Ravnborg
  2017-02-17 15:20   ` David Miller
  1 sibling, 0 replies; 75+ messages in thread
From: Sam Ravnborg @ 2017-02-17  8:39 UTC (permalink / raw)
  To: Joe Perches; +Cc: linux-kernel, David S. Miller, sparclinux

On Thu, Feb 16, 2017 at 11:11:21PM -0800, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for arch/sparc
> 
> Prior to this patch, there was 1 use of pr_warning and
> 8 uses of pr_warn in arch/sparc
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/sparc/kernel/smp_64.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
> index dcb12d9002e9..ca0f8faa79a9 100644
> --- a/arch/sparc/kernel/smp_64.c
> +++ b/arch/sparc/kernel/smp_64.c
> @@ -1564,9 +1564,8 @@ void __init setup_per_cpu_areas(void)
>  					    pcpu_alloc_bootmem,
>  					    pcpu_free_bootmem);
>  		if (rc)
> -			pr_warning("PERCPU: %s allocator failed (%d), "
> -				   "falling back to page size\n",
> -				   pcpu_fc_names[pcpu_chosen_fc], rc);
> +			pr_warn("PERCPU: %s allocator failed (%d), falling back to page size\n",
> +				pcpu_fc_names[pcpu_chosen_fc], rc);

Good to see that the string is now on one line.

Acked-by: Sam Ravnborg <sam@ravnborg.org>

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 20/35] drivers/isdn: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 20/35] drivers/isdn: " Joe Perches
@ 2017-02-17  8:49   ` Paul Bolle
  0 siblings, 0 replies; 75+ messages in thread
From: Paul Bolle @ 2017-02-17  8:49 UTC (permalink / raw)
  To: Joe Perches; +Cc: Karsten Keil, gigaset307x-common, netdev, linux-kernel

On Thu, 2017-02-16 at 23:11 -0800, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/isdn
> 
> Prior to this patch, there were 20 uses of pr_warning and
> 3 uses of pr_warn in drivers/isdn
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  drivers/isdn/gigaset/interface.c        |  2 +-

Gigaset hunk looks good to me:
    Acked-by: Paul Bolle <pebolle@tiscali.nl>

>  drivers/isdn/hardware/mISDN/avmfritz.c  | 17 +++++++++--------
>  drivers/isdn/hardware/mISDN/hfcmulti.c  |  8 ++++----
>  drivers/isdn/hardware/mISDN/hfcpci.c    |  4 ++--
>  drivers/isdn/hardware/mISDN/hfcsusb.c   |  4 ++--
>  drivers/isdn/hardware/mISDN/mISDNipac.c |  4 ++--
>  drivers/isdn/hardware/mISDN/mISDNisar.c | 10 +++++-----
>  drivers/isdn/hardware/mISDN/netjet.c    |  8 ++++----
>  drivers/isdn/hardware/mISDN/w6692.c     | 12 ++++++------
>  drivers/isdn/mISDN/hwchannel.c          |  8 ++++----
>  10 files changed, 39 insertions(+), 38 deletions(-)


Paul Bolle

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 03/35] arm64: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 03/35] arm64: " Joe Perches
@ 2017-02-17 10:52   ` Mark Rutland
  0 siblings, 0 replies; 75+ messages in thread
From: Mark Rutland @ 2017-02-17 10:52 UTC (permalink / raw)
  To: Joe Perches; +Cc: Will Deacon, Catalin Marinas, linux-arm-kernel, linux-kernel

On Thu, Feb 16, 2017 at 11:11:16PM -0800, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for arch/arm64
> 
> Prior to this patch, there were 7 uses of pr_warning and
> 27 uses of pr_warn in arch/arm64
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Looks nicer to me.

Acked-by: Mark Rutland <mark.rutland@arm.com>

Mark.

> ---
>  arch/arm64/include/asm/syscall.h  | 8 ++++----
>  arch/arm64/kernel/hw_breakpoint.c | 8 ++++----
>  arch/arm64/kernel/smp.c           | 4 ++--
>  3 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/syscall.h b/arch/arm64/include/asm/syscall.h
> index 709a574468f0..231f2c3fcf81 100644
> --- a/arch/arm64/include/asm/syscall.h
> +++ b/arch/arm64/include/asm/syscall.h
> @@ -68,8 +68,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]));
>  	}
>  
> @@ -92,8 +92,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;
>  	}
>  
> diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
> index 0296e7924240..6fa79ffd0c43 100644
> --- a/arch/arm64/kernel/hw_breakpoint.c
> +++ b/arch/arm64/kernel/hw_breakpoint.c
> @@ -62,7 +62,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;
>  	}
>  }
> @@ -123,7 +123,7 @@ static u64 read_wb_reg(int reg, int n)
>  	GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
>  	GEN_READ_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_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;
> @@ -138,7 +138,7 @@ static void write_wb_reg(int reg, int n, u64 val)
>  	GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WVR, AARCH64_DBG_REG_NAME_WVR, val);
>  	GEN_WRITE_WB_REG_CASES(AARCH64_DBG_REG_WCR, AARCH64_DBG_REG_NAME_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();
>  }
> @@ -156,7 +156,7 @@ static enum dbg_active_el debug_exception_level(int privilege)
>  	case AARCH64_BREAKPOINT_EL1:
>  		return DBG_ACTIVE_EL1;
>  	default:
> -		pr_warning("invalid breakpoint privilege level %d\n", privilege);
> +		pr_warn("invalid breakpoint privilege level %d\n", privilege);
>  		return -EINVAL;
>  	}
>  }
> diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
> index 827d52d78b67..9c396e34c090 100644
> --- a/arch/arm64/kernel/smp.c
> +++ b/arch/arm64/kernel/smp.c
> @@ -925,8 +925,8 @@ void smp_send_stop(void)
>  		udelay(1);
>  
>  	if (num_online_cpus() > 1)
> -		pr_warning("SMP: failed to stop secondary CPUs %*pbl\n",
> -			   cpumask_pr_args(cpu_online_mask));
> +		pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
> +			cpumask_pr_args(cpu_online_mask));
>  }
>  
>  /*
> -- 
> 2.10.0.rc2.1.g053435c
> 

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
  2017-02-17  7:46   ` Pekka Paalanen
  2017-02-17  8:06   ` Juergen Gross
@ 2017-02-17 11:17   ` Thomas Gleixner
  2017-02-17 14:07   ` Robert Richter
                     ` (2 subsequent siblings)
  5 siblings, 0 replies; 75+ messages in thread
From: Thomas Gleixner @ 2017-02-17 11:17 UTC (permalink / raw)
  To: Joe Perches
  Cc: Ning Sun, Steven Rostedt, Karol Herbst, Pekka Paalanen,
	Robert Richter, Len Brown, Boris Ostrovsky, Juergen Gross,
	H. Peter Anvin, x86, linux-kernel, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel

On Thu, 16 Feb 2017, Joe Perches wrote:

> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for arch/x86
> 
> Prior to this patch, there were 46 uses of pr_warning and
> 122 uses of pr_warn in arch/x86
> 
> Miscellanea:
> 
> o Coalesce a few formats and realign arguments
> o Convert a couple of multiple line printks to single line
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Thomas Gleixner <tglx@linutronix.de>

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (34 preceding siblings ...)
  2017-02-17  7:11 ` [PATCH 35/35] sound/soc: " Joe Perches
@ 2017-02-17 12:27 ` Rafael J. Wysocki
  2017-02-23 15:28 ` Rob Herring
  36 siblings, 0 replies; 75+ messages in thread
From: Rafael J. Wysocki @ 2017-02-17 12:27 UTC (permalink / raw)
  To: Joe Perches
  Cc: Alexander Shishkin, Karol Herbst, Pekka Paalanen,
	Richard Weinberger, Fabio Estevam, Linux Kernel Mailing List,
	linux-arm-kernel, linuxppc-dev, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel, ACPI Devel Maling List,
	drbd-dev, virtualization, linux-crypto, linux-ide,
	gigaset307x-common, linux-media, Linux OMAP Mailing List,
	linux-mtd, devicetree, acpi4asus-user, platform-driver-x86,
	open list:TARGET SUBSYSTEM, open list:FRAMEBUFFER LAYER,
	moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM...,
	linux-alpha, adi-buildroot-devel, linux-ia64, Linux-sh list,
	sparclinux, amd-gfx, dri-devel, linux-input, netdev

On Fri, Feb 17, 2017 at 8:11 AM, Joe Perches <joe@perches.com> wrote:
> There are ~4300 uses of pr_warn and ~250 uses of the older
> pr_warning in the kernel source tree.
>
> Make the use of pr_warn consistent across all kernel files.
>
> This excludes all files in tools/ as there is a separate
> define pr_warning for that directory tree and pr_warn is
> not used in tools/.
>
> Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.

Sorry about asking if that has been asked already.

Wouldn't it be slightly less intrusive to simply redefined
pr_warning() as a synonym for pr_warn()?

Thanks,
Rafael

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
                     ` (2 preceding siblings ...)
  2017-02-17 11:17   ` Thomas Gleixner
@ 2017-02-17 14:07   ` Robert Richter
  2017-02-17 15:01   ` Steven Rostedt
  2017-02-21  1:12   ` Adan Hawthorn
  5 siblings, 0 replies; 75+ messages in thread
From: Robert Richter @ 2017-02-17 14:07 UTC (permalink / raw)
  To: Joe Perches
  Cc: Ning Sun, Steven Rostedt, Karol Herbst, Pekka Paalanen,
	Len Brown, Boris Ostrovsky, Juergen Gross, Thomas Gleixner,
	H. Peter Anvin, x86, linux-kernel, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel

On 16.02.17 23:11:22, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for arch/x86
> 
> Prior to this patch, there were 46 uses of pr_warning and
> 122 uses of pr_warn in arch/x86
> 
> Miscellanea:
> 
> o Coalesce a few formats and realign arguments
> o Convert a couple of multiple line printks to single line
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/x86/kernel/amd_gart_64.c          | 12 +++------
>  arch/x86/kernel/apic/apic.c            | 46 ++++++++++++++++------------------
>  arch/x86/kernel/apic/apic_noop.c       |  2 +-
>  arch/x86/kernel/setup_percpu.c         |  4 +--
>  arch/x86/kernel/tboot.c                | 15 ++++++-----
>  arch/x86/kernel/tsc_sync.c             |  8 +++---
>  arch/x86/mm/kmmio.c                    |  8 +++---
>  arch/x86/mm/mmio-mod.c                 |  5 ++--
>  arch/x86/mm/numa.c                     | 12 ++++-----
>  arch/x86/mm/numa_emulation.c           |  6 ++---
>  arch/x86/mm/testmmiotrace.c            |  5 ++--
>  arch/x86/oprofile/op_x86_model.h       |  6 ++---

For oprofile:

Acked-by: Robert Richter <rric@kernel.org>

>  arch/x86/platform/olpc/olpc-xo15-sci.c |  2 +-
>  arch/x86/platform/sfi/sfi.c            |  3 +--
>  arch/x86/xen/debugfs.c                 |  2 +-
>  arch/x86/xen/setup.c                   |  2 +-
>  16 files changed, 63 insertions(+), 75 deletions(-)

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 26/35] drivers/oprofile: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 26/35] drivers/oprofile: " Joe Perches
@ 2017-02-17 14:07   ` Robert Richter
  0 siblings, 0 replies; 75+ messages in thread
From: Robert Richter @ 2017-02-17 14:07 UTC (permalink / raw)
  To: Joe Perches; +Cc: oprofile-list, linux-kernel

On 16.02.17 23:11:39, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/oprofile
> 
> Prior to this patch, there were 2 uses of pr_warning and
> 0 uses of pr_warn in drivers/oprofile
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Robert Richter <rric@kernel.org>

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 17/35] drivers/gpu: Convert remaining uses " Joe Perches
@ 2017-02-17 14:22   ` Christian König
  2017-02-18  5:03     ` Edward O'Callaghan
  0 siblings, 1 reply; 75+ messages in thread
From: Christian König @ 2017-02-17 14:22 UTC (permalink / raw)
  To: Joe Perches, linux-kernel; +Cc: Alex Deucher, David Airlie, amd-gfx, dri-devel

Am 17.02.2017 um 08:11 schrieb Joe Perches:
> To enable eventual removal of pr_warning
>
> This makes pr_warn use consistent for drivers/gpu
>
> Prior to this patch, there were 15 uses of pr_warning and
> 20 uses of pr_warn in drivers/gpu
>
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Christian König <christian.koenig@amd.com>.

> ---
>   drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  2 +-
>   drivers/gpu/drm/amd/powerplay/inc/pp_debug.h         |  2 +-
>   drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c      |  4 ++--
>   drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c   | 14 +++++++-------
>   drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c |  4 ++--
>   drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c     |  4 ++--
>   6 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
> index b1de9e8ccdbc..83266408634e 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
> @@ -1535,7 +1535,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr *hwmgr)
>   					if (vddc >= 2000 || vddc == 0)
>   						return -EINVAL;
>   				} else {
> -					pr_warning("failed to retrieving EVV voltage!\n");
> +					pr_warn("failed to retrieving EVV voltage!\n");
>   					continue;
>   				}
>   
> diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
> index 072880130cfb..f3f9ebb631a5 100644
> --- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
> +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
> @@ -37,7 +37,7 @@
>   #define PP_ASSERT_WITH_CODE(cond, msg, code)	\
>   	do {					\
>   		if (!(cond)) {			\
> -			pr_warning("%s\n", msg);	\
> +			pr_warn("%s\n", msg);	\
>   			code;			\
>   		}				\
>   	} while (0)
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
> index 0f7a77b7312e..5450f5ef8e89 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
> @@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type, uint32_t member)
>   			return offsetof(SMU73_Discrete_DpmTable, LowSclkInterruptThreshold);
>   		}
>   	}
> -	pr_warning("can't get the offset of type %x member %x\n", type, member);
> +	pr_warn("can't get the offset of type %x member %x\n", type, member);
>   	return 0;
>   }
>   
> @@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value)
>   		return SMU73_MAX_LEVELS_MVDD;
>   	}
>   
> -	pr_warning("can't get the mac of %x\n", value);
> +	pr_warn("can't get the mac of %x\n", value);
>   	return 0;
>   }
>   
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
> index ad82161df831..51adf04ab4b3 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
> @@ -122,7 +122,7 @@ static void iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
>   		break;
>   	default:
>   		smu_data->power_tune_defaults = &defaults_iceland;
> -		pr_warning("Unknown V.I. Device ID.\n");
> +		pr_warn("Unknown V.I. Device ID.\n");
>   		break;
>   	}
>   	return;
> @@ -378,7 +378,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>   			return -EINVAL);
>   
>   	if (NULL == hwmgr->dyn_state.cac_leakage_table) {
> -		pr_warning("CAC Leakage Table does not exist, using vddc.\n");
> +		pr_warn("CAC Leakage Table does not exist, using vddc.\n");
>   		return 0;
>   	}
>   
> @@ -394,7 +394,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>   				*lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
>   				*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage * VOLTAGE_SCALE);
>   			} else {
> -				pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");
> +				pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index, using maximum index from CAC table.\n");
>   				*lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
>   				*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
>   			}
> @@ -414,7 +414,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>   					*lo = hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc * VOLTAGE_SCALE;
>   					*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage) * VOLTAGE_SCALE;
>   				} else {
> -					pr_warning("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");
> +					pr_warn("Index from SCLK/VDDC Dependency Table exceeds the CAC Leakage Table index in second look up, using maximum index from CAC table.");
>   					*lo = hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Vddc * VOLTAGE_SCALE;
>   					*hi = (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count - 1].Leakage * VOLTAGE_SCALE);
>   				}
> @@ -423,7 +423,7 @@ static int iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>   		}
>   
>   		if (!vol_found)
> -			pr_warning("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");
> +			pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency Table, using vddc.\n");
>   	}
>   
>   	return 0;
> @@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type, uint32_t member)
>   			return offsetof(SMU71_Discrete_DpmTable, LowSclkInterruptThreshold);
>   		}
>   	}
> -	pr_warning("can't get the offset of type %x member %x\n", type, member);
> +	pr_warn("can't get the offset of type %x member %x\n", type, member);
>   	return 0;
>   }
>   
> @@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t value)
>   		return SMU71_MAX_LEVELS_MVDD;
>   	}
>   
> -	pr_warning("can't get the mac of %x\n", value);
> +	pr_warn("can't get the mac of %x\n", value);
>   	return 0;
>   }
>   
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
> index 0e26900e459e..deec874d874f 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
> @@ -2180,7 +2180,7 @@ uint32_t polaris10_get_offsetof(uint32_t type, uint32_t member)
>   			return offsetof(SMU74_Discrete_DpmTable, LowSclkInterruptThreshold);
>   		}
>   	}
> -	pr_warning("can't get the offset of type %x member %x\n", type, member);
> +	pr_warn("can't get the offset of type %x member %x\n", type, member);
>   	return 0;
>   }
>   
> @@ -2207,7 +2207,7 @@ uint32_t polaris10_get_mac_definition(uint32_t value)
>   		return SMU7_UVD_MCLK_HANDSHAKE_DISABLE;
>   	}
>   
> -	pr_warning("can't get the mac of %x\n", value);
> +	pr_warn("can't get the mac of %x\n", value);
>   	return 0;
>   }
>   
> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
> index 331b0aba4a13..4d1439a498eb 100644
> --- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
> @@ -2657,7 +2657,7 @@ uint32_t tonga_get_offsetof(uint32_t type, uint32_t member)
>   			return offsetof(SMU72_Discrete_DpmTable, LowSclkInterruptThreshold);
>   		}
>   	}
> -	pr_warning("can't get the offset of type %x member %x\n", type, member);
> +	pr_warn("can't get the offset of type %x member %x\n", type, member);
>   	return 0;
>   }
>   
> @@ -2681,7 +2681,7 @@ uint32_t tonga_get_mac_definition(uint32_t value)
>   	case SMU_MAX_LEVELS_MVDD:
>   		return SMU72_MAX_LEVELS_MVDD;
>   	}
> -	pr_warning("can't get the mac value %x\n", value);
> +	pr_warn("can't get the mac value %x\n", value);
>   
>   	return 0;
>   }

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 33/35] kernel/trace: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 33/35] kernel/trace: " Joe Perches
@ 2017-02-17 14:59   ` Steven Rostedt
  0 siblings, 0 replies; 75+ messages in thread
From: Steven Rostedt @ 2017-02-17 14:59 UTC (permalink / raw)
  To: Joe Perches; +Cc: linux-kernel

On Thu, 16 Feb 2017 23:11:46 -0800
Joe Perches <joe@perches.com> wrote:

> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for kernel/trace
> 
> Prior to this patch, there were 2 uses of pr_warning and
> 79 uses of pr_warn in kernel/trace
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
                     ` (3 preceding siblings ...)
  2017-02-17 14:07   ` Robert Richter
@ 2017-02-17 15:01   ` Steven Rostedt
  2017-02-21  1:12   ` Adan Hawthorn
  5 siblings, 0 replies; 75+ messages in thread
From: Steven Rostedt @ 2017-02-17 15:01 UTC (permalink / raw)
  To: Joe Perches
  Cc: Ning Sun, Karol Herbst, Pekka Paalanen, Robert Richter,
	Len Brown, Boris Ostrovsky, Juergen Gross, Thomas Gleixner,
	H. Peter Anvin, x86, linux-kernel, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel

On Thu, 16 Feb 2017 23:11:22 -0800
Joe Perches <joe@perches.com> wrote:

> diff --git a/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c
> index 38868adf07ea..4a55e453296d 100644
> --- a/arch/x86/mm/testmmiotrace.c
> +++ b/arch/x86/mm/testmmiotrace.c
> @@ -121,9 +121,8 @@ static int __init init(void)
>  		return -ENXIO;
>  	}
>  
> -	pr_warning("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, "
> -		   "and writing 16 kB of rubbish in there.\n",
> -		   size >> 10, mmio_address);
> +	pr_warn("WARNING: mapping %lu kB @ 0x%08lx in PCI address space, and writing 16 kB of rubbish in there\n",
> +		size >> 10, mmio_address);
>  	do_test(size);
>  	do_test_bulk_ioremapping();
>  	pr_info("All done.\n");

Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

-- Steve

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 08/35] sparc: Convert remaining use of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 08/35] sparc: Convert remaining use " Joe Perches
  2017-02-17  8:39   ` Sam Ravnborg
@ 2017-02-17 15:20   ` David Miller
  1 sibling, 0 replies; 75+ messages in thread
From: David Miller @ 2017-02-17 15:20 UTC (permalink / raw)
  To: joe; +Cc: linux-kernel, sparclinux

From: Joe Perches <joe@perches.com>
Date: Thu, 16 Feb 2017 23:11:21 -0800

> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for arch/sparc
> 
> Prior to this patch, there was 1 use of pr_warning and
> 8 uses of pr_warn in arch/sparc
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: David S. Miller <davem@davemloft.net>

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 18/35] drivers/ide: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 18/35] drivers/ide: " Joe Perches
@ 2017-02-17 15:20   ` David Miller
  0 siblings, 0 replies; 75+ messages in thread
From: David Miller @ 2017-02-17 15:20 UTC (permalink / raw)
  To: joe; +Cc: linux-ide, linux-kernel

From: Joe Perches <joe@perches.com>
Date: Thu, 16 Feb 2017 23:11:31 -0800

> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/ide
> 
> Prior to this patch, there were 2 uses of pr_warning and
> 0 uses of pr_warn in drivers/ide
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Acked-by: David S. Miller <davem@davemloft.net>

^ permalink raw reply	[flat|nested] 75+ messages in thread

* RE: [PATCH 02/35] ARM: ep93xx: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 02/35] ARM: ep93xx: " Joe Perches
@ 2017-02-17 16:26   ` Hartley Sweeten
  0 siblings, 0 replies; 75+ messages in thread
From: Hartley Sweeten @ 2017-02-17 16:26 UTC (permalink / raw)
  To: Joe Perches, Ryan Mallon; +Cc: Russell King, linux-arm-kernel, linux-kernel

On Friday, February 17, 2017 12:11 AM, Joe Perches wrote:
> To enable eventual removal of pr_warning.
>
> This makes pr_warn use consistent for arch/arm
>
> Prior to this patch, there were 2 uses of pr_warning and
> 405 uses of pr_warn in arch/arm
>
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  arch/arm/mach-ep93xx/core.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
> index c393b1b0310d..d6e907b6cc31 100644
> --- a/arch/arm/mach-ep93xx/core.c
> +++ b/arch/arm/mach-ep93xx/core.c
> @@ -346,9 +346,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),

For the ep93xx part:

Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 35/35] sound/soc: " Joe Perches
@ 2017-02-17 20:28   ` Nicolin Chen
  2017-02-17 23:48     ` Mark Brown
  0 siblings, 1 reply; 75+ messages in thread
From: Nicolin Chen @ 2017-02-17 20:28 UTC (permalink / raw)
  To: Joe Perches
  Cc: Timur Tabi, Xiubo Li, Fabio Estevam, Krzysztof Kozlowski,
	Sangbeom Kim, Sylwester Nawrocki, Liam Girdwood, Mark Brown,
	Jaroslav Kysela, Takashi Iwai, alsa-devel, linuxppc-dev,
	linux-kernel

On Thu, Feb 16, 2017 at 11:11:48PM -0800, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for sound/soc
> 
> Prior to this patch, there were 5 uses of pr_warning and
> 10 uses of pr_warn in sound/soc
> 
> Signed-off-by: Joe Perches <joe@perches.com>

For imx-audmux.c,

Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>

> ---
>  sound/soc/fsl/imx-audmux.c     | 6 +++---
>  sound/soc/samsung/s3c-i2s-v2.c | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
> index fc57da341d61..41e877d2b400 100644
> --- a/sound/soc/fsl/imx-audmux.c
> +++ b/sound/soc/fsl/imx-audmux.c
> @@ -152,7 +152,7 @@ static void audmux_debugfs_init(void)
>  
>  	audmux_debugfs_root = debugfs_create_dir("audmux", NULL);
>  	if (!audmux_debugfs_root) {
> -		pr_warning("Failed to create AUDMUX debugfs root\n");
> +		pr_warn("Failed to create AUDMUX debugfs root\n");
>  		return;
>  	}
>  
> @@ -160,8 +160,8 @@ static void audmux_debugfs_init(void)
>  		snprintf(buf, sizeof(buf), "ssi%lu", i);
>  		if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,
>  					 (void *)i, &audmux_debugfs_fops))
> -			pr_warning("Failed to create AUDMUX port %lu debugfs file\n",
> -				   i);
> +			pr_warn("Failed to create AUDMUX port %lu debugfs file\n",
> +				i);
>  	}
>  }
>  
> diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
> index 644f186fd35c..7423e4257a1b 100644
> --- a/sound/soc/samsung/s3c-i2s-v2.c
> +++ b/sound/soc/samsung/s3c-i2s-v2.c
> @@ -669,13 +669,13 @@ static int s3c2412_i2s_suspend(struct snd_soc_dai *dai)
>  		iismod = readl(i2s->regs + S3C2412_IISMOD);
>  
>  		if (iismod & S3C2412_IISCON_RXDMA_ACTIVE)
> -			pr_warning("%s: RXDMA active?\n", __func__);
> +			pr_warn("%s: RXDMA active?\n", __func__);
>  
>  		if (iismod & S3C2412_IISCON_TXDMA_ACTIVE)
> -			pr_warning("%s: TXDMA active?\n", __func__);
> +			pr_warn("%s: TXDMA active?\n", __func__);
>  
>  		if (iismod & S3C2412_IISCON_IIS_ACTIVE)
> -			pr_warning("%s: IIS active\n", __func__);
> +			pr_warn("%s: IIS active\n", __func__);
>  	}
>  
>  	return 0;
> -- 
> 2.10.0.rc2.1.g053435c
> 

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17 20:28   ` Nicolin Chen
@ 2017-02-17 23:48     ` Mark Brown
  2017-02-17 23:57       ` Nicolin Chen
  0 siblings, 1 reply; 75+ messages in thread
From: Mark Brown @ 2017-02-17 23:48 UTC (permalink / raw)
  To: Nicolin Chen
  Cc: Joe Perches, Timur Tabi, Xiubo Li, Fabio Estevam,
	Krzysztof Kozlowski, Sangbeom Kim, Sylwester Nawrocki,
	Liam Girdwood, Jaroslav Kysela, Takashi Iwai, alsa-devel,
	linuxppc-dev, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 600 bytes --]

On Fri, Feb 17, 2017 at 12:28:44PM -0800, Nicolin Chen wrote:
> On Thu, Feb 16, 2017 at 11:11:48PM -0800, Joe Perches wrote:
> > To enable eventual removal of pr_warning
> > 
> > This makes pr_warn use consistent for sound/soc
> > 
> > Prior to this patch, there were 5 uses of pr_warning and
> > 10 uses of pr_warn in sound/soc
> > 
> > Signed-off-by: Joe Perches <joe@perches.com>
> 
> For imx-audmux.c,

I don't have this patch, perhaps it got caught in a spam filter or
perhaps it got deleted because as ever you're not using subject lines
reflecting the style for the subsystem.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17 23:48     ` Mark Brown
@ 2017-02-17 23:57       ` Nicolin Chen
  2017-02-18  0:20         ` Joe Perches
  0 siblings, 1 reply; 75+ messages in thread
From: Nicolin Chen @ 2017-02-17 23:57 UTC (permalink / raw)
  To: Mark Brown
  Cc: Joe Perches, Timur Tabi, Xiubo Li, Fabio Estevam,
	Krzysztof Kozlowski, Sangbeom Kim, Sylwester Nawrocki,
	Liam Girdwood, Jaroslav Kysela, Takashi Iwai, alsa-devel,
	linuxppc-dev, linux-kernel

On Fri, Feb 17, 2017 at 11:48:54PM +0000, Mark Brown wrote:
> On Fri, Feb 17, 2017 at 12:28:44PM -0800, Nicolin Chen wrote:
> > On Thu, Feb 16, 2017 at 11:11:48PM -0800, Joe Perches wrote:
> > > To enable eventual removal of pr_warning
> > > 
> > > This makes pr_warn use consistent for sound/soc
> > > 
> > > Prior to this patch, there were 5 uses of pr_warning and
> > > 10 uses of pr_warn in sound/soc
> > > 
> > > Signed-off-by: Joe Perches <joe@perches.com>
> > 
> > For imx-audmux.c,
> 
> I don't have this patch, perhaps it got caught in a spam filter or
> perhaps it got deleted because as ever you're not using subject lines
> reflecting the style for the subsystem.

My bad that I didn't pay attention to the subject.

Joe, please fix it in v2. Thanks.

ASoC: Convert remaining uses of pr_warning to pr_warn

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17 23:57       ` Nicolin Chen
@ 2017-02-18  0:20         ` Joe Perches
  2017-02-20 19:06           ` Mark Brown
  0 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-18  0:20 UTC (permalink / raw)
  To: Nicolin Chen, Mark Brown
  Cc: Timur Tabi, Xiubo Li, Fabio Estevam, Krzysztof Kozlowski,
	Sangbeom Kim, Sylwester Nawrocki, Liam Girdwood, Jaroslav Kysela,
	Takashi Iwai, alsa-devel, linuxppc-dev, linux-kernel

On Fri, 2017-02-17 at 15:57 -0800, Nicolin Chen wrote:
> On Fri, Feb 17, 2017 at 11:48:54PM +0000, Mark Brown wrote:
> > On Fri, Feb 17, 2017 at 12:28:44PM -0800, Nicolin Chen wrote:
> > > On Thu, Feb 16, 2017 at 11:11:48PM -0800, Joe Perches wrote:
> > > > To enable eventual removal of pr_warning
> > > > 
> > > > This makes pr_warn use consistent for sound/soc
> > > > 
> > > > Prior to this patch, there were 5 uses of pr_warning and
> > > > 10 uses of pr_warn in sound/soc
> > > > 
> > > > Signed-off-by: Joe Perches <joe@perches.com>
> > > 
> > > For imx-audmux.c,
> > 
> > I don't have this patch, perhaps it got caught in a spam filter or
> > perhaps it got deleted because as ever you're not using subject lines
> > reflecting the style for the subsystem.
> 
> My bad that I didn't pay attention to the subject.
> 
> Joe, please fix it in v2. Thanks.
> 
> ASoC: Convert remaining uses of pr_warning to pr_warn

This is a treewide scripted patch which is
basically just a sed.

If or when you apply it, you should
fix it up to suit.

$ git log -1000 --pretty=oneline --no-merges sound/soc | \
  cut -f2- -d" " | cut -f1 -d":" |sort | uniq
ALSA
AsoC
ASoc
ASoC
ASOC
ASoC fix up SND_SOC_WM8985 dependency
drm/i915/dp
kthread
lib/vsprintf.c
scripts/spelling.txt
sgtl5000
SoC
sound/soc
treewide

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
  2017-02-17 14:22   ` Christian König
@ 2017-02-18  5:03     ` Edward O'Callaghan
  2017-02-23 15:02       ` Alex Deucher
  0 siblings, 1 reply; 75+ messages in thread
From: Edward O'Callaghan @ 2017-02-18  5:03 UTC (permalink / raw)
  To: Christian König, Joe Perches, linux-kernel
  Cc: Alex Deucher, David Airlie, dri-devel, amd-gfx


[-- Attachment #1.1: Type: text/plain, Size: 9646 bytes --]



On 02/18/2017 01:22 AM, Christian König wrote:
> Am 17.02.2017 um 08:11 schrieb Joe Perches:
>> To enable eventual removal of pr_warning
>>
>> This makes pr_warn use consistent for drivers/gpu
>>
>> Prior to this patch, there were 15 uses of pr_warning and
>> 20 uses of pr_warn in drivers/gpu
>>
>> Signed-off-by: Joe Perches <joe@perches.com>
> 
> Acked-by: Christian König <christian.koenig@amd.com>.

Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>

> 
>> ---
>>   drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  2 +-
>>   drivers/gpu/drm/amd/powerplay/inc/pp_debug.h         |  2 +-
>>   drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c      |  4 ++--
>>   drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c   | 14
>> +++++++-------
>>   drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c |  4 ++--
>>   drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c     |  4 ++--
>>   6 files changed, 15 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> index b1de9e8ccdbc..83266408634e 100644
>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>> @@ -1535,7 +1535,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr
>> *hwmgr)
>>                       if (vddc >= 2000 || vddc == 0)
>>                           return -EINVAL;
>>                   } else {
>> -                    pr_warning("failed to retrieving EVV voltage!\n");
>> +                    pr_warn("failed to retrieving EVV voltage!\n");
>>                       continue;
>>                   }
>>   diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>> b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>> index 072880130cfb..f3f9ebb631a5 100644
>> --- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>> +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>> @@ -37,7 +37,7 @@
>>   #define PP_ASSERT_WITH_CODE(cond, msg, code)    \
>>       do {                    \
>>           if (!(cond)) {            \
>> -            pr_warning("%s\n", msg);    \
>> +            pr_warn("%s\n", msg);    \
>>               code;            \
>>           }                \
>>       } while (0)
>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>> b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>> index 0f7a77b7312e..5450f5ef8e89 100644
>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>> @@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type,
>> uint32_t member)
>>               return offsetof(SMU73_Discrete_DpmTable,
>> LowSclkInterruptThreshold);
>>           }
>>       }
>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>> member);
>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>> member);
>>       return 0;
>>   }
>>   @@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value)
>>           return SMU73_MAX_LEVELS_MVDD;
>>       }
>>   -    pr_warning("can't get the mac of %x\n", value);
>> +    pr_warn("can't get the mac of %x\n", value);
>>       return 0;
>>   }
>>   diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>> b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>> index ad82161df831..51adf04ab4b3 100644
>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>> @@ -122,7 +122,7 @@ static void
>> iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
>>           break;
>>       default:
>>           smu_data->power_tune_defaults = &defaults_iceland;
>> -        pr_warning("Unknown V.I. Device ID.\n");
>> +        pr_warn("Unknown V.I. Device ID.\n");
>>           break;
>>       }
>>       return;
>> @@ -378,7 +378,7 @@ static int
>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>               return -EINVAL);
>>         if (NULL == hwmgr->dyn_state.cac_leakage_table) {
>> -        pr_warning("CAC Leakage Table does not exist, using vddc.\n");
>> +        pr_warn("CAC Leakage Table does not exist, using vddc.\n");
>>           return 0;
>>       }
>>   @@ -394,7 +394,7 @@ static int
>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>                   *lo =
>> hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc *
>> VOLTAGE_SCALE;
>>                   *hi =
>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage *
>> VOLTAGE_SCALE);
>>               } else {
>> -                pr_warning("Index from SCLK/VDDC Dependency Table
>> exceeds the CAC Leakage Table index, using maximum index from CAC
>> table.\n");
>> +                pr_warn("Index from SCLK/VDDC Dependency Table
>> exceeds the CAC Leakage Table index, using maximum index from CAC
>> table.\n");
>>                   *lo =
>> hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>> - 1].Vddc * VOLTAGE_SCALE;
>>                   *hi =
>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>> - 1].Leakage * VOLTAGE_SCALE);
>>               }
>> @@ -414,7 +414,7 @@ static int
>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>                       *lo =
>> hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc *
>> VOLTAGE_SCALE;
>>                       *hi =
>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage)
>> * VOLTAGE_SCALE;
>>                   } else {
>> -                    pr_warning("Index from SCLK/VDDC Dependency Table
>> exceeds the CAC Leakage Table index in second look up, using maximum
>> index from CAC table.");
>> +                    pr_warn("Index from SCLK/VDDC Dependency Table
>> exceeds the CAC Leakage Table index in second look up, using maximum
>> index from CAC table.");
>>                       *lo =
>> hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>> - 1].Vddc * VOLTAGE_SCALE;
>>                       *hi =
>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>> - 1].Leakage * VOLTAGE_SCALE);
>>                   }
>> @@ -423,7 +423,7 @@ static int
>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>           }
>>             if (!vol_found)
>> -            pr_warning("Unable to get std_vddc from SCLK/VDDC
>> Dependency Table, using vddc.\n");
>> +            pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency
>> Table, using vddc.\n");
>>       }
>>         return 0;
>> @@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type,
>> uint32_t member)
>>               return offsetof(SMU71_Discrete_DpmTable,
>> LowSclkInterruptThreshold);
>>           }
>>       }
>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>> member);
>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>> member);
>>       return 0;
>>   }
>>   @@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t
>> value)
>>           return SMU71_MAX_LEVELS_MVDD;
>>       }
>>   -    pr_warning("can't get the mac of %x\n", value);
>> +    pr_warn("can't get the mac of %x\n", value);
>>       return 0;
>>   }
>>   diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>> b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>> index 0e26900e459e..deec874d874f 100644
>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>> @@ -2180,7 +2180,7 @@ uint32_t polaris10_get_offsetof(uint32_t type,
>> uint32_t member)
>>               return offsetof(SMU74_Discrete_DpmTable,
>> LowSclkInterruptThreshold);
>>           }
>>       }
>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>> member);
>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>> member);
>>       return 0;
>>   }
>>   @@ -2207,7 +2207,7 @@ uint32_t polaris10_get_mac_definition(uint32_t
>> value)
>>           return SMU7_UVD_MCLK_HANDSHAKE_DISABLE;
>>       }
>>   -    pr_warning("can't get the mac of %x\n", value);
>> +    pr_warn("can't get the mac of %x\n", value);
>>       return 0;
>>   }
>>   diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>> b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>> index 331b0aba4a13..4d1439a498eb 100644
>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>> @@ -2657,7 +2657,7 @@ uint32_t tonga_get_offsetof(uint32_t type,
>> uint32_t member)
>>               return offsetof(SMU72_Discrete_DpmTable,
>> LowSclkInterruptThreshold);
>>           }
>>       }
>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>> member);
>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>> member);
>>       return 0;
>>   }
>>   @@ -2681,7 +2681,7 @@ uint32_t tonga_get_mac_definition(uint32_t value)
>>       case SMU_MAX_LEVELS_MVDD:
>>           return SMU72_MAX_LEVELS_MVDD;
>>       }
>> -    pr_warning("can't get the mac value %x\n", value);
>> +    pr_warn("can't get the mac value %x\n", value);
>>         return 0;
>>   }
> 
> 
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 06/35] powerpc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 06/35] powerpc: Convert remaining uses " Joe Perches
@ 2017-02-20  4:40   ` Michael Ellerman
  2017-02-20  4:43     ` Joe Perches
  2017-02-20 17:25   ` Geoff Levand
  1 sibling, 1 reply; 75+ messages in thread
From: Michael Ellerman @ 2017-02-20  4:40 UTC (permalink / raw)
  To: Joe Perches, Anatolij Gustschin, Scott Wood, Kumar Gala,
	Benjamin Herrenschmidt, Paul Mackerras, Geoff Levand
  Cc: linuxppc-dev, linux-kernel

Joe Perches <joe@perches.com> writes:

> To enable eventual removal of pr_warning
>
> This makes pr_warn use consistent for arch/powerpc
>
> Prior to this patch, there were 36 uses of pr_warning and
> 217 uses of pr_warn in arch/powerpc
>
> Signed-off-by: Joe Perches <joe@perches.com>

Can I take this via the powerpc tree, or do you want to merge them as a
series?

cheers

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 06/35] powerpc: Convert remaining uses of pr_warning to pr_warn
  2017-02-20  4:40   ` Michael Ellerman
@ 2017-02-20  4:43     ` Joe Perches
  0 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-20  4:43 UTC (permalink / raw)
  To: Michael Ellerman, Anatolij Gustschin, Scott Wood, Kumar Gala,
	Benjamin Herrenschmidt, Paul Mackerras, Geoff Levand
  Cc: linuxppc-dev, linux-kernel

On Mon, 2017-02-20 at 15:40 +1100, Michael Ellerman wrote:
> Joe Perches <joe@perches.com> writes:
> 
> > To enable eventual removal of pr_warning
> > 
> > This makes pr_warn use consistent for arch/powerpc
> > 
> > Prior to this patch, there were 36 uses of pr_warning and
> > 217 uses of pr_warn in arch/powerpc
> > 
> > Signed-off-by: Joe Perches <joe@perches.com>
> 
> Can I take this via the powerpc tree, or do you want to merge them as a
> series?

Well, I expect it'd be better if you merge it.

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 06/35] powerpc: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 06/35] powerpc: Convert remaining uses " Joe Perches
  2017-02-20  4:40   ` Michael Ellerman
@ 2017-02-20 17:25   ` Geoff Levand
  1 sibling, 0 replies; 75+ messages in thread
From: Geoff Levand @ 2017-02-20 17:25 UTC (permalink / raw)
  To: Joe Perches, Anatolij Gustschin, Scott Wood, Kumar Gala,
	Benjamin Herrenschmidt, Paul Mackerras, Michael Ellerman
  Cc: linuxppc-dev, linux-kernel

On 02/16/2017 11:11 PM, Joe Perches wrote:
> To enable eventual removal of pr_warning
> ---
>  arch/powerpc/platforms/ps3/device-init.c        | 14 +++++++-------
>  arch/powerpc/platforms/ps3/mm.c                 |  4 ++--
>  arch/powerpc/platforms/ps3/os-area.c            |  2 +-

PS3 parts look OK.

-Geoff

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn
  2017-02-18  0:20         ` Joe Perches
@ 2017-02-20 19:06           ` Mark Brown
  0 siblings, 0 replies; 75+ messages in thread
From: Mark Brown @ 2017-02-20 19:06 UTC (permalink / raw)
  To: Joe Perches
  Cc: Nicolin Chen, Timur Tabi, Xiubo Li, Fabio Estevam,
	Krzysztof Kozlowski, Sangbeom Kim, Sylwester Nawrocki,
	Liam Girdwood, Jaroslav Kysela, Takashi Iwai, alsa-devel,
	linuxppc-dev, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 450 bytes --]

On Fri, Feb 17, 2017 at 04:20:47PM -0800, Joe Perches wrote:

> If or when you apply it, you should
> fix it up to suit.

To repeat, I don't have this patch so someone will need to send it to
me.

> $ git log -1000 --pretty=oneline --no-merges sound/soc | \
>   cut -f2- -d" " | cut -f1 -d":" |sort | uniq
> ALSA
> AsoC
> ASoc
> ASoC
> ASOC
> ASoC fix up SND_SOC_WM8985 dependency

*sigh*  Now try counting the frequency of each...

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
                     ` (4 preceding siblings ...)
  2017-02-17 15:01   ` Steven Rostedt
@ 2017-02-21  1:12   ` Adan Hawthorn
  5 siblings, 0 replies; 75+ messages in thread
From: Adan Hawthorn @ 2017-02-21  1:12 UTC (permalink / raw)
  To: Joe Perches
  Cc: Ning Sun, Steven Rostedt, Karol Herbst, Pekka Paalanen,
	Robert Richter, Len Brown, Boris Ostrovsky, Juergen Gross,
	Thomas Gleixner, H. Peter Anvin, x86, linux-kernel, tboot-devel,
	nouveau, oprofile-list, sfi-devel, xen-devel

On Fri, Feb 17, 2017 at 2:11 AM, Joe Perches <joe@perches.com> wrote:
> To enable eventual removal of pr_warning
>
> This makes pr_warn use consistent for arch/x86
>
> Prior to this patch, there were 46 uses of pr_warning and
> 122 uses of pr_warn in arch/x86
>
> Miscellanea:
>
> o Coalesce a few formats and realign arguments
> o Convert a couple of multiple line printks to single line
>
> Signed-off-by: Joe Perches <joe@perches.com>

...

> diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
> index 4261b3282ad9..37e9129da8b3 100644
> --- a/arch/x86/kernel/apic/apic.c
> +++ b/arch/x86/kernel/apic/apic.c

...

> @@ -1503,11 +1503,11 @@ static int __init setup_nox2apic(char *str)
>                 int apicid = native_apic_msr_read(APIC_ID);
>
>                 if (apicid >= 255) {
> -                       pr_warning("Apicid: %08x, cannot enforce nox2apic\n",
> -                                  apicid);
> +                       pr_warn("Apicid: %08x, cannot enforce nox2apic\n",
> +                               apicid);
>                         return 0;
>                 }
> -               pr_warning("x2apic already enabled.\n");
> +               pr_warn("x2apic already enabled\n");
>                 __x2apic_disable();
>         }
>         setup_clear_cpu_cap(X86_FEATURE_X2APIC);

...

> diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
> index afc47f5c9531..ad70518cdcc7 100644
> --- a/arch/x86/mm/kmmio.c
> +++ b/arch/x86/mm/kmmio.c
>         WARN_ONCE(ret < 0, KERN_ERR pr_fmt("arming at 0x%08lx failed.\n"),
> @@ -335,8 +335,8 @@ static int post_kmmio_handler(unsigned long condition, struct pt_regs *regs)
>                  * something external causing them (f.e. using a debugger while
>                  * mmio tracing enabled), or erroneous behaviour
>                  */
> -               pr_warning("unexpected debug trap on CPU %d.\n",
> -                          smp_processor_id());
> +               pr_warn("unexpected debug trap on CPU %d\n",
> +                       smp_processor_id());
>                 goto out;
>         }
>

As just a few examples from the full diff: would not the double line
pr_warn's (above) read better if coalesced each on one line?

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 17/35] drivers/gpu: Convert remaining uses of pr_warning to pr_warn
  2017-02-18  5:03     ` Edward O'Callaghan
@ 2017-02-23 15:02       ` Alex Deucher
  0 siblings, 0 replies; 75+ messages in thread
From: Alex Deucher @ 2017-02-23 15:02 UTC (permalink / raw)
  To: Edward O'Callaghan
  Cc: Christian König, Joe Perches, LKML, Alex Deucher,
	David Airlie, amd-gfx list, Maling list - DRI developers

On Sat, Feb 18, 2017 at 12:03 AM, Edward O'Callaghan
<funfunctor@folklore1984.net> wrote:
>
>
> On 02/18/2017 01:22 AM, Christian König wrote:
>> Am 17.02.2017 um 08:11 schrieb Joe Perches:
>>> To enable eventual removal of pr_warning
>>>
>>> This makes pr_warn use consistent for drivers/gpu
>>>
>>> Prior to this patch, there were 15 uses of pr_warning and
>>> 20 uses of pr_warn in drivers/gpu
>>>
>>> Signed-off-by: Joe Perches <joe@perches.com>
>>
>> Acked-by: Christian König <christian.koenig@amd.com>.
>
> Reviewed-by: Edward O'Callaghan <funfunctor@folklore1984.net>

Applied.  thanks!

Alex


>
>>
>>> ---
>>>   drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c     |  2 +-
>>>   drivers/gpu/drm/amd/powerplay/inc/pp_debug.h         |  2 +-
>>>   drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c      |  4 ++--
>>>   drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c   | 14
>>> +++++++-------
>>>   drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c |  4 ++--
>>>   drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c     |  4 ++--
>>>   6 files changed, 15 insertions(+), 15 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> index b1de9e8ccdbc..83266408634e 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>>> @@ -1535,7 +1535,7 @@ static int smu7_get_evv_voltages(struct pp_hwmgr
>>> *hwmgr)
>>>                       if (vddc >= 2000 || vddc == 0)
>>>                           return -EINVAL;
>>>                   } else {
>>> -                    pr_warning("failed to retrieving EVV voltage!\n");
>>> +                    pr_warn("failed to retrieving EVV voltage!\n");
>>>                       continue;
>>>                   }
>>>   diff --git a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>>> b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>>> index 072880130cfb..f3f9ebb631a5 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>>> +++ b/drivers/gpu/drm/amd/powerplay/inc/pp_debug.h
>>> @@ -37,7 +37,7 @@
>>>   #define PP_ASSERT_WITH_CODE(cond, msg, code)    \
>>>       do {                    \
>>>           if (!(cond)) {            \
>>> -            pr_warning("%s\n", msg);    \
>>> +            pr_warn("%s\n", msg);    \
>>>               code;            \
>>>           }                \
>>>       } while (0)
>>> diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>>> b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>>> index 0f7a77b7312e..5450f5ef8e89 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c
>>> @@ -2131,7 +2131,7 @@ uint32_t fiji_get_offsetof(uint32_t type,
>>> uint32_t member)
>>>               return offsetof(SMU73_Discrete_DpmTable,
>>> LowSclkInterruptThreshold);
>>>           }
>>>       }
>>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>>> member);
>>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>>> member);
>>>       return 0;
>>>   }
>>>   @@ -2156,7 +2156,7 @@ uint32_t fiji_get_mac_definition(uint32_t value)
>>>           return SMU73_MAX_LEVELS_MVDD;
>>>       }
>>>   -    pr_warning("can't get the mac of %x\n", value);
>>> +    pr_warn("can't get the mac of %x\n", value);
>>>       return 0;
>>>   }
>>>   diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>>> b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>>> index ad82161df831..51adf04ab4b3 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c
>>> @@ -122,7 +122,7 @@ static void
>>> iceland_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
>>>           break;
>>>       default:
>>>           smu_data->power_tune_defaults = &defaults_iceland;
>>> -        pr_warning("Unknown V.I. Device ID.\n");
>>> +        pr_warn("Unknown V.I. Device ID.\n");
>>>           break;
>>>       }
>>>       return;
>>> @@ -378,7 +378,7 @@ static int
>>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>>               return -EINVAL);
>>>         if (NULL == hwmgr->dyn_state.cac_leakage_table) {
>>> -        pr_warning("CAC Leakage Table does not exist, using vddc.\n");
>>> +        pr_warn("CAC Leakage Table does not exist, using vddc.\n");
>>>           return 0;
>>>       }
>>>   @@ -394,7 +394,7 @@ static int
>>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>>                   *lo =
>>> hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc *
>>> VOLTAGE_SCALE;
>>>                   *hi =
>>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage *
>>> VOLTAGE_SCALE);
>>>               } else {
>>> -                pr_warning("Index from SCLK/VDDC Dependency Table
>>> exceeds the CAC Leakage Table index, using maximum index from CAC
>>> table.\n");
>>> +                pr_warn("Index from SCLK/VDDC Dependency Table
>>> exceeds the CAC Leakage Table index, using maximum index from CAC
>>> table.\n");
>>>                   *lo =
>>> hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>>> - 1].Vddc * VOLTAGE_SCALE;
>>>                   *hi =
>>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>>> - 1].Leakage * VOLTAGE_SCALE);
>>>               }
>>> @@ -414,7 +414,7 @@ static int
>>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>>                       *lo =
>>> hwmgr->dyn_state.cac_leakage_table->entries[v_index].Vddc *
>>> VOLTAGE_SCALE;
>>>                       *hi =
>>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[v_index].Leakage)
>>> * VOLTAGE_SCALE;
>>>                   } else {
>>> -                    pr_warning("Index from SCLK/VDDC Dependency Table
>>> exceeds the CAC Leakage Table index in second look up, using maximum
>>> index from CAC table.");
>>> +                    pr_warn("Index from SCLK/VDDC Dependency Table
>>> exceeds the CAC Leakage Table index in second look up, using maximum
>>> index from CAC table.");
>>>                       *lo =
>>> hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>>> - 1].Vddc * VOLTAGE_SCALE;
>>>                       *hi =
>>> (uint16_t)(hwmgr->dyn_state.cac_leakage_table->entries[hwmgr->dyn_state.cac_leakage_table->count
>>> - 1].Leakage * VOLTAGE_SCALE);
>>>                   }
>>> @@ -423,7 +423,7 @@ static int
>>> iceland_get_std_voltage_value_sidd(struct pp_hwmgr *hwmgr,
>>>           }
>>>             if (!vol_found)
>>> -            pr_warning("Unable to get std_vddc from SCLK/VDDC
>>> Dependency Table, using vddc.\n");
>>> +            pr_warn("Unable to get std_vddc from SCLK/VDDC Dependency
>>> Table, using vddc.\n");
>>>       }
>>>         return 0;
>>> @@ -2146,7 +2146,7 @@ uint32_t iceland_get_offsetof(uint32_t type,
>>> uint32_t member)
>>>               return offsetof(SMU71_Discrete_DpmTable,
>>> LowSclkInterruptThreshold);
>>>           }
>>>       }
>>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>>> member);
>>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>>> member);
>>>       return 0;
>>>   }
>>>   @@ -2169,7 +2169,7 @@ uint32_t iceland_get_mac_definition(uint32_t
>>> value)
>>>           return SMU71_MAX_LEVELS_MVDD;
>>>       }
>>>   -    pr_warning("can't get the mac of %x\n", value);
>>> +    pr_warn("can't get the mac of %x\n", value);
>>>       return 0;
>>>   }
>>>   diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>>> b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>>> index 0e26900e459e..deec874d874f 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c
>>> @@ -2180,7 +2180,7 @@ uint32_t polaris10_get_offsetof(uint32_t type,
>>> uint32_t member)
>>>               return offsetof(SMU74_Discrete_DpmTable,
>>> LowSclkInterruptThreshold);
>>>           }
>>>       }
>>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>>> member);
>>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>>> member);
>>>       return 0;
>>>   }
>>>   @@ -2207,7 +2207,7 @@ uint32_t polaris10_get_mac_definition(uint32_t
>>> value)
>>>           return SMU7_UVD_MCLK_HANDSHAKE_DISABLE;
>>>       }
>>>   -    pr_warning("can't get the mac of %x\n", value);
>>> +    pr_warn("can't get the mac of %x\n", value);
>>>       return 0;
>>>   }
>>>   diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>>> b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>>> index 331b0aba4a13..4d1439a498eb 100644
>>> --- a/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>>> +++ b/drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c
>>> @@ -2657,7 +2657,7 @@ uint32_t tonga_get_offsetof(uint32_t type,
>>> uint32_t member)
>>>               return offsetof(SMU72_Discrete_DpmTable,
>>> LowSclkInterruptThreshold);
>>>           }
>>>       }
>>> -    pr_warning("can't get the offset of type %x member %x\n", type,
>>> member);
>>> +    pr_warn("can't get the offset of type %x member %x\n", type,
>>> member);
>>>       return 0;
>>>   }
>>>   @@ -2681,7 +2681,7 @@ uint32_t tonga_get_mac_definition(uint32_t value)
>>>       case SMU_MAX_LEVELS_MVDD:
>>>           return SMU72_MAX_LEVELS_MVDD;
>>>       }
>>> -    pr_warning("can't get the mac value %x\n", value);
>>> +    pr_warn("can't get the mac value %x\n", value);
>>>         return 0;
>>>   }
>>
>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
>

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
  2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
                   ` (35 preceding siblings ...)
  2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
@ 2017-02-23 15:28 ` Rob Herring
  2017-02-23 17:18   ` Joe Perches
  36 siblings, 1 reply; 75+ messages in thread
From: Rob Herring @ 2017-02-23 15:28 UTC (permalink / raw)
  To: Joe Perches
  Cc: Alexander Shishkin, Karol Herbst, Pekka Paalanen,
	Richard Weinberger, Fabio Estevam, linux-kernel,
	linux-arm-kernel, linuxppc-dev, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel, linux-acpi, drbd-dev,
	virtualization, linux-crypto, linux-ide, gigaset307x-common,
	linux-media, linux-omap, linux-mtd, devicetree, acpi4asus-user,
	platform-driver-x86, linux-scsi, linux-fbdev, Linux-ALSA,
	linux-alpha, adi-buildroot-devel, linux-ia64, SH-Linux,
	sparclinux, amd-gfx, dri-devel, linux-input, netdev

On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
> There are ~4300 uses of pr_warn and ~250 uses of the older
> pr_warning in the kernel source tree.
>
> Make the use of pr_warn consistent across all kernel files.
>
> This excludes all files in tools/ as there is a separate
> define pr_warning for that directory tree and pr_warn is
> not used in tools/.
>
> Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
>
> Miscellanea:
>
> o Coalesce formats and realign arguments
>
> Some files not compiled - no cross-compilers
>
> Joe Perches (35):
>   alpha: Convert remaining uses of pr_warning to pr_warn
>   ARM: ep93xx: Convert remaining uses of pr_warning to pr_warn
>   arm64: Convert remaining uses of pr_warning to pr_warn
>   arch/blackfin: Convert remaining uses of pr_warning to pr_warn
>   ia64: Convert remaining use of pr_warning to pr_warn
>   powerpc: Convert remaining uses of pr_warning to pr_warn
>   sh: Convert remaining uses of pr_warning to pr_warn
>   sparc: Convert remaining use of pr_warning to pr_warn
>   x86: Convert remaining uses of pr_warning to pr_warn
>   drivers/acpi: Convert remaining uses of pr_warning to pr_warn
>   block/drbd: Convert remaining uses of pr_warning to pr_warn
>   gdrom: Convert remaining uses of pr_warning to pr_warn
>   drivers/char: Convert remaining use of pr_warning to pr_warn
>   clocksource: Convert remaining use of pr_warning to pr_warn
>   drivers/crypto: Convert remaining uses of pr_warning to pr_warn
>   fmc: Convert remaining use of pr_warning to pr_warn
>   drivers/gpu: Convert remaining uses of pr_warning to pr_warn
>   drivers/ide: Convert remaining uses of pr_warning to pr_warn
>   drivers/input: Convert remaining uses of pr_warning to pr_warn
>   drivers/isdn: Convert remaining uses of pr_warning to pr_warn
>   drivers/macintosh: Convert remaining uses of pr_warning to pr_warn
>   drivers/media: Convert remaining use of pr_warning to pr_warn
>   drivers/mfd: Convert remaining uses of pr_warning to pr_warn
>   drivers/mtd: Convert remaining uses of pr_warning to pr_warn
>   drivers/of: Convert remaining uses of pr_warning to pr_warn
>   drivers/oprofile: Convert remaining uses of pr_warning to pr_warn
>   drivers/platform: Convert remaining uses of pr_warning to pr_warn
>   drivers/rapidio: Convert remaining use of pr_warning to pr_warn
>   drivers/scsi: Convert remaining use of pr_warning to pr_warn
>   drivers/sh: Convert remaining use of pr_warning to pr_warn
>   drivers/tty: Convert remaining uses of pr_warning to pr_warn
>   drivers/video: Convert remaining uses of pr_warning to pr_warn
>   kernel/trace: Convert remaining uses of pr_warning to pr_warn
>   lib: Convert remaining uses of pr_warning to pr_warn
>   sound/soc: Convert remaining uses of pr_warning to pr_warn

Where's the removal of pr_warning so we don't have more sneak in?

Rob

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
  2017-02-23 15:28 ` Rob Herring
@ 2017-02-23 17:18   ` Joe Perches
  2017-02-23 17:41     ` Emil Velikov
  0 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-02-23 17:18 UTC (permalink / raw)
  To: Rob Herring
  Cc: Alexander Shishkin, Karol Herbst, Pekka Paalanen,
	Richard Weinberger, Fabio Estevam, linux-kernel,
	linux-arm-kernel, linuxppc-dev, tboot-devel, nouveau,
	oprofile-list, sfi-devel, xen-devel, linux-acpi, drbd-dev,
	virtualization, linux-crypto, linux-ide, gigaset307x-common,
	linux-media, linux-omap, linux-mtd, devicetree, acpi4asus-user,
	platform-driver-x86, linux-scsi, linux-fbdev, Linux-ALSA,
	linux-alpha, adi-buildroot-devel, linux-ia64, SH-Linux,
	sparclinux, amd-gfx, dri-devel, linux-input, netdev

On Thu, 2017-02-23 at 09:28 -0600, Rob Herring wrote:
> On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
> > There are ~4300 uses of pr_warn and ~250 uses of the older
> > pr_warning in the kernel source tree.
> > 
> > Make the use of pr_warn consistent across all kernel files.
> > 
> > This excludes all files in tools/ as there is a separate
> > define pr_warning for that directory tree and pr_warn is
> > not used in tools/.
> > 
> > Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
[]
> Where's the removal of pr_warning so we don't have more sneak in?

After all of these actually get applied,
and maybe a cycle or two later, one would
get sent.

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
  2017-02-23 17:18   ` Joe Perches
@ 2017-02-23 17:41     ` Emil Velikov
  2017-02-23 17:53       ` Joe Perches
  0 siblings, 1 reply; 75+ messages in thread
From: Emil Velikov @ 2017-02-23 17:41 UTC (permalink / raw)
  To: Joe Perches
  Cc: Rob Herring, linux-fbdev, linux-ia64, SH-Linux,
	Alexander Shishkin, ML nouveau, Linux-ALSA, dri-devel,
	open list:VIRTIO GPU DRIVER, linux-ide, linux-mtd, sparclinux,
	drbd-dev, linux-scsi, Richard Weinberger, sfi-devel,
	amd-gfx mailing list, linux-acpi, tboot-devel, oprofile-list,
	linux-input, xen-devel, linux-media, platform-driver-x86,
	devicetree, gigaset307x-common, acpi4asus-user,
	adi-buildroot-devel, Pekka Paalanen, linux-omap,
	linux-arm-kernel, netdev, Karol Herbst, linux-kernel,
	linux-crypto, linux-alpha, Fabio Estevam, linuxppc-dev

On 23 February 2017 at 17:18, Joe Perches <joe@perches.com> wrote:
> On Thu, 2017-02-23 at 09:28 -0600, Rob Herring wrote:
>> On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
>> > There are ~4300 uses of pr_warn and ~250 uses of the older
>> > pr_warning in the kernel source tree.
>> >
>> > Make the use of pr_warn consistent across all kernel files.
>> >
>> > This excludes all files in tools/ as there is a separate
>> > define pr_warning for that directory tree and pr_warn is
>> > not used in tools/.
>> >
>> > Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
> []
>> Where's the removal of pr_warning so we don't have more sneak in?
>
> After all of these actually get applied,
> and maybe a cycle or two later, one would
> get sent.
>
By which point you'll get a few reincarnation of it. So you'll have to
do the same exercise again :-(

I guess the question is - are you expecting to get the series merged
all together/via one tree ? If not, your plan is perfectly reasonable.
Fwiw in the DRM subsystem, similar cleanups does purge the respective
macros/other with the final commit. But there one can pull the lot in
one go.

Regards,
Emil

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn
  2017-02-23 17:41     ` Emil Velikov
@ 2017-02-23 17:53       ` Joe Perches
  0 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-02-23 17:53 UTC (permalink / raw)
  To: Emil Velikov
  Cc: Rob Herring, linux-fbdev, linux-ia64, SH-Linux,
	Alexander Shishkin, ML nouveau, Linux-ALSA, dri-devel,
	open list:VIRTIO GPU DRIVER, linux-ide, linux-mtd, sparclinux,
	drbd-dev, linux-scsi, Richard Weinberger, sfi-devel,
	amd-gfx mailing list, linux-acpi, tboot-devel, oprofile-list,
	linux-input, xen-devel, linux-media, platform-driver-x86,
	devicetree, gigaset307x-common, acpi4asus-user,
	adi-buildroot-devel, Pekka Paalanen, linux-omap,
	linux-arm-kernel, netdev, Karol Herbst, linux-kernel,
	linux-crypto, linux-alpha, Fabio Estevam, linuxppc-dev

On Thu, 2017-02-23 at 17:41 +0000, Emil Velikov wrote:
> On 23 February 2017 at 17:18, Joe Perches <joe@perches.com> wrote:
> > On Thu, 2017-02-23 at 09:28 -0600, Rob Herring wrote:
> > > On Fri, Feb 17, 2017 at 1:11 AM, Joe Perches <joe@perches.com> wrote:
> > > > There are ~4300 uses of pr_warn and ~250 uses of the older
> > > > pr_warning in the kernel source tree.
> > > > 
> > > > Make the use of pr_warn consistent across all kernel files.
> > > > 
> > > > This excludes all files in tools/ as there is a separate
> > > > define pr_warning for that directory tree and pr_warn is
> > > > not used in tools/.
> > > > 
> > > > Done with 'sed s/\bpr_warning\b/pr_warn/' and some emacsing.
> > 
> > []
> > > Where's the removal of pr_warning so we don't have more sneak in?
> > 
> > After all of these actually get applied,
> > and maybe a cycle or two later, one would
> > get sent.
> > 
> 
> By which point you'll get a few reincarnation of it. So you'll have to
> do the same exercise again :-(

Maybe to one or two files.  Not a big deal.

> I guess the question is - are you expecting to get the series merged
> all together/via one tree ?

No.  The only person that could do that effectively is Linus.

> If not, your plan is perfectly reasonable.

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 23/35] drivers/mfd: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 23/35] drivers/mfd: Convert remaining uses " Joe Perches
@ 2017-03-14 14:04   ` Lee Jones
  2017-03-14 17:17     ` Joe Perches
  2017-03-23 10:52   ` Lee Jones
  1 sibling, 1 reply; 75+ messages in thread
From: Lee Jones @ 2017-03-14 14:04 UTC (permalink / raw)
  To: Joe Perches
  Cc: Linus Walleij, Tony Lindgren, linux-arm-kernel, linux-kernel, linux-omap

On Thu, 16 Feb 2017, Joe Perches wrote:

> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/mfd
> 
> Prior to this patch, there were 4 uses of pr_warning and
> 9 uses of pr_warn in drivers/mfd
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  drivers/mfd/db8500-prcmu.c  | 2 +-
>  drivers/mfd/sta2x11-mfd.c   | 4 ++--
>  drivers/mfd/twl4030-power.c | 7 ++-----
>  3 files changed, 5 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
> index ca38a6a14110..5c739ac752e8 100644
> --- a/drivers/mfd/db8500-prcmu.c
> +++ b/drivers/mfd/db8500-prcmu.c
> @@ -2377,7 +2377,7 @@ static void ack_dbb_wakeup(void)
>  
>  static inline void print_unknown_header_warning(u8 n, u8 header)
>  {
> -	pr_warning("prcmu: Unknown message header (%d) in mailbox %d.\n",
> +	pr_warn("prcmu: Unknown message header (%d) in mailbox %d\n",
>  		header, n);
>  }
>  
> diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
> index 9292202039ee..3aeafa228baf 100644
> --- a/drivers/mfd/sta2x11-mfd.c
> +++ b/drivers/mfd/sta2x11-mfd.c
> @@ -60,8 +60,8 @@ static struct sta2x11_mfd *sta2x11_mfd_find(struct pci_dev *pdev)
>  	struct sta2x11_mfd *mfd;
>  
>  	if (!pdev && !list_empty(&sta2x11_mfd_list)) {
> -		pr_warning("%s: Unspecified device, "
> -			    "using first instance\n", __func__);
> +		pr_warn("%s: Unspecified device, using first instance\n",
> +			__func__);
>  		return list_entry(sta2x11_mfd_list.next,
>  				  struct sta2x11_mfd, list);
>  	}
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 1beb722f6080..8be023ba8e3e 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -502,9 +502,7 @@ static int load_twl4030_script(const struct twl4030_power_data *pdata,
>  	}
>  	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
>  		if (!order)
> -			pr_warning("TWL4030: Bad order of scripts (sleep "\
> -					"script before wakeup) Leads to boot"\
> -					"failure on some boards\n");
> +			pr_warn("TWL4030: Bad order of scripts (sleep script before wakeup) Leads to boot failure on some boards\n");

Is 80 chars considered the lessor sin?

>  		err = twl4030_config_sleep_sequence(address);
>  	}
>  out:
> @@ -929,8 +927,7 @@ static int twl4030_power_probe(struct platform_device *pdev)
>  		err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
>  				      TWL4030_PM_MASTER_CFG_P123_TRANSITION);
>  		if (err) {
> -			pr_warning("TWL4030 Unable to read registers\n");
> -
> +			pr_warn("TWL4030 Unable to read registers\n");
>  		} else if (!(val & SEQ_OFFSYNC)) {
>  			val |= SEQ_OFFSYNC;
>  			err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 23/35] drivers/mfd: Convert remaining uses of pr_warning to pr_warn
  2017-03-14 14:04   ` Lee Jones
@ 2017-03-14 17:17     ` Joe Perches
  2017-03-15 12:23       ` Lee Jones
  0 siblings, 1 reply; 75+ messages in thread
From: Joe Perches @ 2017-03-14 17:17 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linus Walleij, Tony Lindgren, linux-arm-kernel, linux-kernel, linux-omap

On Tue, 2017-03-14 at 14:04 +0000, Lee Jones wrote:
> On Thu, 16 Feb 2017, Joe Perches wrote:
> > To enable eventual removal of pr_warning
[]
> > diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
[]
> > @@ -502,9 +502,7 @@ static int load_twl4030_script(const struct twl4030_power_data *pdata,
> >  	}
> >  	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
> >  		if (!order)
> > -			pr_warning("TWL4030: Bad order of scripts (sleep "\
> > -					"script before wakeup) Leads to boot"\
> > -					"failure on some boards\n");
> > +			pr_warn("TWL4030: Bad order of scripts (sleep script before wakeup) Leads to boot failure on some boards\n");
> 
> Is 80 chars considered the lessor sin?

Splitting logging messages into multiple lines is non preferred.

Documentation/process/coding-style.rst:

Breaking long lines and strings:

never break user-visible strings such as
printk messages, because that breaks the ability to grep for them.

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 23/35] drivers/mfd: Convert remaining uses of pr_warning to pr_warn
  2017-03-14 17:17     ` Joe Perches
@ 2017-03-15 12:23       ` Lee Jones
  2017-03-15 14:17         ` Joe Perches
  0 siblings, 1 reply; 75+ messages in thread
From: Lee Jones @ 2017-03-15 12:23 UTC (permalink / raw)
  To: Joe Perches
  Cc: Linus Walleij, Tony Lindgren, linux-arm-kernel, linux-kernel, linux-omap

On Tue, 14 Mar 2017, Joe Perches wrote:

> On Tue, 2017-03-14 at 14:04 +0000, Lee Jones wrote:
> > On Thu, 16 Feb 2017, Joe Perches wrote:
> > > To enable eventual removal of pr_warning
> []
> > > diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> []
> > > @@ -502,9 +502,7 @@ static int load_twl4030_script(const struct twl4030_power_data *pdata,
> > >  	}
> > >  	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
> > >  		if (!order)
> > > -			pr_warning("TWL4030: Bad order of scripts (sleep "\
> > > -					"script before wakeup) Leads to boot"\
> > > -					"failure on some boards\n");
> > > +			pr_warn("TWL4030: Bad order of scripts (sleep script before wakeup) Leads to boot failure on some boards\n");
> > 
> > Is 80 chars considered the lessor sin?
> 
> Splitting logging messages into multiple lines is non preferred.
> 
> Documentation/process/coding-style.rst:
> 
> Breaking long lines and strings:
> 
> never break user-visible strings such as
> printk messages, because that breaks the ability to grep for them.

Right, I'm aware of this.  I'm also aware of the other rule we have
where lines are not to exceed 80 chars.  Hence my question; "is the 80
chars rule the lessor sin of the two".

Rock <=> hard place

Actually I would say that the error message sub-optimal and could, in
fact be edited to be more succinct, thus not breaking any rules. 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 23/35] drivers/mfd: Convert remaining uses of pr_warning to pr_warn
  2017-03-15 12:23       ` Lee Jones
@ 2017-03-15 14:17         ` Joe Perches
  0 siblings, 0 replies; 75+ messages in thread
From: Joe Perches @ 2017-03-15 14:17 UTC (permalink / raw)
  To: Lee Jones
  Cc: Linus Walleij, Tony Lindgren, linux-arm-kernel, linux-kernel, linux-omap

On Wed, 2017-03-15 at 12:23 +0000, Lee Jones wrote:
> On Tue, 14 Mar 2017, Joe Perches wrote:
[]
> > never break user-visible strings such as
> > printk messages, because that breaks the ability to grep for them.
> 
> Right, I'm aware of this.  I'm also aware of the other rule we have
> where lines are not to exceed 80 chars.  Hence my question; "is the 80
> chars rule the lessor sin of the two".
> 
> Rock <=> hard place
> 
> Actually I would say that the error message sub-optimal and could, in
> fact be edited to be more succinct, thus not breaking any rules. 

It's not a 'sin' at all.

The rule is to exceed 80 columns when the logging
message format is long.

I didn't even look at the format content.
Change it if you wish.

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 32/35] drivers/video: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 32/35] drivers/video: " Joe Perches
@ 2017-03-21 15:17   ` Bartlomiej Zolnierkiewicz
  0 siblings, 0 replies; 75+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2017-03-21 15:17 UTC (permalink / raw)
  To: Joe Perches; +Cc: Benjamin Herrenschmidt, linux-fbdev, linux-kernel

On Thursday, February 16, 2017 11:11:45 PM Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/video
> 
> Prior to this patch, there were 6 uses of pr_warning and
> 25 uses of pr_warn in drivers/video
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Patch queued for 4.12, thanks.

Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 23/35] drivers/mfd: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 23/35] drivers/mfd: Convert remaining uses " Joe Perches
  2017-03-14 14:04   ` Lee Jones
@ 2017-03-23 10:52   ` Lee Jones
  1 sibling, 0 replies; 75+ messages in thread
From: Lee Jones @ 2017-03-23 10:52 UTC (permalink / raw)
  To: Joe Perches
  Cc: Linus Walleij, Tony Lindgren, linux-arm-kernel, linux-kernel, linux-omap

> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/mfd
> 
> Prior to this patch, there were 4 uses of pr_warning and
> 9 uses of pr_warn in drivers/mfd
> 
> Signed-off-by: Joe Perches <joe@perches.com>
> ---
>  drivers/mfd/db8500-prcmu.c  | 2 +-
>  drivers/mfd/sta2x11-mfd.c   | 4 ++--
>  drivers/mfd/twl4030-power.c | 7 ++-----
>  3 files changed, 5 insertions(+), 8 deletions(-)

Applied.

(... and I corrected the $SUBJECT line on your behalf)

> diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c
> index ca38a6a14110..5c739ac752e8 100644
> --- a/drivers/mfd/db8500-prcmu.c
> +++ b/drivers/mfd/db8500-prcmu.c
> @@ -2377,7 +2377,7 @@ static void ack_dbb_wakeup(void)
>  
>  static inline void print_unknown_header_warning(u8 n, u8 header)
>  {
> -	pr_warning("prcmu: Unknown message header (%d) in mailbox %d.\n",
> +	pr_warn("prcmu: Unknown message header (%d) in mailbox %d\n",
>  		header, n);
>  }
>  
> diff --git a/drivers/mfd/sta2x11-mfd.c b/drivers/mfd/sta2x11-mfd.c
> index 9292202039ee..3aeafa228baf 100644
> --- a/drivers/mfd/sta2x11-mfd.c
> +++ b/drivers/mfd/sta2x11-mfd.c
> @@ -60,8 +60,8 @@ static struct sta2x11_mfd *sta2x11_mfd_find(struct pci_dev *pdev)
>  	struct sta2x11_mfd *mfd;
>  
>  	if (!pdev && !list_empty(&sta2x11_mfd_list)) {
> -		pr_warning("%s: Unspecified device, "
> -			    "using first instance\n", __func__);
> +		pr_warn("%s: Unspecified device, using first instance\n",
> +			__func__);
>  		return list_entry(sta2x11_mfd_list.next,
>  				  struct sta2x11_mfd, list);
>  	}
> diff --git a/drivers/mfd/twl4030-power.c b/drivers/mfd/twl4030-power.c
> index 1beb722f6080..8be023ba8e3e 100644
> --- a/drivers/mfd/twl4030-power.c
> +++ b/drivers/mfd/twl4030-power.c
> @@ -502,9 +502,7 @@ static int load_twl4030_script(const struct twl4030_power_data *pdata,
>  	}
>  	if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
>  		if (!order)
> -			pr_warning("TWL4030: Bad order of scripts (sleep "\
> -					"script before wakeup) Leads to boot"\
> -					"failure on some boards\n");
> +			pr_warn("TWL4030: Bad order of scripts (sleep script before wakeup) Leads to boot failure on some boards\n");
>  		err = twl4030_config_sleep_sequence(address);
>  	}
>  out:
> @@ -929,8 +927,7 @@ static int twl4030_power_probe(struct platform_device *pdev)
>  		err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &val,
>  				      TWL4030_PM_MASTER_CFG_P123_TRANSITION);
>  		if (err) {
> -			pr_warning("TWL4030 Unable to read registers\n");
> -
> +			pr_warn("TWL4030 Unable to read registers\n");
>  		} else if (!(val & SEQ_OFFSYNC)) {
>  			val |= SEQ_OFFSYNC;
>  			err = twl_i2c_write_u8(TWL_MODULE_PM_MASTER, val,

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

^ permalink raw reply	[flat|nested] 75+ messages in thread

* Re: [PATCH 24/35] drivers/mtd: Convert remaining uses of pr_warning to pr_warn
  2017-02-17  7:11 ` [PATCH 24/35] drivers/mtd: " Joe Perches
@ 2017-04-19 20:11   ` Brian Norris
  0 siblings, 0 replies; 75+ messages in thread
From: Brian Norris @ 2017-04-19 20:11 UTC (permalink / raw)
  To: Joe Perches
  Cc: Boris Brezillon, Richard Weinberger, David Woodhouse,
	Marek Vasut, Cyrille Pitchen, linux-mtd, linux-kernel

On Thu, Feb 16, 2017 at 11:11:37PM -0800, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for drivers/mtd
> 
> Prior to this patch, there were 7 uses of pr_warning and
> 31 uses of pr_warn in drivers/mtd
> 
> Signed-off-by: Joe Perches <joe@perches.com>

Applied to l2-mtd.git

^ permalink raw reply	[flat|nested] 75+ messages in thread

end of thread, other threads:[~2017-04-19 20:11 UTC | newest]

Thread overview: 75+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-17  7:11 [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn Joe Perches
2017-02-17  7:11 ` [PATCH 01/35] alpha: Convert remaining uses of " Joe Perches
2017-02-17  7:11 ` [PATCH 02/35] ARM: ep93xx: " Joe Perches
2017-02-17 16:26   ` Hartley Sweeten
2017-02-17  7:11 ` [PATCH 03/35] arm64: " Joe Perches
2017-02-17 10:52   ` Mark Rutland
2017-02-17  7:11 ` [PATCH 04/35] arch/blackfin: " Joe Perches
2017-02-17  7:11 ` [PATCH 05/35] ia64: Convert remaining use " Joe Perches
2017-02-17  7:11 ` [PATCH 06/35] powerpc: Convert remaining uses " Joe Perches
2017-02-20  4:40   ` Michael Ellerman
2017-02-20  4:43     ` Joe Perches
2017-02-20 17:25   ` Geoff Levand
2017-02-17  7:11 ` [PATCH 07/35] sh: " Joe Perches
2017-02-17  7:11 ` [PATCH 08/35] sparc: Convert remaining use " Joe Perches
2017-02-17  8:39   ` Sam Ravnborg
2017-02-17 15:20   ` David Miller
2017-02-17  7:11 ` [PATCH 09/35] x86: Convert remaining uses " Joe Perches
2017-02-17  7:46   ` Pekka Paalanen
2017-02-17  8:06   ` Juergen Gross
2017-02-17 11:17   ` Thomas Gleixner
2017-02-17 14:07   ` Robert Richter
2017-02-17 15:01   ` Steven Rostedt
2017-02-21  1:12   ` Adan Hawthorn
2017-02-17  7:11 ` [PATCH 10/35] drivers/acpi: " Joe Perches
2017-02-17  7:11 ` [PATCH 11/35] block/drbd: " Joe Perches
2017-02-17  7:11 ` [PATCH 12/35] gdrom: " Joe Perches
2017-02-17  7:11 ` [PATCH 13/35] drivers/char: Convert remaining use " Joe Perches
2017-02-17  7:53   ` Amit Shah
2017-02-17  7:11 ` [PATCH 14/35] clocksource: " Joe Perches
2017-02-17  7:11 ` [PATCH 15/35] drivers/crypto: Convert remaining uses " Joe Perches
2017-02-17  7:11 ` [PATCH 16/35] fmc: Convert remaining use " Joe Perches
2017-02-17  7:11 ` [PATCH 17/35] drivers/gpu: Convert remaining uses " Joe Perches
2017-02-17 14:22   ` Christian König
2017-02-18  5:03     ` Edward O'Callaghan
2017-02-23 15:02       ` Alex Deucher
2017-02-17  7:11 ` [PATCH 18/35] drivers/ide: " Joe Perches
2017-02-17 15:20   ` David Miller
2017-02-17  7:11 ` [PATCH 19/35] drivers/input: " Joe Perches
2017-02-17  7:11 ` [PATCH 20/35] drivers/isdn: " Joe Perches
2017-02-17  8:49   ` Paul Bolle
2017-02-17  7:11 ` [PATCH 21/35] drivers/macintosh: " Joe Perches
2017-02-17  7:11 ` [PATCH 22/35] drivers/media: Convert remaining use " Joe Perches
2017-02-17  7:11 ` [PATCH 23/35] drivers/mfd: Convert remaining uses " Joe Perches
2017-03-14 14:04   ` Lee Jones
2017-03-14 17:17     ` Joe Perches
2017-03-15 12:23       ` Lee Jones
2017-03-15 14:17         ` Joe Perches
2017-03-23 10:52   ` Lee Jones
2017-02-17  7:11 ` [PATCH 24/35] drivers/mtd: " Joe Perches
2017-04-19 20:11   ` Brian Norris
2017-02-17  7:11 ` [PATCH 25/35] drivers/of: " Joe Perches
2017-02-17  7:11 ` [PATCH 26/35] drivers/oprofile: " Joe Perches
2017-02-17 14:07   ` Robert Richter
2017-02-17  7:11 ` [PATCH 27/35] drivers/platform: " Joe Perches
2017-02-17  7:45   ` Andy Shevchenko
2017-02-17  7:11 ` [PATCH 28/35] drivers/rapidio: Convert remaining use " Joe Perches
2017-02-17  7:11 ` [PATCH 29/35] drivers/scsi: " Joe Perches
2017-02-17  7:11 ` [PATCH 30/35] drivers/sh: " Joe Perches
2017-02-17  7:11 ` [PATCH 31/35] drivers/tty: Convert remaining uses " Joe Perches
2017-02-17  7:11 ` [PATCH 32/35] drivers/video: " Joe Perches
2017-03-21 15:17   ` Bartlomiej Zolnierkiewicz
2017-02-17  7:11 ` [PATCH 33/35] kernel/trace: " Joe Perches
2017-02-17 14:59   ` Steven Rostedt
2017-02-17  7:11 ` [PATCH 34/35] lib: " Joe Perches
2017-02-17  7:11 ` [PATCH 35/35] sound/soc: " Joe Perches
2017-02-17 20:28   ` Nicolin Chen
2017-02-17 23:48     ` Mark Brown
2017-02-17 23:57       ` Nicolin Chen
2017-02-18  0:20         ` Joe Perches
2017-02-20 19:06           ` Mark Brown
2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
2017-02-23 15:28 ` Rob Herring
2017-02-23 17:18   ` Joe Perches
2017-02-23 17:41     ` Emil Velikov
2017-02-23 17:53       ` Joe Perches

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).