2 files changed, 23 insertions, 27 deletions

diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c
index 9d9128ac8c8e..9ec7fd5da489 100644
--- a/drivers/usb/wusbcore/crypto.c
+++ b/drivers/usb/wusbcore/crypto.c
@@ -51,13 +51,18 @@
 #include <linux/uwb.h>
 #include <linux/usb/wusb.h>
 #include <linux/scatterlist.h>
-#include <linux/uwb/debug.h>
 
 static int debug_crypto_verify = 0;
 
 module_param(debug_crypto_verify, int, 0);
 MODULE_PARM_DESC(debug_crypto_verify, "verify the key generation algorithms");
 
+static void wusb_key_dump(const void *buf, size_t len)
+{
+        print_hex_dump(KERN_ERR, "  ", DUMP_PREFIX_OFFSET, 16, 1,
+                       buf, len, 0);
+}
+
 /*
  * Block of data, as understood by AES-CCM
  *
@@ -396,14 +401,14 @@ static int wusb_oob_mic_verify(void)
                        "mismatch between MIC result and WUSB1.0[A2]\n");
                 hs_size = sizeof(stv_hsmic_hs) - sizeof(stv_hsmic_hs.MIC);
                 printk(KERN_ERR "E: Handshake2 in: (%zu bytes)\n", hs_size);
-                dump_bytes(NULL, &stv_hsmic_hs, hs_size);
+                wusb_key_dump(&stv_hsmic_hs, hs_size);
                 printk(KERN_ERR "E: CCM Nonce in: (%zu bytes)\n",
                        sizeof(stv_hsmic_n));
-                dump_bytes(NULL, &stv_hsmic_n, sizeof(stv_hsmic_n));
+                wusb_key_dump(&stv_hsmic_n, sizeof(stv_hsmic_n));
                 printk(KERN_ERR "E: MIC out:\n");
-                dump_bytes(NULL, mic, sizeof(mic));
+                wusb_key_dump(mic, sizeof(mic));
                 printk(KERN_ERR "E: MIC out (from WUSB1.0[A.2]):\n");
-                dump_bytes(NULL, stv_hsmic_hs.MIC, sizeof(stv_hsmic_hs.MIC));
+                wusb_key_dump(stv_hsmic_hs.MIC, sizeof(stv_hsmic_hs.MIC));
                 result = -EINVAL;
         } else
                 result = 0;
@@ -471,19 +476,16 @@ static int wusb_key_derive_verify(void)
                 printk(KERN_ERR "E: WUSB key derivation test: "
                        "mismatch between key derivation result "
                        "and WUSB1.0[A1] Errata 2006/12\n");
-                printk(KERN_ERR "E: keydvt in: key (%zu bytes)\n",
-                       sizeof(stv_key_a1));
-                dump_bytes(NULL, stv_key_a1, sizeof(stv_key_a1));
-                printk(KERN_ERR "E: keydvt in: nonce (%zu bytes)\n",
-                       sizeof(stv_keydvt_n_a1));
-                dump_bytes(NULL, &stv_keydvt_n_a1, sizeof(stv_keydvt_n_a1));
-                printk(KERN_ERR "E: keydvt in: hnonce & dnonce (%zu bytes)\n",
-                       sizeof(stv_keydvt_in_a1));
-                dump_bytes(NULL, &stv_keydvt_in_a1, sizeof(stv_keydvt_in_a1));
+                printk(KERN_ERR "E: keydvt in: key\n");
+                wusb_key_dump(stv_key_a1, sizeof(stv_key_a1));
+                printk(KERN_ERR "E: keydvt in: nonce\n");
+                wusb_key_dump( &stv_keydvt_n_a1, sizeof(stv_keydvt_n_a1));
+                printk(KERN_ERR "E: keydvt in: hnonce & dnonce\n");
+                wusb_key_dump(&stv_keydvt_in_a1, sizeof(stv_keydvt_in_a1));
                 printk(KERN_ERR "E: keydvt out: KCK\n");
-                dump_bytes(NULL, &keydvt_out.kck, sizeof(keydvt_out.kck));
+                wusb_key_dump(&keydvt_out.kck, sizeof(keydvt_out.kck));
                 printk(KERN_ERR "E: keydvt out: PTK\n");
-                dump_bytes(NULL, &keydvt_out.ptk, sizeof(keydvt_out.ptk));
+                wusb_key_dump(&keydvt_out.ptk, sizeof(keydvt_out.ptk));
                 result = -EINVAL;
         } else
                 result = 0;
diff --git a/drivers/usb/wusbcore/wa-nep.c b/drivers/usb/wusbcore/wa-nep.c
index 3f542990c73f..17d2626038be 100644
--- a/drivers/usb/wusbcore/wa-nep.c
+++ b/drivers/usb/wusbcore/wa-nep.c
@@ -51,7 +51,7 @@
  */
 #include <linux/workqueue.h>
 #include <linux/ctype.h>
-#include <linux/uwb/debug.h>
+
 #include "wa-hc.h"
 #include "wusbhc.h"
 
@@ -139,13 +139,10 @@ static void wa_notif_dispatch(struct work_struct *ws)
                         /* FIXME: unimplemented WA NOTIFs */
                         /* fallthru */
                 default:
-                        if (printk_ratelimit()) {
-                                dev_err(dev, "HWA: unknown notification 0x%x, "
-                                        "%zu bytes; discarding\n",
-                                        notif_hdr->bNotifyType,
-                                        (size_t)notif_hdr->bLength);
-                                dump_bytes(dev, notif_hdr, 16);
-                        }
+                        dev_err(dev, "HWA: unknown notification 0x%x, "
+                                "%zu bytes; discarding\n",
+                                notif_hdr->bNotifyType,
+                                (size_t)notif_hdr->bLength);
                         break;
                 }
         }
@@ -160,12 +157,9 @@ out:
          * discard the data, as this should not happen.
          */
 exhausted_buffer:
-        if (!printk_ratelimit())
-                goto out;
         dev_warn(dev, "HWA: device sent short notification, "
                  "%d bytes missing; discarding %d bytes.\n",
                  missing, (int)size);
-        dump_bytes(dev, itr, size);
         goto out;
 }