Use musb_qh_empty() instead of &qh->hep->urb_list to avoid code duplicating. Signed-off-by: Matwey V. Kornilov <matwey@xxxxxxxxxx> --- drivers/usb/musb/musb_host.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 3ffea6a5e022..37aa9f6155d9 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -80,6 +80,11 @@ static void musb_ep_program(struct musb *musb, u8 epnum, struct urb *urb, int is_out, u8 *buf, u32 offset, u32 len); +static bool musb_qh_empty(struct musb_qh *qh) +{ + return list_empty(&qh->hep->urb_list); +} + /* * Clear TX fifo. Needed to avoid BABBLE errors. */ @@ -342,7 +347,7 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb, /* reclaim resources (and bandwidth) ASAP; deschedule it, and * invalidate qh as soon as list_empty(&hep->urb_list) */ - if (list_empty(&qh->hep->urb_list)) { + if (musb_qh_empty(qh)) { struct list_head *head; struct dma_controller *dma = musb->dma_controller; @@ -2430,7 +2435,7 @@ static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status) /* If nothing else (usually musb_giveback) is using it * and its URB list has emptied, recycle this qh. */ - if (ready && list_empty(&qh->hep->urb_list)) { + if (ready && musb_qh_empty(qh)) { qh->hep->hcpriv = NULL; list_del(&qh->ring); kfree(qh); @@ -2475,7 +2480,7 @@ musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep) /* Then nuke all the others ... and advance the * queue on hw_ep (e.g. bulk ring) when we're done. */ - while (!list_empty(&hep->urb_list)) { + while (!musb_qh_empty(qh)) { urb = next_urb(qh); urb->status = -ESHUTDOWN; musb_advance_schedule(musb, urb, qh->hw_ep, is_in); @@ -2485,7 +2490,7 @@ musb_h_disable(struct usb_hcd *hcd, struct usb_host_endpoint *hep) * other transfers, and since !qh->is_ready nothing * will activate any of these as it advances. */ - while (!list_empty(&hep->urb_list)) + while (!musb_qh_empty(qh)) musb_giveback(musb, next_urb(qh), -ESHUTDOWN); hep->hcpriv = NULL; -- 2.16.4