lkml.org 
[lkml]   [2009]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 02/25] [staging] BUG to BUG_ON changes
    Date
    Signed-off-by: Stoyan Gaydarov <stoyboyker@gmail.com>
    ---
    drivers/staging/comedi/drivers.c | 6 ++----
    drivers/staging/otus/wwrap.c | 3 +--
    drivers/staging/usbip/vhci_sysfs.c | 3 +--
    drivers/staging/wlan-ng/hfa384x_usb.c | 4 +---
    4 files changed, 5 insertions(+), 11 deletions(-)

    diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
    index 36a93b9..0b3a0f4 100644
    --- a/drivers/staging/comedi/drivers.c
    +++ b/drivers/staging/comedi/drivers.c
    @@ -545,8 +545,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)

    if (s->munge == NULL || (async->cmd.flags & CMDF_RAWDATA)) {
    async->munge_count += num_bytes;
    - if ((int)(async->munge_count - async->buf_write_count) > 0)
    - BUG();
    + BUG_ON((int)(async->munge_count - async->buf_write_count) > 0);
    return num_bytes;
    }
    /* don't munge partial samples */
    @@ -576,8 +575,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)
    async->munge_ptr %= async->prealloc_bufsz;
    count += block_size;
    }
    - if ((int)(async->munge_count - async->buf_write_count) > 0)
    - BUG();
    + BUG_ON((int)(async->munge_count - async->buf_write_count) > 0);
    return count;
    }

    diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c
    index 1bb5f59..a2d1389 100644
    --- a/drivers/staging/otus/wwrap.c
    +++ b/drivers/staging/otus/wwrap.c
    @@ -350,8 +350,7 @@ void zfLnxUsbDataIn_callback(urb_t *urb)
    buf->len = 0;
    #endif

    - if ((buf->tail + urb->actual_length) > buf->end)
    - BUG();
    + BUG_ON((buf->tail + urb->actual_length) > buf->end);

    skb_put(buf, urb->actual_length);

    diff --git a/drivers/staging/usbip/vhci_sysfs.c b/drivers/staging/usbip/vhci_sysfs.c
    index 0fd33a6..e4c7143 100644
    --- a/drivers/staging/usbip/vhci_sysfs.c
    +++ b/drivers/staging/usbip/vhci_sysfs.c
    @@ -31,8 +31,7 @@ static ssize_t show_status(struct device *dev, struct device_attribute *attr,
    char *s = out;
    int i = 0;

    - if (!the_controller || !out)
    - BUG();
    + BUG_ON(!the_controller || !out);

    spin_lock(&the_controller->lock);

    diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
    index 8a75b50..7cb3825 100644
    --- a/drivers/staging/wlan-ng/hfa384x_usb.c
    +++ b/drivers/staging/wlan-ng/hfa384x_usb.c
    @@ -3612,9 +3612,7 @@ static void hfa384x_usbin_callback(struct urb *urb)
    goto exit;

    skb = hw->rx_urb_skb;
    - if (!skb || (skb->data != urb->transfer_buffer)) {
    - BUG();
    - }
    + BUG_ON(!skb || (skb->data != urb->transfer_buffer));
    hw->rx_urb_skb = NULL;

    /* Check for error conditions within the URB */
    --
    1.6.1.3


    \
     
     \ /
      Last update: 2009-03-10 06:17    [W:0.022 / U:0.132 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site