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

usb: Convert pr_warning to pr_warn

Use the more common logging mechanism.

Miscellanea:

o Realign multiline statements
o Coalesce format

Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Joe Perches and committed by
Greg Kroah-Hartman
a4e6a852 88aecde4

+29 -29
+4 -5
drivers/usb/gadget/function/rndis.c
··· 474 474 break; 475 475 476 476 default: 477 - pr_warning("%s: query unknown OID 0x%08X\n", 478 - __func__, OID); 477 + pr_warn("%s: query unknown OID 0x%08X\n", __func__, OID); 479 478 } 480 479 if (retval < 0) 481 480 length = 0; ··· 545 546 break; 546 547 547 548 default: 548 - pr_warning("%s: set unknown OID 0x%08X, size %d\n", 549 - __func__, OID, buf_len); 549 + pr_warn("%s: set unknown OID 0x%08X, size %d\n", 550 + __func__, OID, buf_len); 550 551 } 551 552 552 553 return retval; ··· 853 854 * In one case those messages seemed to relate to the host 854 855 * suspending itself. 855 856 */ 856 - pr_warning("%s: unknown RNDIS message 0x%08X len %d\n", 857 + pr_warn("%s: unknown RNDIS message 0x%08X len %d\n", 857 858 __func__, MsgType, MsgLength); 858 859 print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET, 859 860 buf, MsgLength);
+2 -2
drivers/usb/gadget/function/u_serial.c
··· 622 622 switch (req->status) { 623 623 default: 624 624 /* presumably a transient fault */ 625 - pr_warning("%s: unexpected %s status %d\n", 626 - __func__, ep->name, req->status); 625 + pr_warn("%s: unexpected %s status %d\n", 626 + __func__, ep->name, req->status); 627 627 /* FALL THROUGH */ 628 628 case 0: 629 629 /* normal completion */
+1 -1
drivers/usb/gadget/udc/at91_udc.h
··· 175 175 #endif 176 176 177 177 #define ERR(stuff...) pr_err("udc: " stuff) 178 - #define WARNING(stuff...) pr_warning("udc: " stuff) 178 + #define WARNING(stuff...) pr_warn("udc: " stuff) 179 179 #define INFO(stuff...) pr_info("udc: " stuff) 180 180 #define DBG(stuff...) pr_debug("udc: " stuff) 181 181
+2 -2
drivers/usb/gadget/udc/atmel_usba_udc.c
··· 1464 1464 pkt_len = USBA_BFEXT(BYTE_COUNT, usba_ep_readl(ep, STA)); 1465 1465 DBG(DBG_HW, "Packet length: %u\n", pkt_len); 1466 1466 if (pkt_len != sizeof(crq)) { 1467 - pr_warning("udc: Invalid packet length %u " 1468 - "(expected %zu)\n", pkt_len, sizeof(crq)); 1467 + pr_warn("udc: Invalid packet length %u (expected %zu)\n", 1468 + pkt_len, sizeof(crq)); 1469 1469 set_protocol_stall(udc, ep); 1470 1470 return; 1471 1471 }
+1 -1
drivers/usb/gadget/udc/fsl_usb2_udc.h
··· 554 554 #endif 555 555 556 556 #define ERR(stuff...) pr_err("udc: " stuff) 557 - #define WARNING(stuff...) pr_warning("udc: " stuff) 557 + #define WARNING(stuff...) pr_warn("udc: " stuff) 558 558 #define INFO(stuff...) pr_info("udc: " stuff) 559 559 560 560 /*-------------------------------------------------------------------------*/
+2 -2
drivers/usb/gadget/udc/m66592-udc.c
··· 637 637 clock = M66592_XTAL48; 638 638 break; 639 639 default: 640 - pr_warning("m66592-udc: xtal configuration error\n"); 640 + pr_warn("m66592-udc: xtal configuration error\n"); 641 641 clock = 0; 642 642 } 643 643 ··· 649 649 irq_sense = 0; 650 650 break; 651 651 default: 652 - pr_warning("m66592-udc: irq trigger config error\n"); 652 + pr_warn("m66592-udc: irq trigger config error\n"); 653 653 irq_sense = 0; 654 654 } 655 655
+1 -1
drivers/usb/gadget/udc/omap_udc.h
··· 187 187 #endif 188 188 189 189 #define ERR(stuff...) pr_err("udc: " stuff) 190 - #define WARNING(stuff...) pr_warning("udc: " stuff) 190 + #define WARNING(stuff...) pr_warn("udc: " stuff) 191 191 #define INFO(stuff...) pr_info("udc: " stuff) 192 192 #define DBG(stuff...) pr_debug("udc: " stuff) 193 193
+1 -1
drivers/usb/gadget/udc/pxa25x_udc.h
··· 248 248 #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0) 249 249 250 250 #define ERR(stuff...) pr_err("udc: " stuff) 251 - #define WARNING(stuff...) pr_warning("udc: " stuff) 251 + #define WARNING(stuff...) pr_warn("udc: " stuff) 252 252 #define INFO(stuff...) pr_info("udc: " stuff) 253 253 254 254
+14 -13
drivers/usb/host/isp1362-hcd.c
··· 147 147 if (epq) 148 148 DBG(1, "%s: PTD $%04x is on %s queue\n", __func__, offset, epq->name); 149 149 else 150 - pr_warning("%s: invalid PTD $%04x\n", __func__, offset); 150 + pr_warn("%s: invalid PTD $%04x\n", __func__, offset); 151 151 152 152 return epq; 153 153 } ··· 157 157 int offset; 158 158 159 159 if (index * epq->blk_size > epq->buf_size) { 160 - pr_warning("%s: Bad %s index %d(%d)\n", __func__, epq->name, index, 161 - epq->buf_size / epq->blk_size); 160 + pr_warn("%s: Bad %s index %d(%d)\n", 161 + __func__, epq->name, index, 162 + epq->buf_size / epq->blk_size); 162 163 return -EINVAL; 163 164 } 164 165 offset = epq->buf_start + index * epq->blk_size; ··· 903 902 904 903 ptd_offset = next_ptd(epq, ep); 905 904 if (ptd_offset < 0) { 906 - pr_warning("%s: req %d No more %s PTD buffers available\n", __func__, 907 - ep->num_req, epq->name); 905 + pr_warn("%s: req %d No more %s PTD buffers available\n", 906 + __func__, ep->num_req, epq->name); 908 907 break; 909 908 } 910 909 } ··· 974 973 break; 975 974 } 976 975 if (done_map) 977 - pr_warning("%s: done_map not clear: %08lx:%08lx\n", __func__, done_map, 978 - epq->skip_map); 976 + pr_warn("%s: done_map not clear: %08lx:%08lx\n", 977 + __func__, done_map, epq->skip_map); 979 978 atomic_dec(&epq->finishing); 980 979 } 981 980 ··· 1434 1433 } else 1435 1434 DBG(1, "%s: urb %p active; wait4irq\n", __func__, urb); 1436 1435 } else { 1437 - pr_warning("%s: No EP in URB %p\n", __func__, urb); 1436 + pr_warn("%s: No EP in URB %p\n", __func__, urb); 1438 1437 retval = -EINVAL; 1439 1438 } 1440 1439 done: ··· 1749 1748 /* FALL THROUGH */ 1750 1749 case OHCI_USB_RESET: 1751 1750 status = -EBUSY; 1752 - pr_warning("%s: needs reinit!\n", __func__); 1751 + pr_warn("%s: needs reinit!\n", __func__); 1753 1752 goto done; 1754 1753 case OHCI_USB_SUSPEND: 1755 - pr_warning("%s: already suspended?\n", __func__); 1754 + pr_warn("%s: already suspended?\n", __func__); 1756 1755 goto done; 1757 1756 } 1758 1757 DBG(0, "%s: suspend root hub\n", __func__); ··· 1840 1839 isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL); 1841 1840 pr_info("%s: HCCONTROL: %08x\n", __func__, isp1362_hcd->hc_control); 1842 1841 if (hcd->state == HC_STATE_RESUMING) { 1843 - pr_warning("%s: duplicate resume\n", __func__); 1842 + pr_warn("%s: duplicate resume\n", __func__); 1844 1843 status = 0; 1845 1844 } else 1846 1845 switch (isp1362_hcd->hc_control & OHCI_CTRL_HCFS) { ··· 2475 2474 __func__, offset); 2476 2475 break; 2477 2476 } 2478 - pr_warning("%s: memory check with offset %02x ok after second read\n", 2479 - __func__, offset); 2477 + pr_warn("%s: memory check with offset %02x ok after second read\n", 2478 + __func__, offset); 2480 2479 } 2481 2480 } 2482 2481 kfree(ref);
+1 -1
drivers/usb/isp1760/isp1760-if.c
··· 197 197 198 198 irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 199 199 if (!irq_res) { 200 - pr_warning("isp1760: IRQ resource not available\n"); 200 + pr_warn("isp1760: IRQ resource not available\n"); 201 201 return -ENODEV; 202 202 } 203 203 irqflags = irq_res->flags & IRQF_TRIGGER_MASK;