Commit 257daba4 authored by Kefeng Wang's avatar Kefeng Wang Committed by Petr Mladek
Browse files

idsn: Use pr_warn instead of pr_warning 

As said in commit f2c2cbcc ("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.

Link: http://lkml.kernel.org/r/20191018031850.48498-14-wangkefeng.wang@huawei.com


To: linux-kernel@vger.kernel.org
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
parent a7f4a27f

drivers/isdn/hardware/mISDN/avmfritz.c

+8 −8
Original line number Diff line number Diff line
@@ -402,7 +402,7 @@ 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",

			pr_warn("%s.B%d: No bufferspace for %d bytes\n",

				fc->name, bch->nr, count);

			return;

		}
@@ -539,7 +539,7 @@ 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",

			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;
@@ -562,7 +562,7 @@ HDLC_irq(struct bchannel *bch, u32 stat) 
				    HDLC_STAT_CRCVFR) {

					recv_Bchannel(bch, 0, false);

				} else {

					pr_warning("%s: got invalid frame\n",

					pr_warn("%s: got invalid frame\n",

						fc->name);

					skb_trim(bch->rx_skb, 0);

				}
@@ -575,7 +575,7 @@ handle_tx: 
		 * 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,

		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))

drivers/isdn/hardware/mISDN/hfcmulti.c

+4 −4
Original line number Diff line number Diff line
@@ -2248,7 +2248,7 @@ next_frame: 
	if (bch) {

		maxlen = bchannel_get_rxbuf(bch, Zsize);

		if (maxlen < 0) {

			pr_warning("card%d.B%d: No bufferspace for %d bytes\n",

			pr_warn("card%d.B%d: No bufferspace for %d bytes\n",

				hc->id + 1, bch->nr, Zsize);

			return;

		}
@@ -2260,7 +2260,7 @@ next_frame: 
		if (*sp == NULL) {

			*sp = mI_alloc_skb(maxlen, GFP_ATOMIC);

			if (*sp == NULL) {

				pr_warning("card%d: No mem for dch rx_skb\n",

				pr_warn("card%d: No mem for dch rx_skb\n",

					hc->id + 1);

				return;

			}

drivers/isdn/hardware/mISDN/hfcpci.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

drivers/isdn/hardware/mISDN/hfcsusb.c

+2 −2
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ 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",

			pr_warn("%s.B%d: No bufferspace for %d bytes\n",

				hw->name, fifo->bch->nr, len);

			spin_unlock_irqrestore(&hw->lock, flags);

			return;

drivers/isdn/hardware/mISDN/mISDNipac.c

+2 −2
Original line number Diff line number Diff line
@@ -939,7 +939,7 @@ 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",

		pr_warn("%s.B%d: No bufferspace for %d bytes\n",

			hscx->ip->name, hscx->bch.nr, count);

		return;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE