* [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 20/35] drivers/isdn: Convert remaining uses of " Joe Perches
[not found] ` <cover.1487314666.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
0 siblings, 2 replies; 9+ 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, lin
Cc: linux-ia64, linux-sh, netdev, linux-input, adi-buildroot-devel,
amd-gfx, dri-devel, linux-alpha, sparclinux
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
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 9+ 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 @ 2017-02-17 7:11 ` Joe Perches 2017-02-17 8:49 ` Paul Bolle [not found] ` <cover.1487314666.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> 1 sibling, 1 reply; 9+ 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 related [flat|nested] 9+ 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: Convert remaining uses of " Joe Perches @ 2017-02-17 8:49 ` Paul Bolle 0 siblings, 0 replies; 9+ 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] 9+ messages in thread
[parent not found: <cover.1487314666.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>]
* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn [not found] ` <cover.1487314666.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> @ 2017-02-17 12:27 ` Rafael J. Wysocki 2017-02-17 12:37 ` Geert Uytterhoeven 2017-02-23 15:28 ` Rob Herring 1 sibling, 1 reply; 9+ 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-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linuxppc-dev, tboot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, oprofile-list-TtF/mJH4Jtrk1uMJSBkQmQ, sfi-devel-yLnuTTp1/kvcsJTPyzm5gB2eb7JE58TQ, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, ACPI Devel Maling List, drbd-dev-cunTk1MwBs8qoQakbn7OcQ, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, linux-crypto-u79uwXL29TY76Z2rM5mHXA, linux-ide-u79uwXL29TY76Z2rM5mHXA, gigaset307x-common-5NWGOfrQmneRv+LV9MX5uv+2+P5yyue3 On Fri, Feb 17, 2017 at 8:11 AM, Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn 2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki @ 2017-02-17 12:37 ` Geert Uytterhoeven 0 siblings, 0 replies; 9+ messages in thread From: Geert Uytterhoeven @ 2017-02-17 12:37 UTC (permalink / raw) To: Rafael J. Wysocki Cc: open list:FRAMEBUFFER LAYER, linux-ia64@vger.kernel.org, Linux-sh list, Alexander Shishkin, nouveau, moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..., dri-devel, virtualization, linux-ide@vger.kernel.org, MTD Maling List, sparclinux, Lars Ellenberg, open list:TARGET SUBSYSTEM, Richard Weinberger, sfi-devel, amd-gfx, ACPI Devel Maling List, tboot-devel, oprofil Hi Rafael, On Fri, Feb 17, 2017 at 1:27 PM, Rafael J. Wysocki <rafael@kernel.org> wrote: > 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()? That's already the case. This series cleans up the cruft, so we can catch all users with "git grep -w pr_warn". Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 00/35] treewide trivial patches converting pr_warning to pr_warn [not found] ` <cover.1487314666.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> 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 1 sibling, 1 reply; 9+ messages in thread From: Rob Herring @ 2017-02-23 15:28 UTC (permalink / raw) To: Joe Perches Cc: linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-ia64-u79uwXL29TY76Z2rM5mHXA, SH-Linux, Alexander Shishkin, nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Linux-ALSA, dri-devel, virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA, linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mtd-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, sparclinux-u79uwXL29TY76Z2rM5mHXA, drbd-dev-cunTk1MwBs8qoQakbn7OcQ, linux-scsi-u79uwXL29TY76Z2rM5mHXA, Richard Weinberger, sfi-devel-yLnuTTp1/kvcsJTPyzm5gB2eb7JE58TQ, amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, linux-acpi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, tboot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f, oprofile-list-TtF/mJH4Jtrk1uMJSBkQmQ, linux-input-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b, "linux-media@vger.k 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 _______________________________________________ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx ^ permalink raw reply [flat|nested] 9+ 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; 9+ messages in thread From: Joe Perches @ 2017-02-23 17:18 UTC (permalink / raw) To: Rob Herring Cc: linux-fbdev@vger.kernel.org, linux-ia64, SH-Linux, Alexander Shishkin, nouveau, Linux-ALSA, dri-devel, virtualization, linux-ide@vger.kernel.org, linux-mtd@lists.infradead.org, sparclinux, drbd-dev, linux-scsi, Richard Weinberger, sfi-devel, amd-gfx, linux-acpi@vger.kernel.org, tboot-devel, oprofile-list, linux-input@vger.kernel.org, xen-devel, "linux-media@vger.k 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. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel ^ permalink raw reply [flat|nested] 9+ 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; 9+ messages in thread From: Emil Velikov @ 2017-02-23 17:41 UTC (permalink / raw) To: Joe Perches Cc: linux-fbdev@vger.kernel.org, linux-ia64, SH-Linux, Alexander Shishkin, ML nouveau, Linux-ALSA, dri-devel, open list:VIRTIO GPU DRIVER, linux-ide@vger.kernel.org, linux-mtd@lists.infradead.org, sparclinux, drbd-dev, Rob Herring, linux-omap, linux-scsi, Richard Weinberger, tboot-devel, amd-gfx mailing list, linux-acpi@vger.kernel.org, sfi-devel 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] 9+ 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; 9+ messages in thread From: Joe Perches @ 2017-02-23 17:53 UTC (permalink / raw) To: Emil Velikov Cc: linux-fbdev@vger.kernel.org, linux-ia64, SH-Linux, Alexander Shishkin, ML nouveau, Linux-ALSA, dri-devel, open list:VIRTIO GPU DRIVER, linux-ide@vger.kernel.org, linux-mtd@lists.infradead.org, sparclinux, drbd-dev, Rob Herring, linux-omap, linux-scsi, Richard Weinberger, tboot-devel, amd-gfx mailing list, linux-acpi@vger.kernel.org, sfi-devel 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] 9+ messages in thread
end of thread, other threads:[~2017-02-23 17:53 UTC | newest]
Thread overview: 9+ 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 20/35] drivers/isdn: Convert remaining uses of " Joe Perches
2017-02-17 8:49 ` Paul Bolle
[not found] ` <cover.1487314666.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
2017-02-17 12:27 ` [PATCH 00/35] treewide trivial patches converting " Rafael J. Wysocki
2017-02-17 12:37 ` Geert Uytterhoeven
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).