uwb: use dev_dbg() for debug messages

[safe/jmp/linux-2.6] / drivers / uwb / i1480 / dfu / usb.c

diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c
index b7ea525..686795e 100644 (file)
--- a/drivers/uwb/i1480/dfu/usb.c
+++ b/drivers/uwb/i1480/dfu/usb.c
@@ -43,10 +43,6 @@
 #include <linux/usb/wusb-wa.h>
 #include "i1480-dfu.h"
 
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
-
-
 struct i1480_usb {
        struct i1480 i1480;
        struct usb_device *usb_dev;
@@ -117,8 +113,6 @@ int i1480_usb_write(struct i1480 *i1480, u32 memory_address,
        struct i1480_usb *i1480_usb = container_of(i1480, struct i1480_usb, i1480);
        size_t buffer_size, itr = 0;
 
-       d_fnstart(3, i1480->dev, "(%p, 0x%08x, %p, %zu)\n",
-                 i1480, memory_address, buffer, size);
        BUG_ON(size & 0x3); /* Needs to be a multiple of 4 */
        while (size > 0) {
                buffer_size = size < i1480->buf_size ? size : i1480->buf_size;
@@ -131,16 +125,10 @@ int i1480_usb_write(struct i1480 *i1480, u32 memory_address,
                        i1480->cmd_buf, buffer_size, 100 /* FIXME: arbitrary */);
                if (result < 0)
                        break;
-               d_printf(3, i1480->dev,
-                        "wrote @ 0x%08x %u bytes (of %zu bytes requested)\n",
-                        memory_address, result, buffer_size);
-               d_dump(4, i1480->dev, i1480->cmd_buf, result);
                itr += result;
                memory_address += result;
                size -= result;
        }
-       d_fnend(3, i1480->dev, "(%p, 0x%08x, %p, %zu) = %d\n",
-               i1480, memory_address, buffer, size, result);
        return result;
 }
 
@@ -165,8 +153,6 @@ int i1480_usb_read(struct i1480 *i1480, u32 addr, size_t size)
        size_t itr, read_size = i1480->buf_size;
        struct i1480_usb *i1480_usb = container_of(i1480, struct i1480_usb, i1480);
 
-       d_fnstart(3, i1480->dev, "(%p, 0x%08x, %zu)\n",
-                 i1480, addr, size);
        BUG_ON(size > i1480->buf_size);
        BUG_ON(size & 0x3); /* Needs to be a multiple of 4 */
        BUG_ON(read_size > 512);
@@ -200,10 +186,6 @@ int i1480_usb_read(struct i1480 *i1480, u32 addr, size_t size)
        }
        result = bytes;
 out:
-       d_fnend(3, i1480->dev, "(%p, 0x%08x, %zu) = %zd\n",
-               i1480, addr, size, result);
-       if (result > 0)
-               d_dump(4, i1480->dev, i1480->cmd_buf, result);
        return result;
 }
 
@@ -259,7 +241,6 @@ int i1480_usb_wait_init_done(struct i1480 *i1480)
        struct i1480_usb *i1480_usb = container_of(i1480, struct i1480_usb, i1480);
        struct usb_endpoint_descriptor *epd;
 
-       d_fnstart(3, dev, "(%p)\n", i1480);
        init_completion(&i1480->evt_complete);
        i1480->evt_result = -EINPROGRESS;
        epd = &i1480_usb->usb_iface->cur_altsetting->endpoint[0].desc;
@@ -281,14 +262,12 @@ int i1480_usb_wait_init_done(struct i1480 *i1480)
                goto error_wait;
        }
        usb_kill_urb(i1480_usb->neep_urb);
-       d_fnend(3, dev, "(%p) = 0\n", i1480);
        return 0;
 
 error_wait:
        usb_kill_urb(i1480_usb->neep_urb);
 error_submit:
        i1480->evt_result = result;
-       d_fnend(3, dev, "(%p) = %d\n", i1480, result);
        return result;
 }
 
@@ -319,7 +298,6 @@ int i1480_usb_cmd(struct i1480 *i1480, const char *cmd_name, size_t cmd_size)
        struct uwb_rccb *cmd = i1480->cmd_buf;
        u8 iface_no;
 
-       d_fnstart(3, dev, "(%p, %s, %zu)\n", i1480, cmd_name, cmd_size);
        /* Post a read on the notification & event endpoint */
        iface_no = i1480_usb->usb_iface->cur_altsetting->desc.bInterfaceNumber;
        epd = &i1480_usb->usb_iface->cur_altsetting->endpoint[0].desc;
@@ -347,15 +325,11 @@ int i1480_usb_cmd(struct i1480 *i1480, const char *cmd_name, size_t cmd_size)
                        cmd_name, result);
                goto error_submit_ep0;
        }
-       d_fnend(3, dev, "(%p, %s, %zu) = %d\n",
-               i1480, cmd_name, cmd_size, result);
        return result;
 
 error_submit_ep0:
        usb_kill_urb(i1480_usb->neep_urb);
 error_submit_ep1:
-       d_fnend(3, dev, "(%p, %s, %zu) = %d\n",
-               i1480, cmd_name, cmd_size, result);
        return result;
 }