|
@@ -548,7 +548,7 @@ static int __dwc3_gadget_ep_enable(struct dwc3_ep *dep,
|
|
|
|
|
|
memset(&trb_link, 0, sizeof(trb_link));
|
|
|
|
|
|
- /* Link TRB for ISOC. The HWO but is never reset */
|
|
|
+ /* Link TRB for ISOC. The HWO bit is never reset */
|
|
|
trb_st_hw = &dep->trb_pool[0];
|
|
|
|
|
|
trb_link = &dep->trb_pool[DWC3_TRB_NUM - 1];
|
|
@@ -818,9 +818,9 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
|
|
|
* @dep: endpoint for which requests are being prepared
|
|
|
* @starting: true if the endpoint is idle and no requests are queued.
|
|
|
*
|
|
|
- * The functions goes through the requests list and setups TRBs for the
|
|
|
- * transfers. The functions returns once there are not more TRBs available or
|
|
|
- * it run out of requests.
|
|
|
+ * The function goes through the requests list and sets up TRBs for the
|
|
|
+ * transfers. The function returns once there are no more TRBs available or
|
|
|
+ * it runs out of requests.
|
|
|
*/
|
|
|
static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
|
|
|
{
|
|
@@ -834,8 +834,8 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
|
|
|
trbs_left = (dep->busy_slot - dep->free_slot) & DWC3_TRB_MASK;
|
|
|
|
|
|
/*
|
|
|
- * if busy & slot are equal than it is either full or empty. If we are
|
|
|
- * starting to proceed requests then we are empty. Otherwise we ar
|
|
|
+ * If busy & slot are equal than it is either full or empty. If we are
|
|
|
+ * starting to process requests then we are empty. Otherwise we are
|
|
|
* full and don't do anything
|
|
|
*/
|
|
|
if (!trbs_left) {
|
|
@@ -846,7 +846,7 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
|
|
|
* In case we start from scratch, we queue the ISOC requests
|
|
|
* starting from slot 1. This is done because we use ring
|
|
|
* buffer and have no LST bit to stop us. Instead, we place
|
|
|
- * IOC bit TRB_NUM/4. We try to avoid to having an interrupt
|
|
|
+ * IOC bit every TRB_NUM/4. We try to avoid having an interrupt
|
|
|
* after the first request so we start at slot 1 and have
|
|
|
* 7 requests proceed before we hit the first IOC.
|
|
|
* Other transfer types don't use the ring buffer and are
|
|
@@ -882,8 +882,8 @@ static void dwc3_prepare_trbs(struct dwc3_ep *dep, bool starting)
|
|
|
length = sg_dma_len(s);
|
|
|
dma = sg_dma_address(s);
|
|
|
|
|
|
- if (i == (request->num_mapped_sgs - 1)
|
|
|
- || sg_is_last(s)) {
|
|
|
+ if (i == (request->num_mapped_sgs - 1) ||
|
|
|
+ sg_is_last(s)) {
|
|
|
last_one = true;
|
|
|
chain = false;
|
|
|
}
|
|
@@ -951,8 +951,7 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,
|
|
|
dwc3_prepare_trbs(dep, start_new);
|
|
|
|
|
|
/*
|
|
|
- * req points to the first request where HWO changed
|
|
|
- * from 0 to 1
|
|
|
+ * req points to the first request where HWO changed from 0 to 1
|
|
|
*/
|
|
|
req = next_request(&dep->req_queued);
|
|
|
}
|
|
@@ -978,7 +977,7 @@ static int __dwc3_gadget_kick_transfer(struct dwc3_ep *dep, u16 cmd_param,
|
|
|
/*
|
|
|
* FIXME we need to iterate over the list of requests
|
|
|
* here and stop, unmap, free and del each of the linked
|
|
|
- * requests instead of we do now.
|
|
|
+ * requests instead of what we do now.
|
|
|
*/
|
|
|
dwc3_unmap_buffer_from_dma(req);
|
|
|
list_del(&req->list);
|
|
@@ -1011,7 +1010,7 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
|
|
|
* particular token from the Host side.
|
|
|
*
|
|
|
* This will also avoid Host cancelling URBs due to too
|
|
|
- * many NACKs.
|
|
|
+ * many NAKs.
|
|
|
*/
|
|
|
dwc3_map_buffer_to_dma(req);
|
|
|
list_add_tail(&req->list, &dep->request_list);
|
|
@@ -1034,10 +1033,10 @@ static int __dwc3_gadget_ep_queue(struct dwc3_ep *dep, struct dwc3_request *req)
|
|
|
|
|
|
start_trans = 1;
|
|
|
if (usb_endpoint_xfer_isoc(dep->desc) &&
|
|
|
- dep->flags & DWC3_EP_BUSY)
|
|
|
+ (dep->flags & DWC3_EP_BUSY))
|
|
|
start_trans = 0;
|
|
|
|
|
|
- ret = __dwc3_gadget_kick_transfer(dep, 0, start_trans);
|
|
|
+ ret = __dwc3_gadget_kick_transfer(dep, 0, start_trans);
|
|
|
if (ret && ret != -EBUSY) {
|
|
|
struct dwc3 *dwc = dep->dwc;
|
|
|
|
|
@@ -1291,10 +1290,10 @@ static int dwc3_gadget_wakeup(struct usb_gadget *g)
|
|
|
reg &= ~DWC3_DCTL_ULSTCHNGREQ_MASK;
|
|
|
dwc3_writel(dwc->regs, DWC3_DCTL, reg);
|
|
|
|
|
|
- /* pool until Link State change to ON */
|
|
|
+ /* poll until Link State changes to ON */
|
|
|
timeout = jiffies + msecs_to_jiffies(100);
|
|
|
|
|
|
- while (!(time_after(jiffies, timeout))) {
|
|
|
+ while (!time_after(jiffies, timeout)) {
|
|
|
reg = dwc3_readl(dwc->regs, DWC3_DSTS);
|
|
|
|
|
|
/* in HS, means ON */
|
|
@@ -1558,10 +1557,10 @@ static int dwc3_cleanup_done_reqs(struct dwc3 *dwc, struct dwc3_ep *dep,
|
|
|
if ((trb->ctrl & DWC3_TRB_CTRL_HWO) && status != -ESHUTDOWN)
|
|
|
/*
|
|
|
* We continue despite the error. There is not much we
|
|
|
- * can do. If we don't clean in up we loop for ever. If
|
|
|
- * we skip the TRB than it gets overwritten reused after
|
|
|
- * a while since we use them in a ring buffer. a BUG()
|
|
|
- * would help. Lets hope that if this occures, someone
|
|
|
+ * can do. If we don't clean it up we loop forever. If
|
|
|
+ * we skip the TRB then it gets overwritten after a
|
|
|
+ * while since we use them in a ring buffer. A BUG()
|
|
|
+ * would help. Lets hope that if this occurs, someone
|
|
|
* fixes the root cause instead of looking away :)
|
|
|
*/
|
|
|
dev_err(dwc->dev, "%s's TRB (%p) still owned by HW\n",
|
|
@@ -1614,7 +1613,7 @@ static void dwc3_endpoint_transfer_complete(struct dwc3 *dwc,
|
|
|
if (event->status & DEPEVT_STATUS_BUSERR)
|
|
|
status = -ECONNRESET;
|
|
|
|
|
|
- clean_busy = dwc3_cleanup_done_reqs(dwc, dep, event, status);
|
|
|
+ clean_busy = dwc3_cleanup_done_reqs(dwc, dep, event, status);
|
|
|
if (clean_busy) {
|
|
|
dep->flags &= ~DWC3_EP_BUSY;
|
|
|
dep->res_trans_idx = 0;
|
|
@@ -1678,8 +1677,8 @@ static void dwc3_process_ep_cmd_complete(struct dwc3_ep *dep,
|
|
|
struct dwc3_event_depevt mod_ev = *event;
|
|
|
|
|
|
/*
|
|
|
- * We were asked to remove one requests. It is possible that this
|
|
|
- * request and a few other were started together and have the same
|
|
|
+ * We were asked to remove one request. It is possible that this
|
|
|
+ * request and a few others were started together and have the same
|
|
|
* transfer index. Since we stopped the complete endpoint we don't
|
|
|
* know how many requests were already completed (and not yet)
|
|
|
* reported and how could be done (later). We purge them all until
|
|
@@ -1688,7 +1687,7 @@ static void dwc3_process_ep_cmd_complete(struct dwc3_ep *dep,
|
|
|
mod_ev.status = DEPEVT_STATUS_LST;
|
|
|
dwc3_cleanup_done_reqs(dwc, dep, &mod_ev, -ESHUTDOWN);
|
|
|
dep->flags &= ~DWC3_EP_BUSY;
|
|
|
- /* pending requets are ignored and are queued on XferNotReady */
|
|
|
+ /* pending requests are ignored and are queued on XferNotReady */
|
|
|
}
|
|
|
|
|
|
static void dwc3_ep_cmd_compl(struct dwc3_ep *dep,
|
|
@@ -2285,7 +2284,7 @@ static irqreturn_t dwc3_interrupt(int irq, void *_dwc)
|
|
|
|
|
|
/**
|
|
|
* dwc3_gadget_init - Initializes gadget related registers
|
|
|
- * @dwc: Pointer to out controller context structure
|
|
|
+ * @dwc: pointer to our controller context structure
|
|
|
*
|
|
|
* Returns 0 on success otherwise negative errno.
|
|
|
*/
|