usb: Convert pr_warning to pr_warn

Use the more common logging mechanism.

Miscellanea:

o Realign multiline statements
o Coalesce format

Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>

diff --git a/drivers/usb/gadget/function/rndis.c b/drivers/usb/gadget/function/rndis.c
index ab6ac1b74ac0f59e4a09ec340a66a954934836b1..766c328c15c0d963ee8c7b8a183358334d2c33c0 100644 (file)
--- a/drivers/usb/gadget/function/rndis.c
+++ b/drivers/usb/gadget/function/rndis.c
@@ -474,8 +474,7 @@ static int gen_ndis_query_resp(struct rndis_params *params, u32 OID, u8 *buf,
                break;
 
        default:
-               pr_warning("%s: query unknown OID 0x%08X\n",
-                        __func__, OID);
+               pr_warn("%s: query unknown OID 0x%08X\n", __func__, OID);
        }
        if (retval < 0)
                length = 0;
@@ -546,8 +545,8 @@ static int gen_ndis_set_resp(struct rndis_params *params, u32 OID,
                break;
 
        default:
-               pr_warning("%s: set unknown OID 0x%08X, size %d\n",
-                        __func__, OID, buf_len);
+               pr_warn("%s: set unknown OID 0x%08X, size %d\n",
+                       __func__, OID, buf_len);
        }
 
        return retval;
@@ -854,7 +853,7 @@ int rndis_msg_parser(struct rndis_params *params, u8 *buf)
                 * In one case those messages seemed to relate to the host
                 * suspending itself.
                 */
-               pr_warning("%s: unknown RNDIS message 0x%08X len %d\n",
+               pr_warn("%s: unknown RNDIS message 0x%08X len %d\n",
                        __func__, MsgType, MsgLength);
                print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET,
                                     buf, MsgLength);

diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
index e0cd1e4c88927cfc29e12f050ec2a4eb8555136b..62ec842874aa2c44479a2679286f5345d790fe97 100644 (file)
--- a/drivers/usb/gadget/function/u_serial.c
+++ b/drivers/usb/gadget/function/u_serial.c
@@ -622,8 +622,8 @@ static void gs_write_complete(struct usb_ep *ep, struct usb_request *req)
        switch (req->status) {
        default:
                /* presumably a transient fault */
-               pr_warning("%s: unexpected %s status %d\n",
-                               __func__, ep->name, req->status);
+               pr_warn("%s: unexpected %s status %d\n",
+                       __func__, ep->name, req->status);
                /* FALL THROUGH */
        case 0:
                /* normal completion */

diff --git a/drivers/usb/gadget/udc/at91_udc.h b/drivers/usb/gadget/udc/at91_udc.h
index 0a433e6b346bca3f170d83a497a3bfe68cb863b6..9bbe72764f3112fff8ac3fb8aa39d4c76af6a4b8 100644 (file)
--- a/drivers/usb/gadget/udc/at91_udc.h
+++ b/drivers/usb/gadget/udc/at91_udc.h
@@ -175,7 +175,7 @@ struct at91_request {
 #endif
 
 #define ERR(stuff...)          pr_err("udc: " stuff)
-#define WARNING(stuff...)      pr_warning("udc: " stuff)
+#define WARNING(stuff...)      pr_warn("udc: " stuff)
 #define INFO(stuff...)         pr_info("udc: " stuff)
 #define DBG(stuff...)          pr_debug("udc: " stuff)
 

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 125680db93790c9bc5a8edea79c2c5370c9d2dea..f3212db9bc37bf1889c482e86c9c679720766b1f 100644 (file)
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -1464,8 +1464,8 @@ restart:
                pkt_len = USBA_BFEXT(BYTE_COUNT, usba_ep_readl(ep, STA));
                DBG(DBG_HW, "Packet length: %u\n", pkt_len);
                if (pkt_len != sizeof(crq)) {
-                       pr_warning("udc: Invalid packet length %u "
-                               "(expected %zu)\n", pkt_len, sizeof(crq));
+                       pr_warn("udc: Invalid packet length %u (expected %zu)\n",
+                               pkt_len, sizeof(crq));
                        set_protocol_stall(udc, ep);
                        return;
                }

diff --git a/drivers/usb/gadget/udc/fsl_usb2_udc.h b/drivers/usb/gadget/udc/fsl_usb2_udc.h
index 84715625b2b3b6e56361c10cefb88bde0290513d..e92b8408b6f610c9982c9fc91499e3c93daad8af 100644 (file)
--- a/drivers/usb/gadget/udc/fsl_usb2_udc.h
+++ b/drivers/usb/gadget/udc/fsl_usb2_udc.h
@@ -554,7 +554,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length)
 #endif
 
 #define ERR(stuff...)          pr_err("udc: " stuff)
-#define WARNING(stuff...)              pr_warning("udc: " stuff)
+#define WARNING(stuff...)      pr_warn("udc: " stuff)
 #define INFO(stuff...)         pr_info("udc: " stuff)
 
 /*-------------------------------------------------------------------------*/

diff --git a/drivers/usb/gadget/udc/m66592-udc.c b/drivers/usb/gadget/udc/m66592-udc.c
index 6e977dc225709e7ee90e10b09abf2fad006278c1..de3e034836592019ecba74b3c9b900714a247f72 100644 (file)
--- a/drivers/usb/gadget/udc/m66592-udc.c
+++ b/drivers/usb/gadget/udc/m66592-udc.c
@@ -637,7 +637,7 @@ static void init_controller(struct m66592 *m66592)
                        clock = M66592_XTAL48;
                        break;
                default:
-                       pr_warning("m66592-udc: xtal configuration error\n");
+                       pr_warn("m66592-udc: xtal configuration error\n");
                        clock = 0;
                }
 
