usb: musb: add helper function musb_ep_xfertype_string

Add helper function musb_ep_xfertype_string() to return the ep transfer
type string.

Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 9f22c5b8ce37dacd4e6012cc240f8711f65e576e..c748f4ac1154428428eee6853cd37c816a2ea910 100644 (file)
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -465,6 +465,30 @@ static inline struct musb *gadget_to_musb(struct usb_gadget *g)
        return container_of(g, struct musb, g);
 }
 
+static inline char *musb_ep_xfertype_string(u8 type)
+{
+       char *s;
+
+       switch (type) {
+       case USB_ENDPOINT_XFER_CONTROL:
+               s = "ctrl";
+               break;
+       case USB_ENDPOINT_XFER_ISOC:
+               s = "iso";
+               break;
+       case USB_ENDPOINT_XFER_BULK:
+               s = "bulk";
+               break;
+       case USB_ENDPOINT_XFER_INT:
+               s = "int";
+               break;
+       default:
+               s = "";
+               break;
+       }
+       return s;
+}
+
 #ifdef CONFIG_BLACKFIN
 static inline int musb_read_fifosize(struct musb *musb,
                struct musb_hw_ep *hw_ep, u8 epnum)

diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
index 1acc4864f9f6f0bf52cb5a084475fdab13bbab07..bc6d1717c9ec4d48bbfa61c35cabe740a0612365 100644 (file)
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
@@ -1105,11 +1105,7 @@ static int musb_gadget_enable(struct usb_ep *ep,
 
        pr_debug("%s periph: enabled %s for %s %s, %smaxpacket %d\n",
                        musb_driver_name, musb_ep->end_point.name,
-                       ({ char *s; switch (musb_ep->type) {
-                       case USB_ENDPOINT_XFER_BULK:    s = "bulk"; break;
-                       case USB_ENDPOINT_XFER_INT:     s = "int"; break;
-                       default:                        s = "iso"; break;
-                       } s; }),
+                       musb_ep_xfertype_string(musb_ep->type),
                        musb_ep->is_in ? "IN" : "OUT",
                        musb_ep->dma ? "dma, " : "",
                        musb_ep->packet_sz);