Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

idsn: Use pr_warn instead of pr_warning

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.

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: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>

authored by

Kefeng Wang and committed by
Petr Mladek
257daba4 a7f4a27f

+35 -37
+8 -8
drivers/isdn/hardware/mISDN/avmfritz.c
··· 402 402 } else { 403 403 cnt = bchannel_get_rxbuf(bch, count); 404 404 if (cnt < 0) { 405 - pr_warning("%s.B%d: No bufferspace for %d bytes\n", 406 - fc->name, bch->nr, count); 405 + pr_warn("%s.B%d: No bufferspace for %d bytes\n", 406 + fc->name, bch->nr, count); 407 407 return; 408 408 } 409 409 p = skb_put(bch->rx_skb, count); ··· 539 539 } 540 540 if (stat & HDLC_INT_RPR) { 541 541 if (stat & HDLC_STAT_RDO) { 542 - pr_warning("%s: ch%d stat %x RDO\n", 543 - fc->name, bch->nr, stat); 542 + pr_warn("%s: ch%d stat %x RDO\n", 543 + fc->name, bch->nr, stat); 544 544 hdlc->ctrl.sr.xml = 0; 545 545 hdlc->ctrl.sr.cmd |= HDLC_CMD_RRS; 546 546 write_ctrl(bch, 1); ··· 562 562 HDLC_STAT_CRCVFR) { 563 563 recv_Bchannel(bch, 0, false); 564 564 } else { 565 - pr_warning("%s: got invalid frame\n", 566 - fc->name); 565 + pr_warn("%s: got invalid frame\n", 566 + fc->name); 567 567 skb_trim(bch->rx_skb, 0); 568 568 } 569 569 } ··· 575 575 * restart transmitting the whole frame on HDLC 576 576 * in transparent mode we send the next data 577 577 */ 578 - pr_warning("%s: ch%d stat %x XDU %s\n", fc->name, bch->nr, 579 - stat, bch->tx_skb ? "tx_skb" : "no tx_skb"); 578 + pr_warn("%s: ch%d stat %x XDU %s\n", fc->name, bch->nr, 579 + stat, bch->tx_skb ? "tx_skb" : "no tx_skb"); 580 580 if (bch->tx_skb && bch->tx_skb->len) { 581 581 if (!test_bit(FLG_TRANSPARENT, &bch->Flags)) 582 582 bch->tx_idx = 0;
+4 -4
drivers/isdn/hardware/mISDN/hfcmulti.c
··· 2248 2248 if (bch) { 2249 2249 maxlen = bchannel_get_rxbuf(bch, Zsize); 2250 2250 if (maxlen < 0) { 2251 - pr_warning("card%d.B%d: No bufferspace for %d bytes\n", 2252 - hc->id + 1, bch->nr, Zsize); 2251 + pr_warn("card%d.B%d: No bufferspace for %d bytes\n", 2252 + hc->id + 1, bch->nr, Zsize); 2253 2253 return; 2254 2254 } 2255 2255 sp = &bch->rx_skb; ··· 2260 2260 if (*sp == NULL) { 2261 2261 *sp = mI_alloc_skb(maxlen, GFP_ATOMIC); 2262 2262 if (*sp == NULL) { 2263 - pr_warning("card%d: No mem for dch rx_skb\n", 2264 - hc->id + 1); 2263 + pr_warn("card%d: No mem for dch rx_skb\n", 2264 + hc->id + 1); 2265 2265 return; 2266 2266 } 2267 2267 }
+1 -2
drivers/isdn/hardware/mISDN/hfcpci.c
··· 566 566 } 567 567 maxlen = bchannel_get_rxbuf(bch, fcnt_rx); 568 568 if (maxlen < 0) { 569 - pr_warning("B%d: No bufferspace for %d bytes\n", 570 - bch->nr, fcnt_rx); 569 + pr_warn("B%d: No bufferspace for %d bytes\n", bch->nr, fcnt_rx); 571 570 } else { 572 571 ptr = skb_put(bch->rx_skb, fcnt_rx); 573 572 if (le16_to_cpu(*z2r) + fcnt_rx <= B_FIFO_SIZE + B_SUB_VAL)
+2 -2
drivers/isdn/hardware/mISDN/hfcsusb.c
··· 841 841 if (maxlen < 0) { 842 842 if (rx_skb) 843 843 skb_trim(rx_skb, 0); 844 - pr_warning("%s.B%d: No bufferspace for %d bytes\n", 845 - hw->name, fifo->bch->nr, len); 844 + pr_warn("%s.B%d: No bufferspace for %d bytes\n", 845 + hw->name, fifo->bch->nr, len); 846 846 spin_unlock_irqrestore(&hw->lock, flags); 847 847 return; 848 848 }
+2 -2
drivers/isdn/hardware/mISDN/mISDNipac.c
··· 939 939 hscx_cmdr(hscx, 0x80); /* RMC */ 940 940 if (hscx->bch.rx_skb) 941 941 skb_trim(hscx->bch.rx_skb, 0); 942 - pr_warning("%s.B%d: No bufferspace for %d bytes\n", 943 - hscx->ip->name, hscx->bch.nr, count); 942 + pr_warn("%s.B%d: No bufferspace for %d bytes\n", 943 + hscx->ip->name, hscx->bch.nr, count); 944 944 return; 945 945 } 946 946 p = skb_put(hscx->bch.rx_skb, count);
+5 -5
drivers/isdn/hardware/mISDN/mISDNisar.c
··· 222 222 goto reterror; 223 223 } 224 224 if (!poll_mbox(isar, 1000)) { 225 - pr_warning("ISAR poll_mbox dkey failed\n"); 225 + pr_warn("ISAR poll_mbox dkey failed\n"); 226 226 ret = -ETIME; 227 227 goto reterror; 228 228 } ··· 432 432 case ISDN_P_B_MODEM_ASYNC: 433 433 maxlen = bchannel_get_rxbuf(&ch->bch, ch->is->clsb); 434 434 if (maxlen < 0) { 435 - pr_warning("%s.B%d: No bufferspace for %d bytes\n", 436 - ch->is->name, ch->bch.nr, ch->is->clsb); 435 + pr_warn("%s.B%d: No bufferspace for %d bytes\n", 436 + ch->is->name, ch->bch.nr, ch->is->clsb); 437 437 ch->is->write_reg(ch->is->hw, ISAR_IIA, 0); 438 438 break; 439 439 } ··· 443 443 case ISDN_P_B_HDLC: 444 444 maxlen = bchannel_get_rxbuf(&ch->bch, ch->is->clsb); 445 445 if (maxlen < 0) { 446 - pr_warning("%s.B%d: No bufferspace for %d bytes\n", 447 - ch->is->name, ch->bch.nr, ch->is->clsb); 446 + pr_warn("%s.B%d: No bufferspace for %d bytes\n", 447 + ch->is->name, ch->bch.nr, ch->is->clsb); 448 448 ch->is->write_reg(ch->is->hw, ISAR_IIA, 0); 449 449 break; 450 450 }
+4 -4
drivers/isdn/hardware/mISDN/netjet.c
··· 380 380 stat = bchannel_get_rxbuf(&bc->bch, cnt); 381 381 /* only transparent use the count here, HDLC overun is detected later */ 382 382 if (stat == -ENOMEM) { 383 - pr_warning("%s.B%d: No memory for %d bytes\n", 384 - card->name, bc->bch.nr, cnt); 383 + pr_warn("%s.B%d: No memory for %d bytes\n", 384 + card->name, bc->bch.nr, cnt); 385 385 return; 386 386 } 387 387 if (test_bit(FLG_TRANSPARENT, &bc->bch.Flags)) ··· 420 420 recv_Bchannel(&bc->bch, 0, false); 421 421 stat = bchannel_get_rxbuf(&bc->bch, bc->bch.maxlen); 422 422 if (stat < 0) { 423 - pr_warning("%s.B%d: No memory for %d bytes\n", 424 - card->name, bc->bch.nr, cnt); 423 + pr_warn("%s.B%d: No memory for %d bytes\n", 424 + card->name, bc->bch.nr, cnt); 425 425 return; 426 426 } 427 427 } else if (stat == -HDLC_CRC_ERROR) {
+6 -6
drivers/isdn/hardware/mISDN/w6692.c
··· 468 468 WriteW6692B(wch, W_B_CMDR, W_B_CMDR_RACK | W_B_CMDR_RACT); 469 469 if (wch->bch.rx_skb) 470 470 skb_trim(wch->bch.rx_skb, 0); 471 - pr_warning("%s.B%d: No bufferspace for %d bytes\n", 472 - card->name, wch->bch.nr, count); 471 + pr_warn("%s.B%d: No bufferspace for %d bytes\n", 472 + card->name, wch->bch.nr, count); 473 473 return; 474 474 } 475 475 ptr = skb_put(wch->bch.rx_skb, count); ··· 732 732 wch->bch.nr, star); 733 733 } 734 734 if (star & W_B_STAR_XDOW) { 735 - pr_warning("%s: B%d XDOW proto=%x\n", card->name, 736 - wch->bch.nr, wch->bch.state); 735 + pr_warn("%s: B%d XDOW proto=%x\n", card->name, 736 + wch->bch.nr, wch->bch.state); 737 737 #ifdef ERROR_STATISTIC 738 738 wch->bch.err_xdu++; 739 739 #endif ··· 750 750 return; /* handle XDOW only once */ 751 751 } 752 752 if (stat & W_B_EXI_XDUN) { 753 - pr_warning("%s: B%d XDUN proto=%x\n", card->name, 754 - wch->bch.nr, wch->bch.state); 753 + pr_warn("%s: B%d XDUN proto=%x\n", card->name, 754 + wch->bch.nr, wch->bch.state); 755 755 #ifdef ERROR_STATISTIC 756 756 wch->bch.err_xdu++; 757 757 #endif
+3 -4
drivers/isdn/mISDN/hwchannel.c
··· 474 474 if (bch->rx_skb) { 475 475 len = skb_tailroom(bch->rx_skb); 476 476 if (len < reqlen) { 477 - pr_warning("B%d no space for %d (only %d) bytes\n", 478 - bch->nr, reqlen, len); 477 + pr_warn("B%d no space for %d (only %d) bytes\n", 478 + bch->nr, reqlen, len); 479 479 if (test_bit(FLG_TRANSPARENT, &bch->Flags)) { 480 480 /* send what we have now and try a new buffer */ 481 481 recv_Bchannel(bch, 0, true); ··· 508 508 } 509 509 bch->rx_skb = mI_alloc_skb(len, GFP_ATOMIC); 510 510 if (!bch->rx_skb) { 511 - pr_warning("B%d receive no memory for %d bytes\n", 512 - bch->nr, len); 511 + pr_warn("B%d receive no memory for %d bytes\n", bch->nr, len); 513 512 len = -ENOMEM; 514 513 } 515 514 return len;