Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit dcb89b5aa0a90f791a594e0177cb144fdccec784

Authored by Stephen Warren
Committed by Marek Vasut
1 parent 369d3c439a
Exists in v2017.01-smarct4x and in 40 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

usb: ci_udc: use var name ep/ci_ep consistently 

Almost all of ci_udc.c uses variable name "ep" for a struct usb_ep and
"ci_ep" for a struct ci_ep. This is nice and consistent, and helps people
know what type a variable is without searching for the declaration.
handle_ep_complete() doesn't do this, so fix it to be consistent.

Signed-off-by: Stephen Warren <swarren@nvidia.com>

Showing 1 changed file with 9 additions and 9 deletions Side-by-side Diff

drivers/usb/gadget/ci_udc.c
Diff comments   View file @ dcb89b5
... ... @@ -495,14 +495,14 @@
495 495 }
496 496 }
497 497  
498   -static void handle_ep_complete(struct ci_ep *ep)
  498 +static void handle_ep_complete(struct ci_ep *ci_ep)
499 499 {
500 500 struct ept_queue_item *item;
501 501 int num, in, len;
502 502 struct ci_req *ci_req;
503 503  
504   - num = ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
505   - in = (ep->desc->bEndpointAddress & USB_DIR_IN) != 0;
  504 + num = ci_ep->desc->bEndpointAddress & USB_ENDPOINT_NUMBER_MASK;
  505 + in = (ci_ep->desc->bEndpointAddress & USB_DIR_IN) != 0;
506 506 item = ci_get_qtd(num, in);
507 507 ci_invalidate_qtd(num);
508 508  
509 509  
510 510  
... ... @@ -511,12 +511,12 @@
511 511 printf("EP%d/%s FAIL info=%x pg0=%x\n",
512 512 num, in ? "in" : "out", item->info, item->page0);
513 513  
514   - ci_req = list_first_entry(&ep->queue, struct ci_req, queue);
  514 + ci_req = list_first_entry(&ci_ep->queue, struct ci_req, queue);
515 515 list_del_init(&ci_req->queue);
516   - ep->req_primed = false;
  516 + ci_ep->req_primed = false;
517 517  
518   - if (!list_empty(&ep->queue))
519   - ci_ep_submit_next_request(ep);
  518 + if (!list_empty(&ci_ep->queue))
  519 + ci_ep_submit_next_request(ci_ep);
520 520  
521 521 ci_req->req.actual = ci_req->req.length - len;
522 522 ci_debounce(ci_req, in);
... ... @@ -524,7 +524,7 @@
524 524 DBG("ept%d %s req %p, complete %x\n",
525 525 num, in ? "in" : "out", ci_req, len);
526 526 if (num != 0 || controller.ep0_data_phase)
527   - ci_req->req.complete(&ep->ep, &ci_req->req);
  527 + ci_req->req.complete(&ci_ep->ep, &ci_req->req);
528 528 if (num == 0 && controller.ep0_data_phase) {
529 529 /*
530 530 * Data Stage is complete, so flip ep0 dir for Status Stage,
... ... @@ -534,7 +534,7 @@
534 534 flip_ep0_direction();
535 535 controller.ep0_data_phase = false;
536 536 ci_req->req.length = 0;
537   - usb_ep_queue(&ep->ep, &ci_req->req, 0);
  537 + usb_ep_queue(&ci_ep->ep, &ci_req->req, 0);
538 538 }
539 539 }
540 540