uwb: use dev_dbg() for debug messages

Instead of the home-grown d_fnstart(), d_fnend() and d_printf() macros,
use dev_dbg() or remove the message entirely.

Signed-off-by: David Vrabel <david.vrabel@csr.com>

1 files changed, 7 insertions, 48 deletions

diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
index 2a4d36fa70b0..8582236e4cad 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
@@ -62,16 +62,12 @@
 #include "../wusbcore/wa-hc.h"
 #include "../wusbcore/wusbhc.h"
 
-#define D_LOCAL 0
-#include <linux/uwb/debug.h>
-
 struct hwahc {
         struct wusbhc wusbhc;   /* has to be 1st */
         struct wahc wa;
-        u8 buffer[16];          /* for misc usb transactions */
 };
 
-/**
+/*
  * FIXME should be wusbhc
  *
  * NOTE: we need to cache the Cluster ID because later...there is no
@@ -125,7 +121,6 @@ static int hwahc_op_reset(struct usb_hcd *usb_hcd)
         struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
         struct device *dev = &hwahc->wa.usb_iface->dev;
 
-        d_fnstart(4, dev, "(hwahc %p)\n", hwahc);
         mutex_lock(&wusbhc->mutex);
         wa_nep_disarm(&hwahc->wa);
         result = __wa_set_feature(&hwahc->wa, WA_RESET);
@@ -133,7 +128,6 @@ static int hwahc_op_reset(struct usb_hcd *usb_hcd)
                 dev_err(dev, "error commanding HC to reset: %d\n", result);
                 goto error_unlock;
         }
-        d_printf(3, dev, "reset: waiting for device to change state\n");
         result = __wa_wait_status(&hwahc->wa, WA_STATUS_RESETTING, 0);
         if (result < 0) {
                 dev_err(dev, "error waiting for HC to reset: %d\n", result);
@@ -141,7 +135,6 @@ static int hwahc_op_reset(struct usb_hcd *usb_hcd)
         }
 error_unlock:
         mutex_unlock(&wusbhc->mutex);
-        d_fnend(4, dev, "(hwahc %p) = %d\n", hwahc, result);
         return result;
 }
 
@@ -154,15 +147,9 @@ static int hwahc_op_start(struct usb_hcd *usb_hcd)
         int result;
         struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);
         struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
-        struct device *dev = &hwahc->wa.usb_iface->dev;
 
-        /* Set up a Host Info WUSB Information Element */
-        d_fnstart(4, dev, "(hwahc %p)\n", hwahc);
         result = -ENOSPC;
         mutex_lock(&wusbhc->mutex);
-        /* Start the numbering from the top so that the bottom
-         * range of the unauth addr space is used for devices,
-         * the top for HCs; use 0xfe - RC# */
         addr = wusb_cluster_id_get();
         if (addr == 0)
                 goto error_cluster_id_get;
@@ -176,7 +163,6 @@ static int hwahc_op_start(struct usb_hcd *usb_hcd)
         result = 0;
 out:
         mutex_unlock(&wusbhc->mutex);
-        d_fnend(4, dev, "(hwahc %p) = %d\n", hwahc, result);
         return result;
 
 error_set_cluster_id:
@@ -213,18 +199,11 @@ static int hwahc_op_resume(struct usb_hcd *usb_hcd)
  */
 static void hwahc_op_stop(struct usb_hcd *usb_hcd)
 {
-        int result;
         struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);
-        struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
-        struct wahc *wa = &hwahc->wa;
-        struct device *dev = &wa->usb_iface->dev;
 
-        d_fnstart(4, dev, "(hwahc %p)\n", hwahc);
         mutex_lock(&wusbhc->mutex);
         wusb_cluster_id_put(wusbhc->cluster_id);
         mutex_unlock(&wusbhc->mutex);
-        d_fnend(4, dev, "(hwahc %p) = %d\n", hwahc, result);
-        return;
 }
 
 static int hwahc_op_get_frame_number(struct usb_hcd *usb_hcd)
