diff options
| author | Douglas Anderson <dianders@chromium.org> | 2016-01-28 21:20:04 -0500 |
|---|---|---|
| committer | Felipe Balbi <balbi@kernel.org> | 2016-03-04 08:14:43 -0500 |
| commit | ced9eee1229db3bbe683ae17e0a91a8642382a39 (patch) | |
| tree | 5ab28900b5acadce93c596aabf94966e4e134f10 /drivers/usb/dwc2/hcd_intr.c | |
| parent | 4e50e0110c5cdc6d361b813692857e09ec918c9d (diff) | |
usb: dwc2: host: Rename some fields in struct dwc2_qh
This no-op change just does some renames to simplify a future patch.
1. The "interval" field is renamed to "host_interval" to make it more
obvious that this interval may be 8 times the interval that the
device sees (if we're doing split transactions). A future patch will
also add the "device_interval" field.
2. The "usecs" field is renamed to "host_us" again to make it more
obvious that this is the time for the transaction as seen by the
host. For split transactions the device may see a much longer
transaction time. A future patch will also add "device_us".
3. The "sched_frame" field is renamed to "next_active_frame". The name
"sched_frame" kept confusing me because it felt like something more
permament (the QH's reservation or something). The name
"next_active_frame" makes it more obvious that this field is
constantly changing.
Acked-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Tested-by: Heiko Stuebner <heiko@sntech.de>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Diffstat (limited to 'drivers/usb/dwc2/hcd_intr.c')
| -rw-r--r-- | drivers/usb/dwc2/hcd_intr.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/dwc2/hcd_intr.c b/drivers/usb/dwc2/hcd_intr.c index 3d686540d250..97aa6ca3a12e 100644 --- a/drivers/usb/dwc2/hcd_intr.c +++ b/drivers/usb/dwc2/hcd_intr.c | |||
| @@ -148,9 +148,11 @@ static void dwc2_sof_intr(struct dwc2_hsotg *hsotg) | |||
| 148 | while (qh_entry != &hsotg->periodic_sched_inactive) { | 148 | while (qh_entry != &hsotg->periodic_sched_inactive) { |
| 149 | qh = list_entry(qh_entry, struct dwc2_qh, qh_list_entry); | 149 | qh = list_entry(qh_entry, struct dwc2_qh, qh_list_entry); |
| 150 | qh_entry = qh_entry->next; | 150 | qh_entry = qh_entry->next; |
| 151 | if (dwc2_frame_num_le(qh->sched_frame, hsotg->frame_number)) { | 151 | if (dwc2_frame_num_le(qh->next_active_frame, |
| 152 | dwc2_sch_vdbg(hsotg, "QH=%p ready fn=%04x, sch=%04x\n", | 152 | hsotg->frame_number)) { |
| 153 | qh, hsotg->frame_number, qh->sched_frame); | 153 | dwc2_sch_vdbg(hsotg, "QH=%p ready fn=%04x, nxt=%04x\n", |
| 154 | qh, hsotg->frame_number, | ||
| 155 | qh->next_active_frame); | ||
| 154 | 156 | ||
| 155 | /* | 157 | /* |
| 156 | * Move QH to the ready list to be executed next | 158 | * Move QH to the ready list to be executed next |
| @@ -1368,7 +1370,7 @@ static void dwc2_hc_nyet_intr(struct dwc2_hsotg *hsotg, | |||
| 1368 | int frnum = dwc2_hcd_get_frame_number(hsotg); | 1370 | int frnum = dwc2_hcd_get_frame_number(hsotg); |
| 1369 | 1371 | ||
| 1370 | if (dwc2_full_frame_num(frnum) != | 1372 | if (dwc2_full_frame_num(frnum) != |
| 1371 | dwc2_full_frame_num(chan->qh->sched_frame)) { | 1373 | dwc2_full_frame_num(chan->qh->next_active_frame)) { |
| 1372 | /* | 1374 | /* |
| 1373 | * No longer in the same full speed frame. | 1375 | * No longer in the same full speed frame. |
| 1374 | * Treat this as a transaction error. | 1376 | * Treat this as a transaction error. |