Revert "xhci: Convert to use list_count()"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Nov 2022 11:02:11 +0000 (12:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Nov 2022 11:06:22 +0000 (12:06 +0100)
This reverts commit b47ec9727f47d1dce4e8cbc9aef01c80b2332535 as it
breaks the build.

Link: https://lore.kernel.org/r/20221130131854.35b58b16@canb.auug.org.au
Link: https://lore.kernel.org/r/202211301628.iwMjPVMp-lkp@intel.com
Cc: Mathias Nyman <mathias.nyman@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/xhci-ring.c

index 817c31e3b0c8b02e4610c8eb7532638de5fc5d15..ad81e9a508b14b1bfd231e79db06a20d06699b25 100644 (file)
@@ -2532,6 +2532,7 @@ static int handle_tx_event(struct xhci_hcd *xhci,
        union xhci_trb *ep_trb;
        int status = -EINPROGRESS;
        struct xhci_ep_ctx *ep_ctx;
+       struct list_head *tmp;
        u32 trb_comp_code;
        int td_num = 0;
        bool handling_skipped_tds = false;
@@ -2579,8 +2580,10 @@ static int handle_tx_event(struct xhci_hcd *xhci,
        }
 
        /* Count current td numbers if ep->skip is set */
-       if (ep->skip)
-               td_num += list_count(&ep_ring->td_list);
+       if (ep->skip) {
+               list_for_each(tmp, &ep_ring->td_list)
+                       td_num++;
+       }
 
        /* Look for common error cases */
        switch (trb_comp_code) {