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>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
88aecde40b
commit
a4e6a8524f
@@ -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);
|
||||
|
@@ -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 */
|
||||
|
@@ -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)
|
||||
|
||||
|
@@ -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;
|
||||
}
|
||||
|
@@ -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)
|
||||
|
||||
/*-------------------------------------------------------------------------*/
|
||||
|
@@ -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;
|
||||
}
|
||||
|
||||
|
@@ -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)
|
||||
|
||||
|
@@ -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)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user