lkml.org 
[lkml]   [2008]   [Oct]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 33/46] usb: turn dev_warn+WARN_ON combos into dev_WARN
    Date
    From: Arjan van de Ven <arjan@linux.intel.com>

    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: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/usb/host/uhci-q.c | 24 ++++++++----------------
    1 files changed, 8 insertions(+), 16 deletions(-)

    diff --git a/drivers/usb/host/uhci-q.c b/drivers/usb/host/uhci-q.c
    index db64593..1f0c2cf 100644
    --- a/drivers/usb/host/uhci-q.c
    +++ b/drivers/usb/host/uhci-q.c
    @@ -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);
    --
    1.6.0.2


    \
     
     \ /
      Last update: 2008-10-16 19:29    [W:4.050 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site