4 files changed, 16 insertions, 12 deletions

diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c
index cb01b5106efd..b6483dd98acc 100644
--- a/drivers/usb/atm/ueagle-atm.c
+++ b/drivers/usb/atm/ueagle-atm.c
@@ -64,7 +64,6 @@
 #include <linux/ctype.h>
 #include <linux/sched.h>
 #include <linux/kthread.h>
-#include <linux/version.h>
 #include <linux/mutex.h>
 #include <linux/freezer.h>
 
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 07228721cafe..06dd114910d4 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -344,7 +344,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
                                 __func__, sarb->len, vcc);
                 /* discard cells already received */
                 skb_trim(sarb, 0);
-                UDSL_ASSERT(sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);
+                UDSL_ASSERT(instance, sarb->tail + ATM_CELL_PAYLOAD <= sarb->end);
         }
 
         memcpy(skb_tail_pointer(sarb), source + ATM_CELL_HEADER, ATM_CELL_PAYLOAD);
@@ -432,7 +432,7 @@ static void usbatm_extract_cells(struct usbatm_data *instance,
                 unsigned char *cell_buf = instance->cell_buf;
                 unsigned int space_left = stride - buf_usage;
 
-                UDSL_ASSERT(buf_usage <= stride);
+                UDSL_ASSERT(instance, buf_usage <= stride);
 
                 if (avail_data >= space_left) {
                         /* add new data and process cell */
@@ -475,7 +475,7 @@ static unsigned int usbatm_write_cells(struct usbatm_data *instance,
         unsigned int stride = instance->tx_channel.stride;
 
         vdbg("%s: skb->len=%d, avail_space=%u", __func__, skb->len, avail_space);
-        UDSL_ASSERT(!(avail_space % stride));
+        UDSL_ASSERT(instance, !(avail_space % stride));
 
         for (bytes_written = 0; bytes_written < avail_space && ctrl->len;
              bytes_written += stride, target += stride) {
@@ -547,7 +547,7 @@ static void usbatm_rx_process(unsigned long data)
                                 if (!urb->iso_frame_desc[i].status) {
                                         unsigned int actual_length = urb->iso_frame_desc[i].actual_length;
 
-                                        UDSL_ASSERT(actual_length <= packet_size);
+                                        UDSL_ASSERT(instance, actual_length <= packet_size);
 
                                         if (!merge_length)
                                                 merge_start = (unsigned char *)urb->transfer_buffer + urb->iso_frame_desc[i].offset;
@@ -640,14 +640,13 @@ static void usbatm_cancel_send(struct usbatm_data *instance,
 
         atm_dbg(instance, "%s entered\n", __func__);
         spin_lock_irq(&instance->sndqueue.lock);
-        for (skb = instance->sndqueue.next, n = skb->next;
-             skb != (struct sk_buff *)&instance->sndqueue;
-             skb = n, n = skb->next)
+        skb_queue_walk_safe(&instance->sndqueue, skb, n) {
                 if (UDSL_SKB(skb)->atm.vcc == vcc) {
                         atm_dbg(instance, "%s: popping skb 0x%p\n", __func__, skb);
                         __skb_unlink(skb, &instance->sndqueue);
                         usbatm_pop(vcc, skb);
                 }
+        }
         spin_unlock_irq(&instance->sndqueue.lock);
 
         tasklet_disable(&instance->tx_channel.tasklet);
@@ -1189,7 +1188,7 @@ int usbatm_usb_probe(struct usb_interface *intf, const struct usb_device_id *id,
                 struct urb *urb;
                 unsigned int iso_packets = usb_pipeisoc(channel->endpoint) ? channel->buf_size / channel->packet_size : 0;
 
-                UDSL_ASSERT(!usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint));
+                UDSL_ASSERT(instance, !usb_pipeisoc(channel->endpoint) || usb_pipein(channel->endpoint));
 
                 urb = usb_alloc_urb(iso_packets, GFP_KERNEL);
                 if (!urb) {
diff --git a/drivers/usb/atm/usbatm.h b/drivers/usb/atm/usbatm.h
index e6887c6cf3cf..f6f4508a9d42 100644
--- a/drivers/usb/atm/usbatm.h
+++ b/drivers/usb/atm/usbatm.h
@@ -40,9 +40,15 @@
 */
 
 #ifdef DEBUG
-#define UDSL_ASSERT(x)  BUG_ON(!(x))
+#define UDSL_ASSERT(instance, x)        BUG_ON(!(x))
 #else
-#define UDSL_ASSERT(x)  do { if (!(x)) warn("failed assertion '%s' at line %d", __stringify(x), __LINE__); } while(0)
+#define UDSL_ASSERT(instance, x)                                        \
+        do {    \
+                if (!(x))                                               \
+                        dev_warn(&(instance)->usb_intf->dev,            \
+                                 "failed assertion '%s' at line %d",    \
+                                 __stringify(x), __LINE__);             \
+        } while(0)
 #endif
 
 #define usb_err(instance, format, arg...)       \
diff --git a/drivers/usb/atm/xusbatm.c b/drivers/usb/atm/xusbatm.c
index 8472543eee81..17d167bbd2dc 100644
--- a/drivers/usb/atm/xusbatm.c
+++ b/drivers/usb/atm/xusbatm.c
@@ -193,7 +193,7 @@ static int __init xusbatm_init(void)
             num_vendor != num_product ||
             num_vendor != num_rx_endpoint ||
             num_vendor != num_tx_endpoint) {
-                warn("malformed module parameters");
+                printk(KERN_WARNING "xusbatm: malformed module parameters\n");
                 return -EINVAL;
         }