[rfc/rft/patch 14/19] usb: musb: clean-up in debug messages

[Felipe Balbi <felipe.balbi@xxxxxxxxx>]

From: Arnaud Mandy <ext-arnaud.2.mandy@xxxxxxxxx>

using directly musb_ep name member instead of end_point name member.

Signed-off-by: Arnaud Mandy <ext-arnaud.2.mandy@xxxxxxxxx>
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
 drivers/usb/musb/musb_gadget.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 83d4ffc..e70dcf1 100644
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -119,11 +119,11 @@ __acquires(ep->musb->lock)
 	spin_unlock(&musb->lock);
 	if (request->status == 0)
 		DBG(5, "%s done request %p,  %d/%d\n",
-				ep->end_point.name, request,
+				ep->name, request,
 				req->request.actual, req->request.length);
 	else
 		DBG(2, "%s request %p, %d/%d fault %d\n",
-				ep->end_point.name, request,
+				ep->name, request,
 				req->request.actual, req->request.length,
 				request->status);
 	req->request.complete(&req->ep->end_point, &req->request);
@@ -405,13 +405,13 @@ static void do_pio_tx(struct musb *musb, struct musb_request *req)
 
 	if (csr & MUSB_TXCSR_TXPKTRDY) {
 		DBG(5, "%s old packet still ready , txcsr %03x\n",
-				musb_ep->end_point.name, csr);
+				musb_ep->name, csr);
 		return;
 	}
 
 	if (csr & MUSB_TXCSR_P_SENDSTALL) {
 		DBG(5, "%s stalling, txcsr %03x\n",
-				musb_ep->end_point.name, csr);
+				musb_ep->name, csr);
 		return;
 	}
 
@@ -427,8 +427,8 @@ static void do_pio_tx(struct musb *musb, struct musb_request *req)
 	musb_writew(epio, MUSB_TXCSR, csr);
 
 	/* host may already have the data when this message shows... */
-	DBG(3, "%s TX/IN %s len %d/%d, txcsr %04x, fifo %d/%d\n",
-			musb_ep->end_point.name, "pio",
+	DBG(3, "%s TX/IN pio len %d/%d, txcsr %04x, fifo %d/%d\n",
+			musb_ep->name,
 			request->actual, request->length,
 			musb_readw(epio, MUSB_TXCSR),
 			fifo_count,
@@ -451,7 +451,7 @@ void musb_g_tx(struct musb *musb, u8 epnum)
 	request = next_request(musb_ep);
 
 	csr = musb_readw(epio, MUSB_TXCSR);
-	DBG(4, "<== %s, txcsr %04x\n", musb_ep->end_point.name, csr);
+	DBG(4, "<== %s, txcsr %04x\n", musb_ep->name, csr);
 
 	do {
 		/* REVISIT for high bandwidth, MUSB_TXCSR_P_INCOMPTX
@@ -521,7 +521,7 @@ void musb_g_tx(struct musb *musb, u8 epnum)
 						: NULL;
 				if (!request) {
 					DBG(4, "%s idle now\n",
-						musb_ep->end_point.name);
+						musb_ep->name);
 					break;
 				}
 			}
@@ -555,7 +555,7 @@ static void do_pio_rx(struct musb *musb, struct musb_request *req)
 
 			fifo_count = request->length - request->actual;
 			DBG(3, "%s OUT/RX pio fifo %d/%d, maxpacket %d\n",
-					musb_ep->end_point.name,
+					musb_ep->name,
 					len, fifo_count,
 					musb_ep->packet_sz);
 
@@ -646,7 +646,7 @@ restart:
 	}
 	if (csr & MUSB_RXCSR_INCOMPRX) {
 		/* REVISIT not necessarily an error */
-		DBG(4, "%s, incomprx\n", musb_ep->end_point.name);
+		DBG(4, "%s, incomprx\n", musb_ep->name);
 	}
 
 	req = to_musb_request(request);
@@ -821,7 +821,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
 	status = 0;
 
 	pr_debug("%s periph: enabled %s for %s %s, maxpacket %d\n",
-			musb_driver_name, musb_ep->end_point.name,
+			musb_driver_name, musb_ep->name,
 			({ char *s; switch (musb_ep->type) {
 			case USB_ENDPOINT_XFER_BULK:	s = "bulk"; break;
 			case USB_ENDPOINT_XFER_INT:	s = "int"; break;
@@ -879,7 +879,7 @@ static int musb_gadget_disable(struct usb_ep *ep)
 
 	spin_unlock_irqrestore(&(musb->lock), flags);
 
-	DBG(2, "%s\n", musb_ep->end_point.name);
+	DBG(2, "%s\n", musb_ep->name);
 
 	return status;
 }
-- 
1.6.4.2.253.g0b1fac

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html