Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / usb / host / uhci-q.c

diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
index c17ea1589b8335b94abb1e176d13eb3cfee2b034..f097a27dc0b49775864ed36e1596a6c1c39c1739 100644 (file)
--- a/drivers/usb/host/uhci-q.c
+++ b/drivers/usb/host/uhci-q.c
@@ -123,10 +123,11 @@ static struct uhci_td *uhci_alloc_td(struct uhci_hcd *uhci)
 
 static void uhci_free_td(struct uhci_hcd *uhci, struct uhci_td *td)
 {
-       if (!list_empty(&td->list))
-               dev_WARN(uhci_dev(uhci), "td %p still in list!\n", td);
-       if (!list_empty(&td->fl_list))
-               dev_WARN(uhci_dev(uhci), "td %p still in fl_list!\n", td);
+       dev_WARN(uhci_dev(uhci), !list_empty(&td->list),
+                       "td %p still in list!\n", td);
+
+       dev_WARN(uhci_dev(uhci), !list_empty(&td->fl_list),
+                       "td %p still in fl_list!\n", td);
 
        dma_pool_free(uhci->td_pool, td, td->dma_handle);
 }
@@ -292,8 +293,9 @@ static struct uhci_qh *uhci_alloc_qh(struct uhci_hcd *uhci,
 static void uhci_free_qh(struct uhci_hcd *uhci, struct uhci_qh *qh)
 {
        WARN_ON(qh->state != QH_STATE_IDLE && qh->udev);
-       if (!list_empty(&qh->queue))
-               dev_WARN(uhci_dev(uhci), "qh %p list not empty!\n", qh);
+
+       dev_WARN(uhci_dev(uhci), !list_empty(&qh->queue),
+                       "qh %p list not empty!\n", qh);
 
        list_del(&qh->node);
        if (qh->udev) {
@@ -742,9 +744,9 @@ static void uhci_free_urb_priv(struct uhci_hcd *uhci,
 {
        struct uhci_td *td, *tmp;
 
-       if (!list_empty(&urbp->node))
-               dev_WARN(uhci_dev(uhci), "urb %p still on QH's list!\n",
-                               urbp->urb);
+       dev_WARN(uhci_dev(uhci), !list_empty(&urbp->node),
+                       "urb %p still on QH's list!\n",
+                       urbp->urb);
 
        list_for_each_entry_safe(td, tmp, &urbp->td_list, list) {
                uhci_remove_td_from_urbp(td);