Commit a4e6a852 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

usb: Convert pr_warning to pr_warn

Use the more common logging mechanism.

Miscellanea:

o Realign multiline statements
o Coalesce format
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 88aecde4
...@@ -474,8 +474,7 @@ static int gen_ndis_query_resp(struct rndis_params *params, u32 OID, u8 *buf, ...@@ -474,8 +474,7 @@ static int gen_ndis_query_resp(struct rndis_params *params, u32 OID, u8 *buf,
break; break;
default: default:
pr_warning("%s: query unknown OID 0x%08X\n", pr_warn("%s: query unknown OID 0x%08X\n", __func__, OID);
__func__, OID);
} }
if (retval < 0) if (retval < 0)
length = 0; length = 0;
...@@ -546,7 +545,7 @@ static int gen_ndis_set_resp(struct rndis_params *params, u32 OID, ...@@ -546,7 +545,7 @@ static int gen_ndis_set_resp(struct rndis_params *params, u32 OID,
break; break;
default: default:
pr_warning("%s: set unknown OID 0x%08X, size %d\n", pr_warn("%s: set unknown OID 0x%08X, size %d\n",
__func__, OID, buf_len); __func__, OID, buf_len);
} }
...@@ -854,7 +853,7 @@ int rndis_msg_parser(struct rndis_params *params, u8 *buf) ...@@ -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 * In one case those messages seemed to relate to the host
* suspending itself. * 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); __func__, MsgType, MsgLength);
print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET, print_hex_dump_bytes(__func__, DUMP_PREFIX_OFFSET,
buf, MsgLength); buf, MsgLength);
......
...@@ -622,7 +622,7 @@ static void gs_write_complete(struct usb_ep *ep, struct usb_request *req) ...@@ -622,7 +622,7 @@ static void gs_write_complete(struct usb_ep *ep, struct usb_request *req)
switch (req->status) { switch (req->status) {
default: default:
/* presumably a transient fault */ /* presumably a transient fault */
pr_warning("%s: unexpected %s status %d\n", pr_warn("%s: unexpected %s status %d\n",
__func__, ep->name, req->status); __func__, ep->name, req->status);
/* FALL THROUGH */ /* FALL THROUGH */
case 0: case 0:
......
...@@ -175,7 +175,7 @@ struct at91_request { ...@@ -175,7 +175,7 @@ struct at91_request {
#endif #endif
#define ERR(stuff...) pr_err("udc: " stuff) #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 INFO(stuff...) pr_info("udc: " stuff)
#define DBG(stuff...) pr_debug("udc: " stuff) #define DBG(stuff...) pr_debug("udc: " stuff)
......
...@@ -1464,8 +1464,8 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep) ...@@ -1464,8 +1464,8 @@ static void usba_control_irq(struct usba_udc *udc, struct usba_ep *ep)
pkt_len = USBA_BFEXT(BYTE_COUNT, usba_ep_readl(ep, STA)); pkt_len = USBA_BFEXT(BYTE_COUNT, usba_ep_readl(ep, STA));
DBG(DBG_HW, "Packet length: %u\n", pkt_len); DBG(DBG_HW, "Packet length: %u\n", pkt_len);
if (pkt_len != sizeof(crq)) { if (pkt_len != sizeof(crq)) {
pr_warning("udc: Invalid packet length %u " pr_warn("udc: Invalid packet length %u (expected %zu)\n",
"(expected %zu)\n", pkt_len, sizeof(crq)); pkt_len, sizeof(crq));
set_protocol_stall(udc, ep); set_protocol_stall(udc, ep);
return; return;
} }
......
...@@ -554,7 +554,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length) ...@@ -554,7 +554,7 @@ static void dump_msg(const char *label, const u8 * buf, unsigned int length)
#endif #endif
#define ERR(stuff...) pr_err("udc: " stuff) #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 INFO(stuff...) pr_info("udc: " stuff)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
......
...@@ -637,7 +637,7 @@ static void init_controller(struct m66592 *m66592) ...@@ -637,7 +637,7 @@ static void init_controller(struct m66592 *m66592)
clock = M66592_XTAL48; clock = M66592_XTAL48;
break; break;
default: default:
pr_warning("m66592-udc: xtal configuration error\n"); pr_warn("m66592-udc: xtal configuration error\n");
clock = 0; clock = 0;
} }
...@@ -649,7 +649,7 @@ static void init_controller(struct m66592 *m66592) ...@@ -649,7 +649,7 @@ static void init_controller(struct m66592 *m66592)
irq_sense = 0; irq_sense = 0;
break; break;
default: default:
pr_warning("m66592-udc: irq trigger config error\n"); pr_warn("m66592-udc: irq trigger config error\n");
irq_sense = 0; irq_sense = 0;
} }
......
...@@ -187,7 +187,7 @@ struct omap_udc { ...@@ -187,7 +187,7 @@ struct omap_udc {
#endif #endif
#define ERR(stuff...) pr_err("udc: " stuff) #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 INFO(stuff...) pr_info("udc: " stuff)
#define DBG(stuff...) pr_debug("udc: " stuff) #define DBG(stuff...) pr_debug("udc: " stuff)
......
...@@ -248,7 +248,7 @@ dump_state(struct pxa25x_udc *dev) ...@@ -248,7 +248,7 @@ dump_state(struct pxa25x_udc *dev)
#define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0) #define DBG(lvl, stuff...) do{if ((lvl) <= UDC_DEBUG) DMSG(stuff);}while(0)
#define ERR(stuff...) pr_err("udc: " stuff) #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 INFO(stuff...) pr_info("udc: " stuff)
......
...@@ -147,7 +147,7 @@ static inline struct isp1362_ep_queue *get_ptd_queue(struct isp1362_hcd *isp1362 ...@@ -147,7 +147,7 @@ static inline struct isp1362_ep_queue *get_ptd_queue(struct isp1362_hcd *isp1362
if (epq) if (epq)
DBG(1, "%s: PTD $%04x is on %s queue\n", __func__, offset, epq->name); DBG(1, "%s: PTD $%04x is on %s queue\n", __func__, offset, epq->name);
else else
pr_warning("%s: invalid PTD $%04x\n", __func__, offset); pr_warn("%s: invalid PTD $%04x\n", __func__, offset);
return epq; return epq;
} }
...@@ -157,7 +157,8 @@ static inline int get_ptd_offset(struct isp1362_ep_queue *epq, u8 index) ...@@ -157,7 +157,8 @@ static inline int get_ptd_offset(struct isp1362_ep_queue *epq, u8 index)
int offset; int offset;
if (index * epq->blk_size > epq->buf_size) { if (index * epq->blk_size > epq->buf_size) {
pr_warning("%s: Bad %s index %d(%d)\n", __func__, epq->name, index, pr_warn("%s: Bad %s index %d(%d)\n",
__func__, epq->name, index,
epq->buf_size / epq->blk_size); epq->buf_size / epq->blk_size);
return -EINVAL; return -EINVAL;
} }
...@@ -902,8 +903,8 @@ static void start_iso_transfers(struct isp1362_hcd *isp1362_hcd) ...@@ -902,8 +903,8 @@ static void start_iso_transfers(struct isp1362_hcd *isp1362_hcd)
ptd_offset = next_ptd(epq, ep); ptd_offset = next_ptd(epq, ep);
if (ptd_offset < 0) { if (ptd_offset < 0) {
pr_warning("%s: req %d No more %s PTD buffers available\n", __func__, pr_warn("%s: req %d No more %s PTD buffers available\n",
ep->num_req, epq->name); __func__, ep->num_req, epq->name);
break; break;
} }
} }
...@@ -973,8 +974,8 @@ static void finish_transfers(struct isp1362_hcd *isp1362_hcd, unsigned long done ...@@ -973,8 +974,8 @@ static void finish_transfers(struct isp1362_hcd *isp1362_hcd, unsigned long done
break; break;
} }
if (done_map) if (done_map)
pr_warning("%s: done_map not clear: %08lx:%08lx\n", __func__, done_map, pr_warn("%s: done_map not clear: %08lx:%08lx\n",
epq->skip_map); __func__, done_map, epq->skip_map);
atomic_dec(&epq->finishing); atomic_dec(&epq->finishing);
} }
...@@ -1433,7 +1434,7 @@ static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) ...@@ -1433,7 +1434,7 @@ static int isp1362_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
} else } else
DBG(1, "%s: urb %p active; wait4irq\n", __func__, urb); DBG(1, "%s: urb %p active; wait4irq\n", __func__, urb);
} else { } 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; retval = -EINVAL;
} }
done: done:
...@@ -1748,10 +1749,10 @@ static int isp1362_bus_suspend(struct usb_hcd *hcd) ...@@ -1748,10 +1749,10 @@ static int isp1362_bus_suspend(struct usb_hcd *hcd)
/* FALL THROUGH */ /* FALL THROUGH */
case OHCI_USB_RESET: case OHCI_USB_RESET:
status = -EBUSY; status = -EBUSY;
pr_warning("%s: needs reinit!\n", __func__); pr_warn("%s: needs reinit!\n", __func__);
goto done; goto done;
case OHCI_USB_SUSPEND: case OHCI_USB_SUSPEND:
pr_warning("%s: already suspended?\n", __func__); pr_warn("%s: already suspended?\n", __func__);
goto done; goto done;
} }
DBG(0, "%s: suspend root hub\n", __func__); DBG(0, "%s: suspend root hub\n", __func__);
...@@ -1839,7 +1840,7 @@ static int isp1362_bus_resume(struct usb_hcd *hcd) ...@@ -1839,7 +1840,7 @@ static int isp1362_bus_resume(struct usb_hcd *hcd)
isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL); isp1362_hcd->hc_control = isp1362_read_reg32(isp1362_hcd, HCCONTROL);
pr_info("%s: HCCONTROL: %08x\n", __func__, isp1362_hcd->hc_control); pr_info("%s: HCCONTROL: %08x\n", __func__, isp1362_hcd->hc_control);
if (hcd->state == HC_STATE_RESUMING) { if (hcd->state == HC_STATE_RESUMING) {
pr_warning("%s: duplicate resume\n", __func__); pr_warn("%s: duplicate resume\n", __func__);
status = 0; status = 0;
} else } else
switch (isp1362_hcd->hc_control & OHCI_CTRL_HCFS) { switch (isp1362_hcd->hc_control & OHCI_CTRL_HCFS) {
...@@ -2474,7 +2475,7 @@ static int isp1362_chip_test(struct isp1362_hcd *isp1362_hcd) ...@@ -2474,7 +2475,7 @@ static int isp1362_chip_test(struct isp1362_hcd *isp1362_hcd)
__func__, offset); __func__, offset);
break; break;
} }
pr_warning("%s: memory check with offset %02x ok after second read\n", pr_warn("%s: memory check with offset %02x ok after second read\n",
__func__, offset); __func__, offset);
} }
} }
......
...@@ -197,7 +197,7 @@ static int isp1760_plat_probe(struct platform_device *pdev) ...@@ -197,7 +197,7 @@ static int isp1760_plat_probe(struct platform_device *pdev)
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!irq_res) { if (!irq_res) {
pr_warning("isp1760: IRQ resource not available\n"); pr_warn("isp1760: IRQ resource not available\n");
return -ENODEV; return -ENODEV;
} }
irqflags = irq_res->flags & IRQF_TRIGGER_MASK; irqflags = irq_res->flags & IRQF_TRIGGER_MASK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment