]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
usb: host: oxu210hp-hcd: use list_for_each_entry_safe
authorGeliang Tang <geliangtang@163.com>
Fri, 18 Dec 2015 16:34:28 +0000 (00:34 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jan 2016 04:55:33 +0000 (20:55 -0800)
Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/oxu210hp-hcd.c

index bc74aca8a54c291a425a1e20d6e954c57a1296fb..4e4d601af35c19da7bb3f826b54af8239a36e853 100644 (file)
@@ -981,7 +981,7 @@ static int qh_schedule(struct oxu_hcd *oxu, struct ehci_qh *qh);
 static unsigned qh_completions(struct oxu_hcd *oxu, struct ehci_qh *qh)
 {
        struct ehci_qtd *last = NULL, *end = qh->dummy;
-       struct list_head *entry, *tmp;
+       struct ehci_qtd *qtd, *tmp;
        int stopped;
        unsigned count = 0;
        int do_status = 0;
@@ -1006,12 +1006,10 @@ static unsigned qh_completions(struct oxu_hcd *oxu, struct ehci_qh *qh)
         * then let the queue advance.
         * if queue is stopped, handles unlinks.
         */
-       list_for_each_safe(entry, tmp, &qh->qtd_list) {
-               struct ehci_qtd *qtd;
+       list_for_each_entry_safe(qtd, tmp, &qh->qtd_list, qtd_list) {
                struct urb *urb;
                u32 token = 0;
 
-               qtd = list_entry(entry, struct ehci_qtd, qtd_list);
                urb = qtd->urb;
 
                /* Clean up any state from previous QTD ...*/
@@ -1174,14 +1172,11 @@ halt:
  * used for cleanup after errors, before HC sees an URB's TDs.
  */
 static void qtd_list_free(struct oxu_hcd *oxu,
-                               struct urb *urb, struct list_head *qtd_list)
+                               struct urb *urb, struct list_head *head)
 {
-       struct list_head *entry, *temp;
-
-       list_for_each_safe(entry, temp, qtd_list) {
-               struct ehci_qtd *qtd;
+       struct ehci_qtd *qtd, *temp;
 
-               qtd = list_entry(entry, struct ehci_qtd, qtd_list);
+       list_for_each_entry_safe(qtd, temp, head, qtd_list) {
                list_del(&qtd->qtd_list);
                oxu_qtd_free(oxu, qtd);
        }