Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5172046d authored by Arjan van de Ven's avatar Arjan van de Ven Committed by Greg Kroah-Hartman
Browse files

usb: turn dev_warn+WARN_ON combos into dev_WARN 



dev_WARN is both compacter and gives better debug information
than just a WARN_ON, since people and tools will copy the device
information message together with the WARN_ON in bug reports.

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 728f0893

drivers/usb/host/uhci-q.c

+8 −16
Original line number Diff line number Diff line
@@ -123,14 +123,10 @@ 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);

		WARN_ON(1);

	}

	if (!list_empty(&td->fl_list)) {

		dev_warn(uhci_dev(uhci), "td %p still in fl_list!\n", td);

		WARN_ON(1);

	}

	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);



	dma_pool_free(uhci->td_pool, td, td->dma_handle);

}
@@ -295,10 +291,8 @@ 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);

		WARN_ON(1);

	}

	if (!list_empty(&qh->queue))

		dev_WARN(uhci_dev(uhci), "qh %p list not empty!\n", qh);



	list_del(&qh->node);

	if (qh->udev) {
@@ -746,11 +740,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",

	if (!list_empty(&urbp->node))

		dev_WARN(uhci_dev(uhci), "urb %p still on QH's list!\n",

				urbp->urb);

		WARN_ON(1);

	}



	list_for_each_entry_safe(td, tmp, &urbp->td_list, list) {

		uhci_remove_td_from_urbp(td);