openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: host: ehci-sched: refactor scan_isoc function 

This patch removes an infinite 'for' loop and makes use of the already
existing 'restart' tag instead, reducing one leading tab.

The comments and code were corrected conforming file coding style.

Tested by compilation only.
Caught by checkpatch:
 WARNING: Too many leading tabs - consider code refactoring

Signed-off-by: Geyslan G. Bem <geyslan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Geyslan G. Bem 2016-01-25 22:45:10 -03:00 committed by Greg Kroah-Hartman
parent 93df42ba1b
commit 3f122a997e
1 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/usb/host/ehci-sched.c
View File

@ -2382,6 +2382,8 @@ static void scan_isoc(struct ehci_hcd *ehci)
unsigned uf, now_frame, frame; unsigned uf, now_frame, frame;
unsigned fmask = ehci->periodic_size - 1; unsigned fmask = ehci->periodic_size - 1;
bool modified, live; bool modified, live;
union ehci_shadow q, *q_p;
__hc32 type, *hw_p;
/* /*
* When running, scan from last scan point up to "now" * When running, scan from last scan point up to "now"
@ -2399,14 +2401,11 @@ static void scan_isoc(struct ehci_hcd *ehci)
ehci->now_frame = now_frame; ehci->now_frame = now_frame;
frame = ehci->last_iso_frame; frame = ehci->last_iso_frame;
for (;;) {
union ehci_shadow q, *q_p;
__hc32 type, *hw_p;
restart: restart:
/* scan each element in frame's queue for completions */ /* Scan each element in frame's queue for completions */
q_p = &ehci->pshadow [frame]; q_p = &ehci->pshadow[frame];
hw_p = &ehci->periodic [frame]; hw_p = &ehci->periodic[frame];
q.ptr = q_p->ptr; q.ptr = q_p->ptr;
type = Q_NEXT_TYPE(ehci, *hw_p); type = Q_NEXT_TYPE(ehci, *hw_p);
modified = false; modified = false;
@ -2414,7 +2413,8 @@ static void scan_isoc(struct ehci_hcd *ehci)
while (q.ptr != NULL) { while (q.ptr != NULL) {
switch (hc32_to_cpu(ehci, type)) { switch (hc32_to_cpu(ehci, type)) {
case Q_TYPE_ITD: case Q_TYPE_ITD:
/* If this ITD is still active, leave it for /*
* If this ITD is still active, leave it for
* later processing ... check the next entry. * later processing ... check the next entry.
* No need to check for activity unless the * No need to check for activity unless the
* frame is current. * frame is current.
@ -2436,7 +2436,8 @@ static void scan_isoc(struct ehci_hcd *ehci)
} }
} }
/* Take finished ITDs out of the schedule /*
* Take finished ITDs out of the schedule
* and process them: recycle, maybe report * and process them: recycle, maybe report
* URB completion. HC won't cache the * URB completion. HC won't cache the
* pointer for much longer, if at all. * pointer for much longer, if at all.
@ -2446,15 +2447,15 @@ static void scan_isoc(struct ehci_hcd *ehci)
q.itd->hw_next != EHCI_LIST_END(ehci)) q.itd->hw_next != EHCI_LIST_END(ehci))
*hw_p = q.itd->hw_next; *hw_p = q.itd->hw_next;
else else
*hw_p = cpu_to_hc32(ehci, *hw_p = cpu_to_hc32(ehci, ehci->dummy->qh_dma);
ehci->dummy->qh_dma);
type = Q_NEXT_TYPE(ehci, q.itd->hw_next); type = Q_NEXT_TYPE(ehci, q.itd->hw_next);
wmb(); wmb();
modified = itd_complete (ehci, q.itd); modified = itd_complete(ehci, q.itd);
q = *q_p; q = *q_p;
break; break;
case Q_TYPE_SITD: case Q_TYPE_SITD:
/* If this SITD is still active, leave it for /*
* If this SITD is still active, leave it for
* later processing ... check the next entry. * later processing ... check the next entry.
* No need to check for activity unless the * No need to check for activity unless the
* frame is current. * frame is current.
@ -2462,18 +2463,17 @@ static void scan_isoc(struct ehci_hcd *ehci)
if (((frame == now_frame) || if (((frame == now_frame) ||
(((frame + 1) & fmask) == now_frame)) (((frame + 1) & fmask) == now_frame))
&& live && live
&& (q.sitd->hw_results & && (q.sitd->hw_results & SITD_ACTIVE(ehci))) {
SITD_ACTIVE(ehci))) {
q_p = &q.sitd->sitd_next; q_p = &q.sitd->sitd_next;
hw_p = &q.sitd->hw_next; hw_p = &q.sitd->hw_next;
type = Q_NEXT_TYPE(ehci, type = Q_NEXT_TYPE(ehci, q.sitd->hw_next);
q.sitd->hw_next);
q = *q_p; q = *q_p;
break; break;
} }
/* Take finished SITDs out of the schedule /*
* Take finished SITDs out of the schedule
* and process them: recycle, maybe report * and process them: recycle, maybe report
* URB completion. * URB completion.
*/ */
@ -2482,17 +2482,16 @@ static void scan_isoc(struct ehci_hcd *ehci)
q.sitd->hw_next != EHCI_LIST_END(ehci)) q.sitd->hw_next != EHCI_LIST_END(ehci))
*hw_p = q.sitd->hw_next; *hw_p = q.sitd->hw_next;
else else
*hw_p = cpu_to_hc32(ehci, *hw_p = cpu_to_hc32(ehci, ehci->dummy->qh_dma);
ehci->dummy->qh_dma);
type = Q_NEXT_TYPE(ehci, q.sitd->hw_next); type = Q_NEXT_TYPE(ehci, q.sitd->hw_next);
wmb(); wmb();
modified = sitd_complete (ehci, q.sitd); modified = sitd_complete(ehci, q.sitd);
q = *q_p; q = *q_p;
break; break;
default: default:
ehci_dbg(ehci, "corrupt type %d frame %d shadow %p\n", ehci_dbg(ehci, "corrupt type %d frame %d shadow %p\n",
type, frame, q.ptr); type, frame, q.ptr);
// BUG (); /* BUG(); */
/* FALL THROUGH */ /* FALL THROUGH */
case Q_TYPE_QH: case Q_TYPE_QH:
case Q_TYPE_FSTN: case Q_TYPE_FSTN:
@ -2501,17 +2500,18 @@ static void scan_isoc(struct ehci_hcd *ehci)
break; break;
} }
/* assume completion callbacks modify the queue */ /* Assume completion callbacks modify the queue */
if (unlikely(modified && ehci->isoc_count > 0)) if (unlikely(modified && ehci->isoc_count > 0))
goto restart; goto restart;
} }
/* Stop when we have reached the current frame */ /* Stop when we have reached the current frame */
if (frame == now_frame) if (frame == now_frame)
break; return;
/* The last frame may still have active siTDs */ /* The last frame may still have active siTDs */
ehci->last_iso_frame = frame; ehci->last_iso_frame = frame;
frame = (frame + 1) & fmask; frame = (frame + 1) & fmask;
}
goto restart;
} }