3 files changed, 2 insertions, 52 deletions

diff --git a/drivers/uwb/i1480/dfu/dfu.c b/drivers/uwb/i1480/dfu/dfu.c
index 9097b3b30385..da7b1d08003c 100644
--- a/drivers/uwb/i1480/dfu/dfu.c
+++ b/drivers/uwb/i1480/dfu/dfu.c
@@ -34,10 +34,7 @@
 #include <linux/uwb.h>
 #include <linux/random.h>
 
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
-
-/**
+/*
  * i1480_rceb_check - Check RCEB for expected field values
  * @i1480: pointer to device for which RCEB is being checked
  * @rceb: RCEB being checked
@@ -83,7 +80,7 @@ int i1480_rceb_check(const struct i1480 *i1480, const struct uwb_rceb *rceb,
 EXPORT_SYMBOL_GPL(i1480_rceb_check);
 
 
-/**
+/*
  * Execute a Radio Control Command
  *
  * Command data has to be in i1480->cmd_buf.
@@ -101,7 +98,6 @@ ssize_t i1480_cmd(struct i1480 *i1480, const char *cmd_name, size_t cmd_size,
         u8 expected_type = reply->bEventType;
         u8 context;
 
-        d_fnstart(3, i1480->dev, "(%p, %s, %zu)\n", i1480, cmd_name, cmd_size);
         init_completion(&i1480->evt_complete);
         i1480->evt_result = -EINPROGRESS;
         do {
@@ -150,8 +146,6 @@ ssize_t i1480_cmd(struct i1480 *i1480, const char *cmd_name, size_t cmd_size,
         result = i1480_rceb_check(i1480, i1480->evt_buf, cmd_name, context,
                                   expected_type, expected_event);
 error:
-        d_fnend(3, i1480->dev, "(%p, %s, %zu) = %zd\n",
-                i1480, cmd_name, cmd_size, result);
         return result;
 }
 EXPORT_SYMBOL_GPL(i1480_cmd);
diff --git a/drivers/uwb/i1480/dfu/mac.c b/drivers/uwb/i1480/dfu/mac.c
index 2e4d8f07c165..694d0daf88ab 100644
--- a/drivers/uwb/i1480/dfu/mac.c
+++ b/drivers/uwb/i1480/dfu/mac.c
@@ -31,9 +31,6 @@
 #include <linux/uwb.h>
 #include "i1480-dfu.h"
 
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
-
 /*
  * Descriptor for a continuous segment of MAC fw data
  */
@@ -184,10 +181,6 @@ ssize_t i1480_fw_cmp(struct i1480 *i1480, struct fw_hdr *hdr)
                 }
                 if (memcmp(i1480->cmd_buf, bin + src_itr, result)) {
                         u8 *buf = i1480->cmd_buf;
-                        d_printf(2, i1480->dev,
-                                 "original data @ %p + %u, %zu bytes\n",
-                                 bin, src_itr, result);
-                        d_dump(4, i1480->dev, bin + src_itr, result);
                         for (cnt = 0; cnt < result; cnt++)
                                 if (bin[src_itr + cnt] != buf[cnt]) {
                                         dev_err(i1480->dev, "byte failed at "
@@ -224,7 +217,6 @@ int mac_fw_hdrs_push(struct i1480 *i1480, struct fw_hdr *hdr,
         struct fw_hdr *hdr_itr;
         int verif_retry_count;
 
-        d_fnstart(3, dev, "(%p, %p)\n", i1480, hdr);
         /* Now, header by header, push them to the hw */
         for (hdr_itr = hdr; hdr_itr != NULL; hdr_itr = hdr_itr->next) {
                 verif_retry_count = 0;
@@ -264,7 +256,6 @@ retry:
                         break;
                 }
         }
-        d_fnend(3, dev, "(%zd)\n", result);
         return result;
 }
 
@@ -337,11 +328,9 @@ int __mac_fw_upload(struct i1480 *i1480, const char *fw_name,
         const struct firmware *fw;
         struct fw_hdr *fw_hdrs;
 
-        d_fnstart(3, i1480->dev, "(%p, %s, %s)\n", i1480, fw_name, fw_tag);
         result = request_firmware(&fw, fw_name, i1480->dev);
         if (result < 0) /* Up to caller to complain on -ENOENT */
                 goto out;
-        d_printf(3, i1480->dev, "%s fw '%s': uploading\n", fw_tag, fw_name);
         result = fw_hdrs_load(i1480, &fw_hdrs, fw->data, fw->size);
         if (result < 0) {
                 dev_err(i1480->dev, "%s fw '%s': failed to parse firmware "
@@ -363,8 +352,6 @@ out_hdrs_release:
 out_release:
         release_firmware(fw);
 out:
-        d_fnend(3, i1480->dev, "(%p, %s, %s) = %d\n", i1480, fw_name, fw_tag,
-                result);
         return result;
 }
 
@@ -433,7 +420,6 @@ int i1480_fw_is_running_q(struct i1480 *i1480)
         int result;
         u32 *val = (u32 *) i1480->cmd_buf;
 
-        d_fnstart(3, i1480->dev, "(i1480 %p)\n", i1480);
         for (cnt = 0; cnt < 10; cnt++) {
                 msleep(100);
                 result = i1480->read(i1480, 0x80080000, 4);
@@ -447,7 +433,6 @@ int i1480_fw_is_running_q(struct i1480 *i1480)
         dev_err(i1480->dev, "Timed out waiting for fw to start\n");
         result = -ETIMEDOUT;
 out:
-        d_fnend(3, i1480->dev, "(i1480 %p) = %d\n", i1480, result);
         return result;
 
 }
@@ -467,7 +452,6 @@ int i1480_mac_fw_upload(struct i1480 *i1480)
         int result = 0, deprecated_name = 0;
         struct i1480_rceb *rcebe = (void *) i1480->evt_buf;
 
-        d_fnstart(3, i1480->dev, "(%p)\n", i1480);
         result = __mac_fw_upload(i1480, i1480->mac_fw_name, "MAC");
         if (result == -ENOENT) {
                 result = __mac_fw_upload(i1480, i1480->mac_fw_name_deprecate,
@@ -501,7 +485,6 @@ int i1480_mac_fw_upload(struct i1480 *i1480)
                 dev_err(i1480->dev, "MAC fw '%s': initialization event returns "
                         "wrong size (%zu bytes vs %zu needed)\n",
                         i1480->mac_fw_name, i1480->evt_result, sizeof(*rcebe));
-                dump_bytes(i1480->dev, rcebe, min(i1480->evt_result, (ssize_t)32));
                 goto error_size;
         }
         result = -EIO;
@@ -522,6 +505,5 @@ error_fw_not_running:
 error_init_timeout:
 error_size:
 error_setup:
-        d_fnend(3, i1480->dev, "(i1480 %p) = %d\n", i1480, result);
         return result;
 }
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c
index b7ea525fc06a..686795e97195 100644
--- 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;
 }