Use list_for_each_entry*() instead of list_for_each*() to simplify
the code.

Signed-off-by: Geliang Tang <geliangt...@163.com>
---
 drivers/usb/host/max3421-hcd.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/drivers/usb/host/max3421-hcd.c b/drivers/usb/host/max3421-hcd.c
index bd98706..7257962 100644
--- a/drivers/usb/host/max3421-hcd.c
+++ b/drivers/usb/host/max3421-hcd.c
@@ -665,7 +665,6 @@ max3421_select_and_start_urb(struct usb_hcd *hcd)
        struct max3421_ep *max3421_ep;
        int epnum, force_toggles = 0;
        struct usb_host_endpoint *ep;
-       struct list_head *pos;
        unsigned long flags;
 
        spin_lock_irqsave(&max3421_hcd->lock, flags);
@@ -673,10 +672,9 @@ max3421_select_and_start_urb(struct usb_hcd *hcd)
        for (;
             max3421_hcd->sched_pass < SCHED_PASS_DONE;
             ++max3421_hcd->sched_pass)
-               list_for_each(pos, &max3421_hcd->ep_list) {
+               list_for_each_entry(max3421_ep, &max3421_hcd->ep_list,
+                                   ep_list) {
                        urb = NULL;
-                       max3421_ep = container_of(pos, struct max3421_ep,
-                                                 ep_list);
                        ep = max3421_ep->ep;
 
                        switch (usb_endpoint_type(&ep->desc)) {
@@ -748,7 +746,8 @@ max3421_select_and_start_urb(struct usb_hcd *hcd)
                        }
 
                        /* move current ep to tail: */
-                       list_move_tail(pos, &max3421_hcd->ep_list);
+                       list_move_tail(&max3421_ep->ep_list,
+                                      &max3421_hcd->ep_list);
                        curr_urb = urb;
                        goto done;
                }
@@ -797,19 +796,16 @@ max3421_check_unlink(struct usb_hcd *hcd)
 {
        struct spi_device *spi = to_spi_device(hcd->self.controller);
        struct max3421_hcd *max3421_hcd = hcd_to_max3421(hcd);
-       struct list_head *pos, *upos, *next_upos;
        struct max3421_ep *max3421_ep;
        struct usb_host_endpoint *ep;
-       struct urb *urb;
+       struct urb *urb, *next;
        unsigned long flags;
        int retval = 0;
 
        spin_lock_irqsave(&max3421_hcd->lock, flags);
-       list_for_each(pos, &max3421_hcd->ep_list) {
-               max3421_ep = container_of(pos, struct max3421_ep, ep_list);
+       list_for_each_entry(max3421_ep, &max3421_hcd->ep_list, ep_list) {
                ep = max3421_ep->ep;
-               list_for_each_safe(upos, next_upos, &ep->urb_list) {
-                       urb = container_of(upos, struct urb, urb_list);
+               list_for_each_entry_safe(urb, next, &ep->urb_list, urb_list) {
                        if (urb->unlinked) {
                                retval = 1;
                                dev_dbg(&spi->dev, "%s: URB %p unlinked=%d",
@@ -1184,22 +1180,19 @@ dump_eps(struct usb_hcd *hcd)
        struct max3421_hcd *max3421_hcd = hcd_to_max3421(hcd);
        struct max3421_ep *max3421_ep;
        struct usb_host_endpoint *ep;
-       struct list_head *pos, *upos;
        char ubuf[512], *dp, *end;
        unsigned long flags;
        struct urb *urb;
        int epnum, ret;
 
        spin_lock_irqsave(&max3421_hcd->lock, flags);
-       list_for_each(pos, &max3421_hcd->ep_list) {
-               max3421_ep = container_of(pos, struct max3421_ep, ep_list);
+       list_for_each_entry(max3421_ep, &max3421_hcd->ep_list, ep_list) {
                ep = max3421_ep->ep;
 
                dp = ubuf;
                end = dp + sizeof(ubuf);
                *dp = '\0';
-               list_for_each(upos, &ep->urb_list) {
-                       urb = container_of(upos, struct urb, urb_list);
+               list_for_each_entry(urb, &ep->urb_list, urb_list) {
                        ret = snprintf(dp, end - dp, " %p(%d.%s %d/%d)", urb,
                                       usb_pipetype(urb->pipe),
                                       usb_urb_dir_in(urb) ? "IN" : "OUT",
-- 
2.5.0


--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to