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 | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index cbfb25e..5abd5f8 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -120,11 +120,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); @@ -403,13 +403,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; } @@ -426,7 +426,7 @@ static void do_pio_tx(struct musb *musb, struct musb_request *req) /* 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", + musb_ep->name, "pio", request->actual, request->length, musb_readw(epio, MUSB_TXCSR), fifo_count, @@ -449,7 +449,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); /* @@ -514,7 +514,7 @@ void musb_g_tx(struct musb *musb, u8 epnum) if (!musb_ep->desc) { DBG(4, "%s idle now\n", - musb_ep->end_point.name); + musb_ep->name); return; } else request = next_request(musb_ep); @@ -557,7 +557,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.6.rc0 -- 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