leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: octeon-usb: use list_del_init()

Browse Source 
Replace list_del() + INIT_LIST_HEAD() with list_del_init().

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Aaro Koskinen 2013-10-10 23:25:33 +03:00 committed by Greg Kroah-Hartman
parent d2695a8a3d
commit 244544a185
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/octeon-usb/octeon-hcd.c
View File

@ -2036,17 +2036,14 @@ static void octeon_usb_urb_complete_callback(struct cvmx_usb_state *usb,
urb->actual_length = bytes_transferred; urb->actual_length = bytes_transferred;
urb->hcpriv = NULL; urb->hcpriv = NULL;
if (!list_empty(&urb->urb_list)) { if (!list_empty(&urb->urb_list))
/* /*
* It is on the dequeue_list, but we are going to call * It is on the dequeue_list, but we are going to call
* usb_hcd_giveback_urb(), so we must clear it from * usb_hcd_giveback_urb(), so we must clear it from
* the list. We got to it before the * the list. We got to it before the
* octeon_usb_urb_dequeue_work() tasklet did. * octeon_usb_urb_dequeue_work() tasklet did.
*/ */
list_del(&urb->urb_list); list_del_init(&urb->urb_list);
/* No longer on the dequeue_list. */
INIT_LIST_HEAD(&urb->urb_list);
}
/* For Isochronous transactions we need to update the URB packet status /* For Isochronous transactions we need to update the URB packet status
list from data in our private copy */ list from data in our private copy */
@ -3233,9 +3230,7 @@ static void octeon_usb_urb_dequeue_work(unsigned long arg)
while (!list_empty(&priv->dequeue_list)) { while (!list_empty(&priv->dequeue_list)) {
struct urb *urb = container_of(priv->dequeue_list.next, struct urb, urb_list); struct urb *urb = container_of(priv->dequeue_list.next, struct urb, urb_list);
list_del(&urb->urb_list); list_del_init(&urb->urb_list);
/* not enqueued on dequeue_list */
INIT_LIST_HEAD(&urb->urb_list);
cvmx_usb_cancel(&priv->usb, urb->ep->hcpriv, urb->hcpriv); cvmx_usb_cancel(&priv->usb, urb->ep->hcpriv, urb->hcpriv);
} }