In the gadget code, there are several DBG() macro invocations that explicitly print the calling function's name while DBG() macro itself does this anyway; most of these were added by commit f11d893de444965dfd3e55f726533ae1df5c6471 (usb: musb: support ISO high bandwidth for gadget mode). Remove the duplicated printing, somewhat clarifying the messages at the same time... Signed-off-by: Sergei Shtylyov <sshtylyov@xxxxxxxxxxxxx> --- This patch is against the recent 'usb-next' branch of Greg KH's usb-2.6.git. drivers/usb/musb/musb_gadget.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Index: usb-2.6/drivers/usb/musb/musb_gadget.c =================================================================== --- usb-2.6.orig/drivers/usb/musb/musb_gadget.c +++ usb-2.6/drivers/usb/musb/musb_gadget.c @@ -978,7 +978,7 @@ static int musb_gadget_enable(struct usb ok = musb->hb_iso_rx; if (!ok) { - DBG(4, "%s: not support ISO high bandwidth\n", __func__); + DBG(4, "no support for high bandwidth ISO\n"); goto fail; } musb_ep->hb_mult = (tmp >> 11) & 3; @@ -1002,7 +1002,7 @@ static int musb_gadget_enable(struct usb goto fail; if (tmp > hw_ep->max_packet_sz_tx) { - DBG(4, "%s: packet size beyond hw fifo size\n", __func__); + DBG(4, "packet size beyond hardware FIFO size\n"); goto fail; } @@ -1042,7 +1042,7 @@ static int musb_gadget_enable(struct usb goto fail; if (tmp > hw_ep->max_packet_sz_rx) { - DBG(4, "%s: packet size beyond hw fifo size\n", __func__); + DBG(4, "packet size beyond hardware FIFO size\n"); goto fail; } @@ -1815,7 +1815,7 @@ int usb_gadget_probe_driver(struct usb_g /* driver must be initialized to support peripheral mode */ if (!musb) { - DBG(1, "%s, no dev??\n", __func__); + DBG(1, "no dev??\n"); retval = -ENODEV; goto err0; } -- 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