@@ -649,7 +649,7 @@ static void init_controller(struct m66592 *m66592)
                        irq_sense = 0;
                        break;
                default:
-                       pr_warning("m66592-udc: irq trigger config error\n");
+                       pr_warn("m66592-udc: irq trigger config error\n");
                        irq_sense = 0;
                }
 

diff --git a/drivers/usb/gadget/udc/omap_udc.h b/drivers/usb/gadget/udc/omap_udc.h
index cfadeb5fc5deba66ac66e7a2228812f08fcd5261..26974196cf4454701d00e00b33dd9d8725628e7d 100644 (file)
--- a/drivers/usb/gadget/udc/omap_udc.h
+++ b/drivers/usb/gadget/udc/omap_udc.h
@@ -187,7 +187,7 @@ struct omap_udc {
 #endif
 
 #define ERR(stuff...)          pr_err("udc: " stuff)
-#define WARNING(stuff...)      pr_warning("udc: " stuff)
+#define WARNING(stuff...)      pr_warn("udc: " stuff)
 #define INFO(stuff...)         pr_info("udc: " stuff)
 #define DBG(stuff...)          pr_debug("udc: " stuff)
 

diff --git a/drivers/usb/gadget/udc/pxa25x_udc.h b/drivers/usb/gadget/udc/pxa25x_udc.h
index 4b8b72d7ab37306ad99240ab691dc5d5e0d6eb7e..a458bec2536d4c1832a60589a70f33e30fd0a86e 100644 (file)
--- a/drivers/usb/gadget/udc/pxa25x_udc.h
+++ b/drivers/usb/gadget/udc/pxa25x_udc.h
@@ -248,7 +248,7 @@ dump_state(struct pxa25x_udc *dev)
 #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0)
 
 #define ERR(stuff...)          pr_err("udc: " stuff)
-#define WARNING(stuff...)      pr_warning("udc: " stuff)
+#define WARNING(stuff...)      pr_warn("udc: " stuff)
 #define INFO(stuff...)         pr_info("udc: " stuff)
 
 

diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 6cf82ee460a68aec25e47b6e0086e1b3552c433f..0f2b4b358e1a74384c05b5bff3ffe0acdbf512f5 100644 (file)
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -147,7 +147,7 @@ static inline struct isp1362_ep_queue *get_ptd_queue(struct isp1362_hcd *isp1362
        if (epq)
                DBG(1, "%s: PTD $%04x is on %s queue\n", __func__, offset, epq->name);
        else
-               pr_warning("%s: invalid PTD $%04x\n", __func__, offset);
+               pr_warn("%s: invalid PTD $%04x\n", __func__, offset);
 
        return epq;
 }
@@ -157,8 +157,9 @@ static inline int get_ptd_offset(struct isp1362_ep_queue *epq, u8 index)
        int offset;
 
        if (index * epq->blk_size > epq->buf_size) {
-               pr_warning("%s: Bad %s index %d(%d)\n", __func__, epq->name, index,
-                    epq->buf_size / epq->blk_size);
+               pr_warn("%s: Bad %s index %d(%d)\n",
+                       __func__, epq->name, index,
+                       epq->buf_size / epq->blk_size);
                return -EINVAL;
        }
        offset = epq->buf_start + index * epq->blk_size;
@@ -902,8 +903,8 @@ static void start_iso_transfers(struct isp1362_hcd *isp1362_hcd)
 
                        ptd_offset = next_ptd(epq, ep);
                        if (ptd_offset < 0) {
-                               pr_warning("%s: req %d No more %s PTD buffers available\n", __func__,
-                                    ep->num_req, epq->name);
+                               pr_warn("%s: req %d No more %s PTD buffers available\n",
+                                       __func__, ep->num_req, epq->name);
                                break;
                        }
                }