@@ -573,11 +552,11 @@ static int wa_fill_descr(struct wahc *wa)
         itr_size = le16_to_cpu(usb_dev->actconfig->desc.wTotalLength);
         while (itr_size >= sizeof(*hdr)) {
                 hdr = (struct usb_descriptor_header *) itr;
-                d_printf(3, dev, "Extra device descriptor: "
-                         "type %02x/%u bytes @ %zu (%zu left)\n",
-                         hdr->bDescriptorType, hdr->bLength,
-                         (itr - usb_dev->rawdescriptors[actconfig_idx]),
-                         itr_size);
+                dev_dbg(dev, "Extra device descriptor: "
+                        "type %02x/%u bytes @ %zu (%zu left)\n",
+                        hdr->bDescriptorType, hdr->bLength,
+                        (itr - usb_dev->rawdescriptors[actconfig_idx]),
+                        itr_size);
                 if (hdr->bDescriptorType == USB_DT_WIRE_ADAPTER)
                         goto found;
                 itr += hdr->bLength;
@@ -786,7 +765,6 @@ static void hwahc_destroy(struct hwahc *hwahc)
 {
         struct wusbhc *wusbhc = &hwahc->wusbhc;
 
-        d_fnstart(1, NULL, "(hwahc %p)\n", hwahc);
         mutex_lock(&wusbhc->mutex);
         __wa_destroy(&hwahc->wa);
         wusbhc_destroy(&hwahc->wusbhc);
@@ -796,7 +774,6 @@ static void hwahc_destroy(struct hwahc *hwahc)
         usb_put_intf(hwahc->wa.usb_iface);
         usb_put_dev(hwahc->wa.usb_dev);
         mutex_unlock(&wusbhc->mutex);
-        d_fnend(1, NULL, "(hwahc %p) = void\n", hwahc);
 }
 
 static void hwahc_init(struct hwahc *hwahc)
@@ -813,7 +790,6 @@ static int hwahc_probe(struct usb_interface *usb_iface,
         struct hwahc *hwahc;
         struct device *dev = &usb_iface->dev;
 
-        d_fnstart(4, dev, "(%p, %p)\n", usb_iface, id);
         result = -ENOMEM;
         usb_hcd = usb_create_hcd(&hwahc_hc_driver, &usb_iface->dev, "wusb-hwa");
         if (usb_hcd == NULL) {
@@ -840,7 +816,6 @@ static int hwahc_probe(struct usb_interface *usb_iface,
                 dev_err(dev, "Cannot setup phase B of WUSBHC: %d\n", result);
                 goto error_wusbhc_b_create;
         }
-        d_fnend(4, dev, "(%p, %p) = 0\n", usb_iface, id);
         return 0;
 
 error_wusbhc_b_create:
@@ -850,7 +825,6 @@ error_add_hcd:
 error_hwahc_create:
         usb_put_hcd(usb_hcd);
 error_alloc:
-        d_fnend(4, dev, "(%p, %p) = %d\n", usb_iface, id, result);
         return result;
 }
 
@@ -864,16 +838,12 @@ static void hwahc_disconnect(struct usb_interface *usb_iface)
         wusbhc = usb_hcd_to_wusbhc(usb_hcd);
         hwahc = container_of(wusbhc, struct hwahc, wusbhc);
 
-        d_fnstart(1, NULL, "(hwahc %p [usb_iface %p])\n", hwahc, usb_iface);
         wusbhc_b_destroy(&hwahc->wusbhc);
         usb_remove_hcd(usb_hcd);
         hwahc_destroy(hwahc);
         usb_put_hcd(usb_hcd);
-        d_fnend(1, NULL, "(hwahc %p [usb_iface %p]) = void\n", hwahc,
-                usb_iface);
 }
 
-/** USB device ID's that we handle */
 static struct usb_device_id hwahc_id_table[] = {
         /* FIXME: use class labels for this */
         { USB_INTERFACE_INFO(0xe0, 0x02, 0x01), },
@@ -890,18 +860,7 @@ static struct usb_driver hwahc_driver = {
 
 static int __init hwahc_driver_init(void)
 {
-        int result;
-        result = usb_register(&hwahc_driver);
-        if (result < 0) {
-                printk(KERN_ERR "WA-CDS: Cannot register USB driver: %d\n",
-                       result);
-                goto error_usb_register;
-        }
-        return 0;
-
-error_usb_register:
-        return result;
-
+        return usb_register(&hwahc_driver);
 }
 module_init(hwahc_driver_init);