From: Kefeng Wang <wangkefeng.wang@huawei.com>
To: Joe Perches <joe@perches.com>,
Andrew Morton <akpm@linux-foundation.org>,
Ingo Molnar <mingo@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
Andy Whitcroft <apw@canonical.com>,
Peter Zijlstra <peterz@infradead.org>,
"Alexei Starovoitov" <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
Petr Mladek <pmladek@suse.com>, Arnd Bergmann <arnd@arndb.de>,
<linux-kernel@vger.kernel.org>
Cc: <wangkefeng.wang@huawei.com>, Karsten Keil <isdn@linux-pingi.de>
Subject: [PATCH 14/32] idsn: Use pr_warn instead of pr_warning
Date: Fri, 20 Sep 2019 14:25:26 +0800 [thread overview]
Message-ID: <20190920062544.180997-15-wangkefeng.wang@huawei.com> (raw)
In-Reply-To: <20190920062544.180997-1-wangkefeng.wang@huawei.com>
As said in commit f2c2cbcc35d4 ("powerpc: Use pr_warn instead of
pr_warning"), removing pr_warning so all logging messages use a
consistent <prefix>_warn style. Let's do it.
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
drivers/isdn/hardware/mISDN/avmfritz.c | 16 ++++++++--------
drivers/isdn/hardware/mISDN/hfcmulti.c | 8 ++++----
drivers/isdn/hardware/mISDN/hfcpci.c | 3 +--
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 | 7 +++----
9 files changed, 35 insertions(+), 37 deletions(-)
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c
index 1137dd152b5c..ecc1ef6c386d 100644
--- a/drivers/isdn/hardware/mISDN/avmfritz.c
+++ b/drivers/isdn/hardware/mISDN/avmfritz.c
@@ -402,8 +402,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);
@@ -538,8 +538,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);
@@ -561,8 +561,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);
}
}
@@ -574,8 +574,8 @@ 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 86669ec8b977..7013a3f08429 100644
--- a/drivers/isdn/hardware/mISDN/hfcmulti.c
+++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -2248,8 +2248,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;
@@ -2260,8 +2260,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 2330a7d24267..abdf787c1a71 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -566,8 +566,7 @@ 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 008a74a1ed44..621364bb6b12 100644
--- a/drivers/isdn/hardware/mISDN/hfcsusb.c
+++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -841,8 +841,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_irqrestore(&hw->lock, flags);
return;
}
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index bca880213e91..ec475087fbf9 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -936,8 +936,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 4a3e748a1c26..096d8c5e5df9 100644
--- a/drivers/isdn/hardware/mISDN/mISDNisar.c
+++ b/drivers/isdn/hardware/mISDN/mISDNisar.c
@@ -222,7 +222,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;
}
@@ -432,8 +432,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;
}
@@ -443,8 +443,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 61caa7e50b9a..6aae97e827b7 100644
--- a/drivers/isdn/hardware/mISDN/netjet.c
+++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -380,8 +380,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))
@@ -420,8 +420,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 bad55fdacd36..f3b8db7b48fe 100644
--- a/drivers/isdn/hardware/mISDN/w6692.c
+++ b/drivers/isdn/hardware/mISDN/w6692.c
@@ -466,8 +466,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);
@@ -729,8 +729,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
@@ -747,8 +747,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 f378173bcf6f..8c93af06ed02 100644
--- a/drivers/isdn/mISDN/hwchannel.c
+++ b/drivers/isdn/mISDN/hwchannel.c
@@ -474,8 +474,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);
@@ -508,8 +508,7 @@ 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.20.1
next prev parent reply other threads:[~2019-09-20 6:09 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-20 6:25 [PATCH 00/32] Kill pr_warning in the whole linux code Kefeng Wang
2019-09-20 6:25 ` [PATCH 01/32] alpha: Use pr_warn instead of pr_warning Kefeng Wang
2019-09-20 6:25 ` [PATCH 02/32] arm64: " Kefeng Wang
2019-09-20 15:57 ` Will Deacon
2019-09-20 6:25 ` [PATCH 03/32] ia64: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 04/32] riscv: " Kefeng Wang
2019-09-25 21:05 ` Palmer Dabbelt
2019-09-20 6:25 ` [PATCH 05/32] sh: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 06/32] sparc: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 07/32] x86: " Kefeng Wang
2019-09-20 9:28 ` Robert Richter
2019-09-20 11:57 ` Kefeng Wang
2019-09-20 15:28 ` Joe Perches
2019-09-26 1:30 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 08/32] acpi: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 09/32] drbd: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 10/32] gdrom: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 11/32] clocksource: samsung_pwm_timer: " Kefeng Wang
2019-09-20 8:25 ` Daniel Lezcano
2019-09-20 6:25 ` [PATCH 12/32] crypto: n2: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 13/32] ide: " Kefeng Wang
2019-09-20 6:25 ` Kefeng Wang [this message]
2019-09-20 6:25 ` [PATCH 15/32] macintosh: " Kefeng Wang
2019-09-20 6:25 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 16/32] of: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 17/32] oprofile: " Kefeng Wang
2019-09-20 9:18 ` Robert Richter
2019-09-20 6:25 ` [PATCH 18/32] platform/x86: " Kefeng Wang
2019-09-20 6:26 ` Andy Shevchenko
2019-09-20 6:31 ` Kefeng Wang
2019-09-20 11:12 ` [PATCH v2 1/3] platform/x86: eeepc-laptop: " Kefeng Wang
2019-09-20 11:12 ` [PATCH v2 2/3] platform/x86: asus-laptop: " Kefeng Wang
2019-09-20 11:12 ` [PATCH v2 3/3] platform/x86: intel_oaktrail: " Kefeng Wang
2019-09-25 15:04 ` Andy Shevchenko
2019-09-26 1:28 ` Kefeng Wang
2019-09-26 5:48 ` Andy Shevchenko
2019-09-26 6:09 ` Kefeng Wang
2019-09-26 7:32 ` Andy Shevchenko
2019-09-26 7:48 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 19/32] scsi: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 20/32] sh/intc: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 21/32] staging: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 22/32] fs: afs: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 23/32] vgacon: " Kefeng Wang
2019-09-20 6:25 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 24/32] dma-debug: " Kefeng Wang
2019-09-25 17:13 ` Christoph Hellwig
2019-09-26 1:44 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 25/32] trace: " Kefeng Wang
2019-09-20 13:26 ` Steven Rostedt
2019-09-20 6:25 ` [PATCH 26/32] lib: cpu_rmap: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 27/32] ASoC: samsung: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 28/32] printk: Drop pr_warning Kefeng Wang
2019-09-20 6:25 ` [PATCH 29/32] tools lib api: Renaming pr_warning to pr_warn Kefeng Wang
2019-09-20 6:25 ` [PATCH 30/32] tools lib bpf: " Kefeng Wang
2019-09-22 21:07 ` Andrii Nakryiko
2019-09-23 8:20 ` Daniel Borkmann
2019-09-23 11:03 ` Petr Mladek
2019-09-23 13:35 ` Daniel Borkmann
2019-09-26 2:01 ` Kefeng Wang
2019-09-20 6:25 ` [PATCH 31/32] tools perf: " Kefeng Wang
2019-09-20 6:25 ` [PATCH 32/32] checkpatch: Drop pr_warning check Kefeng Wang
2019-09-20 9:29 ` [PATCH 00/32] Kill pr_warning in the whole linux code Sergey Senozhatsky
2019-10-02 8:55 ` Petr Mladek
2019-10-08 6:39 ` Kefeng Wang
2019-10-17 13:05 ` Petr Mladek
2019-10-17 13:29 ` Kefeng Wang
2019-10-17 13:52 ` Petr Mladek
2019-10-17 16:38 ` Joe Perches
2019-10-18 1:11 ` Kefeng Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190920062544.180997-15-wangkefeng.wang@huawei.com \
--to=wangkefeng.wang@huawei.com \
--cc=acme@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=apw@canonical.com \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=isdn@linux-pingi.de \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=sergey.senozhatsky@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.