Skip to content

Commit

Permalink
usb: dwc3: gadget: Rename misleading function names
Browse files Browse the repository at this point in the history
The functions dwc3_prepare_one_trb_sg and dwc3_prepare_one_trb_linear
are not necessarily preparing "one" TRB, it can prepare multiple TRBs.
Rename these functions as follow:

dwc3_prepare_one_trb_sg -> dwc3_prepare_trbs_sg
dwc3_prepare_one_trb_linear -> dwc3_prepare_trbs_linear

Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
  • Loading branch information
Thinh Nguyen authored and Felipe Balbi committed Oct 2, 2020
1 parent cb1b399 commit 7f2958d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/usb/dwc3/gadget.c
Original file line number Diff line number Diff line change
Expand Up @@ -1135,7 +1135,7 @@ static int dwc3_prepare_last_sg(struct dwc3_ep *dep,
return num_trbs;
}

static int dwc3_prepare_one_trb_sg(struct dwc3_ep *dep,
static int dwc3_prepare_trbs_sg(struct dwc3_ep *dep,
struct dwc3_request *req)
{
struct scatterlist *sg = req->start_sg;
Expand Down Expand Up @@ -1231,7 +1231,7 @@ static int dwc3_prepare_one_trb_sg(struct dwc3_ep *dep,
return req->num_trbs - num_trbs;
}

static int dwc3_prepare_one_trb_linear(struct dwc3_ep *dep,
static int dwc3_prepare_trbs_linear(struct dwc3_ep *dep,
struct dwc3_request *req)
{
return dwc3_prepare_last_sg(dep, req, req->request.length, 0);
Expand Down Expand Up @@ -1266,7 +1266,7 @@ static int dwc3_prepare_trbs(struct dwc3_ep *dep)
*/
list_for_each_entry(req, &dep->started_list, list) {
if (req->num_pending_sgs > 0) {
ret = dwc3_prepare_one_trb_sg(dep, req);
ret = dwc3_prepare_trbs_sg(dep, req);
if (!ret)
return ret;
}
Expand Down Expand Up @@ -1297,9 +1297,9 @@ static int dwc3_prepare_trbs(struct dwc3_ep *dep)
req->num_pending_sgs = req->request.num_mapped_sgs;

if (req->num_pending_sgs > 0)
ret = dwc3_prepare_one_trb_sg(dep, req);
ret = dwc3_prepare_trbs_sg(dep, req);
else
ret = dwc3_prepare_one_trb_linear(dep, req);
ret = dwc3_prepare_trbs_linear(dep, req);

if (!ret || !dwc3_calc_trbs_left(dep))
return ret;
Expand Down

0 comments on commit 7f2958d

Please sign in to comment.