Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1290048
| From | "Geyslan G. Bem" <geyslan@gmail.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH 01/10] usb: host: ehci-sched: refactor scan_isoc function |
| Date | 2015-12-12 02:30 +0100 |
| Message-ID | <qEHay-3O5-13@gated-at.bofh.it> (permalink) |
| References | <qEH0S-3KF-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 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>
---
drivers/usb/host/ehci-sched.c | 203 ++++++++++++++++++++++--------------------
1 file changed, 104 insertions(+), 99 deletions(-)
diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
index f9a3327..86b2484 100644
--- a/drivers/usb/host/ehci-sched.c
+++ b/drivers/usb/host/ehci-sched.c
@@ -2383,6 +2383,9 @@ static void scan_isoc(struct ehci_hcd *ehci)
unsigned fmask = ehci->periodic_size - 1;
bool modified, live;
+ union ehci_shadow q, *q_p;
+ __hc32 type, *hw_p;
+
/*
* When running, scan from last scan point up to "now"
* else clean up by scanning everything that's left.
@@ -2399,119 +2402,121 @@ static void scan_isoc(struct ehci_hcd *ehci)
ehci->now_frame = now_frame;
frame = ehci->last_iso_frame;
- for (;;) {
- union ehci_shadow q, *q_p;
- __hc32 type, *hw_p;
restart:
- /* scan each element in frame's queue for completions */
- q_p = &ehci->pshadow [frame];
- hw_p = &ehci->periodic [frame];
- q.ptr = q_p->ptr;
- type = Q_NEXT_TYPE(ehci, *hw_p);
- modified = false;
-
- while (q.ptr != NULL) {
- switch (hc32_to_cpu(ehci, type)) {
- case Q_TYPE_ITD:
- /* If this ITD is still active, leave it for
- * later processing ... check the next entry.
- * No need to check for activity unless the
- * frame is current.
- */
- if (frame == now_frame && live) {
- rmb();
- for (uf = 0; uf < 8; uf++) {
- if (q.itd->hw_transaction[uf] &
- ITD_ACTIVE(ehci))
- break;
- }
- if (uf < 8) {
- q_p = &q.itd->itd_next;
- hw_p = &q.itd->hw_next;
- type = Q_NEXT_TYPE(ehci,
- q.itd->hw_next);
- q = *q_p;
+ /* Scan each element in frame's queue for completions */
+ q_p = &ehci->pshadow[frame];
+ hw_p = &ehci->periodic[frame];
+ q.ptr = q_p->ptr;
+ type = Q_NEXT_TYPE(ehci, *hw_p);
+ modified = false;
+
+ while (q.ptr != NULL) {
+ switch (hc32_to_cpu(ehci, type)) {
+ case Q_TYPE_ITD:
+ /*
+ * If this ITD is still active, leave it for
+ * later processing ... check the next entry.
+ * No need to check for activity unless the
+ * frame is current.
+ */
+ if (frame == now_frame && live) {
+ rmb();
+ for (uf = 0; uf < 8; uf++) {
+ if (q.itd->hw_transaction[uf] &
+ ITD_ACTIVE(ehci))
break;
- }
}
-
- /* Take finished ITDs out of the schedule
- * and process them: recycle, maybe report
- * URB completion. HC won't cache the
- * pointer for much longer, if at all.
- */
- *q_p = q.itd->itd_next;
- if (!ehci->use_dummy_qh ||
- q.itd->hw_next != EHCI_LIST_END(ehci))
- *hw_p = q.itd->hw_next;
- else
- *hw_p = cpu_to_hc32(ehci,
- ehci->dummy->qh_dma);
- type = Q_NEXT_TYPE(ehci, q.itd->hw_next);
- wmb();
- modified = itd_complete (ehci, q.itd);
- q = *q_p;
- break;
- case Q_TYPE_SITD:
- /* If this SITD is still active, leave it for
- * later processing ... check the next entry.
- * No need to check for activity unless the
- * frame is current.
- */
- if (((frame == now_frame) ||
- (((frame + 1) & fmask) == now_frame))
- && live
- && (q.sitd->hw_results &
- SITD_ACTIVE(ehci))) {
-
- q_p = &q.sitd->sitd_next;
- hw_p = &q.sitd->hw_next;
+ if (uf < 8) {
+ q_p = &q.itd->itd_next;
+ hw_p = &q.itd->hw_next;
type = Q_NEXT_TYPE(ehci,
- q.sitd->hw_next);
+ q.itd->hw_next);
q = *q_p;
break;
}
+ }
- /* Take finished SITDs out of the schedule
- * and process them: recycle, maybe report
- * URB completion.
- */
- *q_p = q.sitd->sitd_next;
- if (!ehci->use_dummy_qh ||
- q.sitd->hw_next != EHCI_LIST_END(ehci))
- *hw_p = q.sitd->hw_next;
- else
- *hw_p = cpu_to_hc32(ehci,
- ehci->dummy->qh_dma);
- type = Q_NEXT_TYPE(ehci, q.sitd->hw_next);
- wmb();
- modified = sitd_complete (ehci, q.sitd);
+ /*
+ * Take finished ITDs out of the schedule
+ * and process them: recycle, maybe report
+ * URB completion. HC won't cache the
+ * pointer for much longer, if at all.
+ */
+ *q_p = q.itd->itd_next;
+ if (!ehci->use_dummy_qh ||
+ q.itd->hw_next != EHCI_LIST_END(ehci))
+ *hw_p = q.itd->hw_next;
+ else
+ *hw_p = cpu_to_hc32(ehci,
+ ehci->dummy->qh_dma);
+ type = Q_NEXT_TYPE(ehci, q.itd->hw_next);
+ wmb();
+ modified = itd_complete(ehci, q.itd);
+ q = *q_p;
+ break;
+ case Q_TYPE_SITD:
+ /*
+ * If this SITD is still active, leave it for
+ * later processing ... check the next entry.
+ * No need to check for activity unless the
+ * frame is current.
+ */
+ if (((frame == now_frame) ||
+ (((frame + 1) & fmask) == now_frame))
+ && live
+ && (q.sitd->hw_results &
+ SITD_ACTIVE(ehci))) {
+
+ q_p = &q.sitd->sitd_next;
+ hw_p = &q.sitd->hw_next;
+ type = Q_NEXT_TYPE(ehci,
+ q.sitd->hw_next);
q = *q_p;
break;
- default:
- ehci_dbg(ehci, "corrupt type %d frame %d shadow %p\n",
- type, frame, q.ptr);
- // BUG ();
- /* FALL THROUGH */
- case Q_TYPE_QH:
- case Q_TYPE_FSTN:
- /* End of the iTDs and siTDs */
- q.ptr = NULL;
- break;
}
- /* assume completion callbacks modify the queue */
- if (unlikely(modified && ehci->isoc_count > 0))
- goto restart;
- }
-
- /* Stop when we have reached the current frame */
- if (frame == now_frame)
+ /*
+ * Take finished SITDs out of the schedule
+ * and process them: recycle, maybe report
+ * URB completion.
+ */
+ *q_p = q.sitd->sitd_next;
+ if (!ehci->use_dummy_qh ||
+ q.sitd->hw_next != EHCI_LIST_END(ehci))
+ *hw_p = q.sitd->hw_next;
+ else
+ *hw_p = cpu_to_hc32(ehci,
+ ehci->dummy->qh_dma);
+ type = Q_NEXT_TYPE(ehci, q.sitd->hw_next);
+ wmb();
+ modified = sitd_complete(ehci, q.sitd);
+ q = *q_p;
break;
+ default:
+ ehci_dbg(ehci, "corrupt type %d frame %d shadow %p\n",
+ type, frame, q.ptr);
+ /* BUG(); */
+ /* FALL THROUGH */
+ case Q_TYPE_QH:
+ case Q_TYPE_FSTN:
+ /* End of the iTDs and siTDs */
+ q.ptr = NULL;
+ break;
+ }
- /* The last frame may still have active siTDs */
- ehci->last_iso_frame = frame;
- frame = (frame + 1) & fmask;
+ /* Assume completion callbacks modify the queue */
+ if (unlikely(modified && ehci->isoc_count > 0))
+ goto restart;
}
+
+ /* Stop when we have reached the current frame */
+ if (frame == now_frame)
+ return;
+
+ /* The last frame may still have active siTDs */
+ ehci->last_iso_frame = frame;
+ frame = (frame + 1) & fmask;
+
+ goto restart;
}
--
2.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 00/10] usb: host: ehci-sched: cleanup "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:20 +0100
[PATCH 04/10] usb: host: ehci-sched: add spaces around operators "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
[PATCH 08/10] usb: host: ehci-sched: add line after declarations "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
[PATCH 10/10] usb: host: ehci-sched: remove unnecessary braces "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
Re: [PATCH 10/10] usb: host: ehci-sched: remove unnecessary braces Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-12-12 16:00 +0100
Re: [PATCH 10/10] usb: host: ehci-sched: remove unnecessary braces "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 16:50 +0100
[PATCH 03/10] usb: host: ehci-sched: remove useless assignments "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
Re: [PATCH 03/10] usb: host: ehci-sched: remove useless assignments Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-12-12 15:50 +0100
Re: [PATCH 03/10] usb: host: ehci-sched: remove useless assignments "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 16:50 +0100
[PATCH 06/10] usb: host: ehci-sched: remove useless else branch "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
[PATCH 01/10] usb: host: ehci-sched: refactor scan_isoc function "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
Re: [PATCH 01/10] usb: host: ehci-sched: refactor scan_isoc function Alan Stern <stern@rowland.harvard.edu> - 2015-12-12 17:20 +0100
Re: [PATCH 01/10] usb: host: ehci-sched: refactor scan_isoc function "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 18:00 +0100
Re: [PATCH 01/10] usb: host: ehci-sched: refactor scan_isoc function Alan Stern <stern@rowland.harvard.edu> - 2015-12-12 18:20 +0100
[PATCH 07/10] usb: host: ehci-sched: use C89-style comments "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
[PATCH 05/10] usb: host: ehci-sched: remove prohibited spaces "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
[PATCH 09/10] usb: host: ehci-sched: use sizeof operator with parens "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
[PATCH 02/10] usb: host: ehci-sched: move constants to right "Geyslan G. Bem" <geyslan@gmail.com> - 2015-12-12 02:30 +0100
csiph-web