Merge 3.18-rc7 into usb-next

[android-x86/kernel.git] / drivers / usb / dwc3 / ep0.c

diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index df38e7e..1bc77a3 100644 (file)
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -86,6 +86,8 @@ static int dwc3_ep0_start_trans(struct dwc3 *dwc, u8 epnum, dma_addr_t buf_dma,
        params.param0 = upper_32_bits(dwc->ep0_trb_addr);
        params.param1 = lower_32_bits(dwc->ep0_trb_addr);
 
+       trace_dwc3_prepare_trb(dep, trb);
+
        ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
                        DWC3_DEPCMD_STARTTRANSFER, &params);
        if (ret < 0) {
@@ -441,7 +443,6 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc,
 
                case USB_DEVICE_LTM_ENABLE:
                        return -EINVAL;
-                       break;
 
                case USB_DEVICE_TEST_MODE:
                        if ((wIndex & 0xff) != 0)
@@ -550,7 +551,6 @@ static int dwc3_ep0_set_config(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
        switch (state) {
        case USB_STATE_DEFAULT:
                return -EINVAL;
-               break;
 
        case USB_STATE_ADDRESS:
                ret = dwc3_ep0_delegate_req(dwc, ctrl);
@@ -700,35 +700,35 @@ static int dwc3_ep0_std_request(struct dwc3 *dwc, struct usb_ctrlrequest *ctrl)
 
        switch (ctrl->bRequest) {
        case USB_REQ_GET_STATUS:
-               dwc3_trace(trace_dwc3_ep0, "USB_REQ_GET_STATUS\n");
+               dwc3_trace(trace_dwc3_ep0, "USB_REQ_GET_STATUS");
                ret = dwc3_ep0_handle_status(dwc, ctrl);
                break;
        case USB_REQ_CLEAR_FEATURE:
-               dwc3_trace(trace_dwc3_ep0, "USB_REQ_CLEAR_FEATURE\n");
+               dwc3_trace(trace_dwc3_ep0, "USB_REQ_CLEAR_FEATURE");
                ret = dwc3_ep0_handle_feature(dwc, ctrl, 0);
                break;
        case USB_REQ_SET_FEATURE:
-               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_FEATURE\n");
+               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_FEATURE");
                ret = dwc3_ep0_handle_feature(dwc, ctrl, 1);
                break;
        case USB_REQ_SET_ADDRESS:
-               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ADDRESS\n");
+               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ADDRESS");
                ret = dwc3_ep0_set_address(dwc, ctrl);
                break;
        case USB_REQ_SET_CONFIGURATION:
-               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_CONFIGURATION\n");
+               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_CONFIGURATION");
                ret = dwc3_ep0_set_config(dwc, ctrl);
                break;
        case USB_REQ_SET_SEL:
-               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_SEL\n");
+               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_SEL");
                ret = dwc3_ep0_set_sel(dwc, ctrl);
                break;
        case USB_REQ_SET_ISOCH_DELAY:
-               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ISOCH_DELAY\n");
+               dwc3_trace(trace_dwc3_ep0, "USB_REQ_SET_ISOCH_DELAY");
                ret = dwc3_ep0_set_isoch_delay(dwc, ctrl);
                break;
        default:
-               dwc3_trace(trace_dwc3_ep0, "Forwarding to gadget driver\n");
+               dwc3_trace(trace_dwc3_ep0, "Forwarding to gadget driver");
                ret = dwc3_ep0_delegate_req(dwc, ctrl);
                break;
        }
@@ -791,6 +791,8 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc,
 
        trb = dwc->ep0_trb;
 
+       trace_dwc3_complete_trb(ep0, trb);
+
        r = next_request(&ep0->request_list);
        if (!r)
                return;
@@ -855,6 +857,8 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
        dep = dwc->eps[0];
        trb = dwc->ep0_trb;
 
+       trace_dwc3_complete_trb(dep, trb);
+
        if (!list_empty(&dep->request_list)) {
                r = next_request(&dep->request_list);
 
@@ -875,7 +879,7 @@ static void dwc3_ep0_complete_status(struct dwc3 *dwc,
 
        status = DWC3_TRB_SIZE_TRBSTS(trb->size);
        if (status == DWC3_TRBSTS_SETUP_PENDING)
-               dwc3_trace(trace_dwc3_ep0, "Setup Pending received\n");
+               dwc3_trace(trace_dwc3_ep0, "Setup Pending received");
 
        dwc->ep0state = EP0_SETUP_PHASE;
        dwc3_ep0_out_start(dwc);