@@ -973,8 +974,8 @@ static void finish_transfers(struct isp1362_hcd *isp1362_hcd, unsigned long done
                        break;
        }
        if (done_map)
-               pr_warning("%s: done_map not clear: %08lx:%08lx\n", __func__, done_map,
-                    epq->skip_map);
+               pr_warn("%s: done_map not clear: %08lx:%08lx\n",
+                       __func__, done_map, epq->skip_map);
        atomic_dec(&epq->finishing);
 }
 
@@ -1433,7 +1434,7 @@ static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
                } else
                        DBG(1, "%s: urb %p active; wait4irq\n", __func__, urb);
        } else {
-               pr_warning("%s: No EP in URB %p\n", __func__, urb);
+               pr_warn("%s: No EP in URB %p\n", __func__, urb);
                retval = -EINVAL;
        }
 done:
@@ -1748,10 +1749,10 @@ static int isp1362_bus_suspend(struct usb_hcd *hcd)
                /* FALL THROUGH */
        case OHCI_USB_RESET:
                status = -EBUSY;
-               pr_warning("%s: needs reinit!\n", __func__);
+               pr_warn("%s: needs reinit!\n", __func__);
                goto done;
        case OHCI_USB_SUSPEND:
-               pr_warning("%s: already suspended?\n", __func__);
+               pr_warn("%s: already suspended?\n", __func__);
                goto done;
        }
        DBG(0, "%s: suspend root hub\n", __func__);
@@ -1839,7 +1840,7 @@ static int isp1362_bus_resume(struct usb_hcd *hcd)
        isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL);
        pr_info("%s: HCCONTROL: %08x\n", __func__, isp1362_hcd->hc_control);
        if (hcd->state == HC_STATE_RESUMING) {
-               pr_warning("%s: duplicate resume\n", __func__);
+               pr_warn("%s: duplicate resume\n", __func__);
                status = 0;
        } else
                switch (isp1362_hcd->hc_control & OHCI_CTRL_HCFS) {
@@ -2474,8 +2475,8 @@ static int isp1362_chip_test(struct isp1362_hcd *isp1362_hcd)
                                            __func__, offset);
                                        break;
                                }
-                               pr_warning("%s: memory check with offset %02x ok after second read\n",
-                                    __func__, offset);
+                               pr_warn("%s: memory check with offset %02x ok after second read\n",
+                                       __func__, offset);
                        }
                }
                kfree(ref);

diff --git a/drivers/usb/isp1760/isp1760-if.c b/drivers/usb/isp1760/isp1760-if.c
index 9535b2872183468dcd4b063c3dec930e92a5551f..79205b31e4a9d5caf01d5c2e06f0349805cb9846 100644 (file)
--- a/drivers/usb/isp1760/isp1760-if.c
+++ b/drivers/usb/isp1760/isp1760-if.c
@@ -197,7 +197,7 @@ static int isp1760_plat_probe(struct platform_device *pdev)
 
        irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (!irq_res) {
-               pr_warning("isp1760: IRQ resource not available\n");
+               pr_warn("isp1760: IRQ resource not available\n");
                return -ENODEV;
        }
        irqflags = irq_res->flags & IRQF_TRIGGER_MASK;