Commit bce83697 authored by David Vrabel's avatar David Vrabel

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: default avatarDavid Vrabel <david.vrabel@csr.com>
parent 02f11ee1
...@@ -62,16 +62,12 @@ ...@@ -62,16 +62,12 @@
#include "../wusbcore/wa-hc.h" #include "../wusbcore/wa-hc.h"
#include "../wusbcore/wusbhc.h" #include "../wusbcore/wusbhc.h"
#define D_LOCAL 0
#include <linux/uwb/debug.h>
struct hwahc { struct hwahc {
struct wusbhc wusbhc; /* has to be 1st */ struct wusbhc wusbhc; /* has to be 1st */
struct wahc wa; struct wahc wa;
u8 buffer[16]; /* for misc usb transactions */
}; };
/** /*
* FIXME should be wusbhc * FIXME should be wusbhc
* *
* NOTE: we need to cache the Cluster ID because later...there is no * 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) ...@@ -125,7 +121,6 @@ static int hwahc_op_reset(struct usb_hcd *usb_hcd)
struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc); struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
struct device *dev = &hwahc->wa.usb_iface->dev; struct device *dev = &hwahc->wa.usb_iface->dev;
d_fnstart(4, dev, "(hwahc %p)\n", hwahc);
mutex_lock(&wusbhc->mutex); mutex_lock(&wusbhc->mutex);
wa_nep_disarm(&hwahc->wa); wa_nep_disarm(&hwahc->wa);
result = __wa_set_feature(&hwahc->wa, WA_RESET); result = __wa_set_feature(&hwahc->wa, WA_RESET);
...@@ -133,7 +128,6 @@ static int hwahc_op_reset(struct usb_hcd *usb_hcd) ...@@ -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); dev_err(dev, "error commanding HC to reset: %d\n", result);
goto error_unlock; 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); result = __wa_wait_status(&hwahc->wa, WA_STATUS_RESETTING, 0);
if (result < 0) { if (result < 0) {
dev_err(dev, "error waiting for HC to reset: %d\n", result); 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) ...@@ -141,7 +135,6 @@ static int hwahc_op_reset(struct usb_hcd *usb_hcd)
} }
error_unlock: error_unlock:
mutex_unlock(&wusbhc->mutex); mutex_unlock(&wusbhc->mutex);
d_fnend(4, dev, "(hwahc %p) = %d\n", hwahc, result);
return result; return result;
} }
...@@ -154,15 +147,9 @@ static int hwahc_op_start(struct usb_hcd *usb_hcd) ...@@ -154,15 +147,9 @@ static int hwahc_op_start(struct usb_hcd *usb_hcd)
int result; int result;
struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd); struct wusbhc *wusbhc = usb_hcd_to_wusbhc(usb_hcd);
struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc); 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; result = -ENOSPC;
mutex_lock(&wusbhc->mutex); 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(); addr = wusb_cluster_id_get();
if (addr == 0) if (addr == 0)
goto error_cluster_id_get; goto error_cluster_id_get;
...@@ -176,7 +163,6 @@ static int hwahc_op_start(struct usb_hcd *usb_hcd) ...@@ -176,7 +163,6 @@ static int hwahc_op_start(struct usb_hcd *usb_hcd)
result = 0; result = 0;
out: out:
mutex_unlock(&wusbhc->mutex); mutex_unlock(&wusbhc->mutex);
d_fnend(4, dev, "(hwahc %p) = %d\n", hwahc, result);
return result; return result;
error_set_cluster_id: error_set_cluster_id:
...@@ -213,18 +199,11 @@ static int hwahc_op_resume(struct usb_hcd *usb_hcd) ...@@ -213,18 +199,11 @@ static int hwahc_op_resume(struct usb_hcd *usb_hcd)
*/ */
static void hwahc_op_stop(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 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); mutex_lock(&wusbhc->mutex);
wusb_cluster_id_put(wusbhc->cluster_id); wusb_cluster_id_put(wusbhc->cluster_id);
mutex_unlock(&wusbhc->mutex); 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) static int hwahc_op_get_frame_number(struct usb_hcd *usb_hcd)
...@@ -573,7 +552,7 @@ static int wa_fill_descr(struct wahc *wa) ...@@ -573,7 +552,7 @@ static int wa_fill_descr(struct wahc *wa)
itr_size = le16_to_cpu(usb_dev->actconfig->desc.wTotalLength); itr_size = le16_to_cpu(usb_dev->actconfig->desc.wTotalLength);
while (itr_size >= sizeof(*hdr)) { while (itr_size >= sizeof(*hdr)) {
hdr = (struct usb_descriptor_header *) itr; hdr = (struct usb_descriptor_header *) itr;
d_printf(3, dev, "Extra device descriptor: " dev_dbg(dev, "Extra device descriptor: "
"type %02x/%u bytes @ %zu (%zu left)\n", "type %02x/%u bytes @ %zu (%zu left)\n",
hdr->bDescriptorType, hdr->bLength, hdr->bDescriptorType, hdr->bLength,
(itr - usb_dev->rawdescriptors[actconfig_idx]), (itr - usb_dev->rawdescriptors[actconfig_idx]),
...@@ -786,7 +765,6 @@ static void hwahc_destroy(struct hwahc *hwahc) ...@@ -786,7 +765,6 @@ static void hwahc_destroy(struct hwahc *hwahc)
{ {
struct wusbhc *wusbhc = &hwahc->wusbhc; struct wusbhc *wusbhc = &hwahc->wusbhc;
d_fnstart(1, NULL, "(hwahc %p)\n", hwahc);
mutex_lock(&wusbhc->mutex); mutex_lock(&wusbhc->mutex);
__wa_destroy(&hwahc->wa); __wa_destroy(&hwahc->wa);
wusbhc_destroy(&hwahc->wusbhc); wusbhc_destroy(&hwahc->wusbhc);
...@@ -796,7 +774,6 @@ static void hwahc_destroy(struct hwahc *hwahc) ...@@ -796,7 +774,6 @@ static void hwahc_destroy(struct hwahc *hwahc)
usb_put_intf(hwahc->wa.usb_iface); usb_put_intf(hwahc->wa.usb_iface);
usb_put_dev(hwahc->wa.usb_dev); usb_put_dev(hwahc->wa.usb_dev);
mutex_unlock(&wusbhc->mutex); mutex_unlock(&wusbhc->mutex);
d_fnend(1, NULL, "(hwahc %p) = void\n", hwahc);
} }
static void hwahc_init(struct hwahc *hwahc) static void hwahc_init(struct hwahc *hwahc)
...@@ -813,7 +790,6 @@ static int hwahc_probe(struct usb_interface *usb_iface, ...@@ -813,7 +790,6 @@ static int hwahc_probe(struct usb_interface *usb_iface,
struct hwahc *hwahc; struct hwahc *hwahc;
struct device *dev = &usb_iface->dev; struct device *dev = &usb_iface->dev;
d_fnstart(4, dev, "(%p, %p)\n", usb_iface, id);
result = -ENOMEM; result = -ENOMEM;
usb_hcd = usb_create_hcd(&hwahc_hc_driver, &usb_iface->dev, "wusb-hwa"); usb_hcd = usb_create_hcd(&hwahc_hc_driver, &usb_iface->dev, "wusb-hwa");
if (usb_hcd == NULL) { if (usb_hcd == NULL) {
...@@ -840,7 +816,6 @@ static int hwahc_probe(struct usb_interface *usb_iface, ...@@ -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); dev_err(dev, "Cannot setup phase B of WUSBHC: %d\n", result);
goto error_wusbhc_b_create; goto error_wusbhc_b_create;
} }
d_fnend(4, dev, "(%p, %p) = 0\n", usb_iface, id);
return 0; return 0;
error_wusbhc_b_create: error_wusbhc_b_create:
...@@ -850,7 +825,6 @@ error_add_hcd: ...@@ -850,7 +825,6 @@ error_add_hcd:
error_hwahc_create: error_hwahc_create:
usb_put_hcd(usb_hcd); usb_put_hcd(usb_hcd);
error_alloc: error_alloc:
d_fnend(4, dev, "(%p, %p) = %d\n", usb_iface, id, result);
return result; return result;
} }
...@@ -864,16 +838,12 @@ static void hwahc_disconnect(struct usb_interface *usb_iface) ...@@ -864,16 +838,12 @@ static void hwahc_disconnect(struct usb_interface *usb_iface)
wusbhc = usb_hcd_to_wusbhc(usb_hcd); wusbhc = usb_hcd_to_wusbhc(usb_hcd);
hwahc = container_of(wusbhc, struct hwahc, wusbhc); 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); wusbhc_b_destroy(&hwahc->wusbhc);
usb_remove_hcd(usb_hcd); usb_remove_hcd(usb_hcd);
hwahc_destroy(hwahc); hwahc_destroy(hwahc);
usb_put_hcd(usb_hcd); 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[] = { static struct usb_device_id hwahc_id_table[] = {
/* FIXME: use class labels for this */ /* FIXME: use class labels for this */
{ USB_INTERFACE_INFO(0xe0, 0x02, 0x01), }, { USB_INTERFACE_INFO(0xe0, 0x02, 0x01), },
...@@ -890,18 +860,7 @@ static struct usb_driver hwahc_driver = { ...@@ -890,18 +860,7 @@ static struct usb_driver hwahc_driver = {
static int __init hwahc_driver_init(void) static int __init hwahc_driver_init(void)
{ {
int result; return usb_register(&hwahc_driver);
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;
} }
module_init(hwahc_driver_init); module_init(hwahc_driver_init);
......
...@@ -51,7 +51,6 @@ ...@@ -51,7 +51,6 @@
#include <linux/uwb.h> #include <linux/uwb.h>
#include <linux/usb/wusb.h> #include <linux/usb/wusb.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#define D_LOCAL 0
#include <linux/uwb/debug.h> #include <linux/uwb/debug.h>
static int debug_crypto_verify = 0; static int debug_crypto_verify = 0;
...@@ -207,9 +206,6 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc, ...@@ -207,9 +206,6 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc,
const u8 bzero[16] = { 0 }; const u8 bzero[16] = { 0 };
size_t zero_padding; size_t zero_padding;
d_fnstart(3, NULL, "(tfm_cbc %p, tfm_aes %p, mic %p, "
"n %p, a %p, b %p, blen %zu)\n",
tfm_cbc, tfm_aes, mic, n, a, b, blen);
/* /*
* These checks should be compile time optimized out * These checks should be compile time optimized out
* ensure @a fills b1's mac_header and following fields * ensure @a fills b1's mac_header and following fields
...@@ -251,16 +247,6 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc, ...@@ -251,16 +247,6 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc,
b1.la = cpu_to_be16(blen + 14); b1.la = cpu_to_be16(blen + 14);
memcpy(&b1.mac_header, a, sizeof(*a)); memcpy(&b1.mac_header, a, sizeof(*a));
d_printf(4, NULL, "I: B0 (%zu bytes)\n", sizeof(b0));
d_dump(4, NULL, &b0, sizeof(b0));
d_printf(4, NULL, "I: B1 (%zu bytes)\n", sizeof(b1));
d_dump(4, NULL, &b1, sizeof(b1));
d_printf(4, NULL, "I: B (%zu bytes)\n", blen);
d_dump(4, NULL, b, blen);
d_printf(4, NULL, "I: B 0-padding (%zu bytes)\n", zero_padding);
d_printf(4, NULL, "D: IV before crypto (%zu)\n", ivsize);
d_dump(4, NULL, iv, ivsize);
sg_init_table(sg, ARRAY_SIZE(sg)); sg_init_table(sg, ARRAY_SIZE(sg));
sg_set_buf(&sg[0], &b0, sizeof(b0)); sg_set_buf(&sg[0], &b0, sizeof(b0));
sg_set_buf(&sg[1], &b1, sizeof(b1)); sg_set_buf(&sg[1], &b1, sizeof(b1));
...@@ -277,8 +263,6 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc, ...@@ -277,8 +263,6 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc,
result); result);
goto error_cbc_crypt; goto error_cbc_crypt;
} }
d_printf(4, NULL, "D: MIC tag\n");
d_dump(4, NULL, iv, ivsize);
/* Now we crypt the MIC Tag (*iv) with Ax -- values per WUSB1.0[6.5] /* Now we crypt the MIC Tag (*iv) with Ax -- values per WUSB1.0[6.5]
* The procedure is to AES crypt the A0 block and XOR the MIC * The procedure is to AES crypt the A0 block and XOR the MIC
...@@ -293,17 +277,10 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc, ...@@ -293,17 +277,10 @@ static int wusb_ccm_mac(struct crypto_blkcipher *tfm_cbc,
ax.counter = 0; ax.counter = 0;
crypto_cipher_encrypt_one(tfm_aes, (void *)&ax, (void *)&ax); crypto_cipher_encrypt_one(tfm_aes, (void *)&ax, (void *)&ax);
bytewise_xor(mic, &ax, iv, 8); bytewise_xor(mic, &ax, iv, 8);
d_printf(4, NULL, "D: CTR[MIC]\n");
d_dump(4, NULL, &ax, 8);
d_printf(4, NULL, "D: CCM-MIC tag\n");
d_dump(4, NULL, mic, 8);
result = 8; result = 8;
error_cbc_crypt: error_cbc_crypt:
kfree(dst_buf); kfree(dst_buf);
error_dst_buf: error_dst_buf:
d_fnend(3, NULL, "(tfm_cbc %p, tfm_aes %p, mic %p, "
"n %p, a %p, b %p, blen %zu)\n",
tfm_cbc, tfm_aes, mic, n, a, b, blen);
return result; return result;
} }
...@@ -325,10 +302,6 @@ ssize_t wusb_prf(void *out, size_t out_size, ...@@ -325,10 +302,6 @@ ssize_t wusb_prf(void *out, size_t out_size,
u64 sfn = 0; u64 sfn = 0;
__le64 sfn_le; __le64 sfn_le;
d_fnstart(3, NULL, "(out %p, out_size %zu, key %p, _n %p, "
"a %p, b %p, blen %zu, len %zu)\n", out, out_size,
key, _n, a, b, blen, len);
tfm_cbc = crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC); tfm_cbc = crypto_alloc_blkcipher("cbc(aes)", 0, CRYPTO_ALG_ASYNC);
if (IS_ERR(tfm_cbc)) { if (IS_ERR(tfm_cbc)) {
result = PTR_ERR(tfm_cbc); result = PTR_ERR(tfm_cbc);
...@@ -370,9 +343,6 @@ error_alloc_aes: ...@@ -370,9 +343,6 @@ error_alloc_aes:
error_setkey_cbc: error_setkey_cbc:
crypto_free_blkcipher(tfm_cbc); crypto_free_blkcipher(tfm_cbc);
error_alloc_cbc: error_alloc_cbc:
d_fnend(3, NULL, "(out %p, out_size %zu, key %p, _n %p, "
"a %p, b %p, blen %zu, len %zu) = %d\n", out, out_size,
key, _n, a, b, blen, len, (int)bytes);
return result; return result;
} }
......
...@@ -28,10 +28,6 @@ ...@@ -28,10 +28,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "wusbhc.h" #include "wusbhc.h"
#undef D_LOCAL
#define D_LOCAL 4
#include <linux/uwb/debug.h>
static ssize_t wusb_disconnect_store(struct device *dev, static ssize_t wusb_disconnect_store(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t size) const char *buf, size_t size)
......
...@@ -91,10 +91,6 @@ ...@@ -91,10 +91,6 @@
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "wusbhc.h" #include "wusbhc.h"
#undef D_LOCAL
#define D_LOCAL 1
#include <linux/uwb/debug.h>
static void wusbhc_devconnect_acked_work(struct work_struct *work); static void wusbhc_devconnect_acked_work(struct work_struct *work);
static void wusb_dev_free(struct wusb_dev *wusb_dev) static void wusb_dev_free(struct wusb_dev *wusb_dev)
...@@ -234,6 +230,7 @@ static struct wusb_dev *wusbhc_cack_add(struct wusbhc *wusbhc, ...@@ -234,6 +230,7 @@ static struct wusb_dev *wusbhc_cack_add(struct wusbhc *wusbhc,
list_add_tail(&wusb_dev->cack_node, &wusbhc->cack_list); list_add_tail(&wusb_dev->cack_node, &wusbhc->cack_list);
wusbhc->cack_count++; wusbhc->cack_count++;
wusbhc_fill_cack_ie(wusbhc); wusbhc_fill_cack_ie(wusbhc);
return wusb_dev; return wusb_dev;
} }
...@@ -244,12 +241,9 @@ static struct wusb_dev *wusbhc_cack_add(struct wusbhc *wusbhc, ...@@ -244,12 +241,9 @@ static struct wusb_dev *wusbhc_cack_add(struct wusbhc *wusbhc,
*/ */
static void wusbhc_cack_rm(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev) static void wusbhc_cack_rm(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev)
{ {
struct device *dev = wusbhc->dev;
d_fnstart(3, dev, "(wusbhc %p wusb_dev %p)\n", wusbhc, wusb_dev);
list_del_init(&wusb_dev->cack_node); list_del_init(&wusb_dev->cack_node);
wusbhc->cack_count--; wusbhc->cack_count--;
wusbhc_fill_cack_ie(wusbhc); wusbhc_fill_cack_ie(wusbhc);
d_fnend(3, dev, "(wusbhc %p wusb_dev %p) = void\n", wusbhc, wusb_dev);
} }
/* /*
...@@ -257,14 +251,11 @@ static void wusbhc_cack_rm(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev) ...@@ -257,14 +251,11 @@ static void wusbhc_cack_rm(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev)
static static
void wusbhc_devconnect_acked(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev) void wusbhc_devconnect_acked(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev)
{ {
struct device *dev = wusbhc->dev;
d_fnstart(3, dev, "(wusbhc %p wusb_dev %p)\n", wusbhc, wusb_dev);
wusbhc_cack_rm(wusbhc, wusb_dev); wusbhc_cack_rm(wusbhc, wusb_dev);
if (wusbhc->cack_count) if (wusbhc->cack_count)
wusbhc_mmcie_set(wusbhc, 0, 0, &wusbhc->cack_ie.hdr); wusbhc_mmcie_set(wusbhc, 0, 0, &wusbhc->cack_ie.hdr);
else else
wusbhc_mmcie_rm(wusbhc, &wusbhc->cack_ie.hdr); wusbhc_mmcie_rm(wusbhc, &wusbhc->cack_ie.hdr);
d_fnend(3, dev, "(wusbhc %p wusb_dev %p) = void\n", wusbhc, wusb_dev);
} }
static void wusbhc_devconnect_acked_work(struct work_struct *work) static void wusbhc_devconnect_acked_work(struct work_struct *work)
...@@ -314,7 +305,6 @@ void wusbhc_devconnect_ack(struct wusbhc *wusbhc, struct wusb_dn_connect *dnc, ...@@ -314,7 +305,6 @@ void wusbhc_devconnect_ack(struct wusbhc *wusbhc, struct wusb_dn_connect *dnc,
struct wusb_port *port; struct wusb_port *port;
unsigned idx, devnum; unsigned idx, devnum;
d_fnstart(3, dev, "(%p, %p, %s)\n", wusbhc, dnc, pr_cdid);
mutex_lock(&wusbhc->mutex); mutex_lock(&wusbhc->mutex);
/* Check we are not handling it already */ /* Check we are not handling it already */
...@@ -367,7 +357,6 @@ void wusbhc_devconnect_ack(struct wusbhc *wusbhc, struct wusb_dn_connect *dnc, ...@@ -367,7 +357,6 @@ void wusbhc_devconnect_ack(struct wusbhc *wusbhc, struct wusb_dn_connect *dnc,
*/ */
error_unlock: error_unlock:
mutex_unlock(&wusbhc->mutex); mutex_unlock(&wusbhc->mutex);
d_fnend(3, dev, "(%p, %p, %s) = void\n", wusbhc, dnc, pr_cdid);
return; return;
} }
...@@ -390,10 +379,8 @@ error_unlock: ...@@ -390,10 +379,8 @@ error_unlock:
static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc, static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc,
struct wusb_port *port) struct wusb_port *port)
{ {
struct device *dev = wusbhc->dev;
struct wusb_dev *wusb_dev = port->wusb_dev; struct wusb_dev *wusb_dev = port->wusb_dev;
d_fnstart(3, dev, "(wusbhc %p, port %p)\n", wusbhc, port);
port->status &= ~(USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE port->status &= ~(USB_PORT_STAT_CONNECTION | USB_PORT_STAT_ENABLE
| USB_PORT_STAT_SUSPEND | USB_PORT_STAT_RESET | USB_PORT_STAT_SUSPEND | USB_PORT_STAT_RESET
| USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED); | USB_PORT_STAT_LOW_SPEED | USB_PORT_STAT_HIGH_SPEED);
...@@ -410,7 +397,6 @@ static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc, ...@@ -410,7 +397,6 @@ static void __wusbhc_dev_disconnect(struct wusbhc *wusbhc,
* section 6.2.11.2). */ * section 6.2.11.2). */
wusbhc_gtk_rekey(wusbhc); wusbhc_gtk_rekey(wusbhc);
d_fnend(3, dev, "(wusbhc %p, port %p) = void\n", wusbhc, port);
/* The Wireless USB part has forgotten about the device already; now /* The Wireless USB part has forgotten about the device already; now
* khubd's timer will pick up the disconnection and remove the USB * khubd's timer will pick up the disconnection and remove the USB
* device from the system * device from the system
...@@ -535,10 +521,6 @@ static struct wusb_dev *wusbhc_find_dev_by_addr(struct wusbhc *wusbhc, u8 addr) ...@@ -535,10 +521,6 @@ static struct wusb_dev *wusbhc_find_dev_by_addr(struct wusbhc *wusbhc, u8 addr)
*/ */
static void wusbhc_handle_dn_alive(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev) static void wusbhc_handle_dn_alive(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev)
{ {
struct device *dev = wusbhc->dev;
d_printf(2, dev, "DN ALIVE: device 0x%02x pong\n", wusb_dev->addr);
mutex_lock(&wusbhc->mutex); mutex_lock(&wusbhc->mutex);
wusb_dev->entry_ts = jiffies; wusb_dev->entry_ts = jiffies;
__wusbhc_keep_alive(wusbhc); __wusbhc_keep_alive(wusbhc);
...@@ -571,11 +553,10 @@ static void wusbhc_handle_dn_connect(struct wusbhc *wusbhc, ...@@ -571,11 +553,10 @@ static void wusbhc_handle_dn_connect(struct wusbhc *wusbhc,
"no-beacon" "no-beacon"
}; };
d_fnstart(3, dev, "(%p, %p, %zu)\n", wusbhc, dn_hdr, size);
if (size < sizeof(*dnc)) { if (size < sizeof(*dnc)) {
dev_err(dev, "DN CONNECT: short notification (%zu < %zu)\n", dev_err(dev, "DN CONNECT: short notification (%zu < %zu)\n",
size, sizeof(*dnc)); size, sizeof(*dnc));
goto out; return;
} }
dnc = container_of(dn_hdr, struct wusb_dn_connect, hdr); dnc = container_of(dn_hdr, struct wusb_dn_connect, hdr);
...@@ -587,10 +568,6 @@ static void wusbhc_handle_dn_connect(struct wusbhc *wusbhc, ...@@ -587,10 +568,6 @@ static void wusbhc_handle_dn_connect(struct wusbhc *wusbhc,
wusb_dn_connect_new_connection(dnc) ? "connect" : "reconnect"); wusb_dn_connect_new_connection(dnc) ? "connect" : "reconnect");
/* ACK the connect */ /* ACK the connect */
wusbhc_devconnect_ack(wusbhc, dnc, pr_cdid); wusbhc_devconnect_ack(wusbhc, dnc, pr_cdid);
out:
d_fnend(3, dev, "(%p, %p, %zu) = void\n",
wusbhc, dn_hdr, size);
return;
} }
/* /*
...@@ -631,19 +608,17 @@ void wusbhc_handle_dn(struct wusbhc *wusbhc, u8 srcaddr, ...@@ -631,19 +608,17 @@ void wusbhc_handle_dn(struct wusbhc *wusbhc, u8 srcaddr,
struct device *dev = wusbhc->dev; struct device *dev = wusbhc->dev;
struct wusb_dev *wusb_dev; struct wusb_dev *wusb_dev;
d_fnstart(3, dev, "(%p, %p)\n", wusbhc, dn_hdr);
if (size < sizeof(struct wusb_dn_hdr)) { if (size < sizeof(struct wusb_dn_hdr)) {
dev_err(dev, "DN data shorter than DN header (%d < %d)\n", dev_err(dev, "DN data shorter than DN header (%d < %d)\n",
(int)size, (int)sizeof(struct wusb_dn_hdr)); (int)size, (int)sizeof(struct wusb_dn_hdr));
goto out; return;
} }
wusb_dev = wusbhc_find_dev_by_addr(wusbhc, srcaddr); wusb_dev = wusbhc_find_dev_by_addr(wusbhc, srcaddr);
if (wusb_dev == NULL && dn_hdr->bType != WUSB_DN_CONNECT) { if (wusb_dev == NULL && dn_hdr->bType != WUSB_DN_CONNECT) {
dev_dbg(dev, "ignoring DN %d from unconnected device %02x\n", dev_dbg(dev, "ignoring DN %d from unconnected device %02x\n",
dn_hdr->bType, srcaddr); dn_hdr->bType, srcaddr);
goto out; return;
} }
switch (dn_hdr->bType) { switch (dn_hdr->bType) {
...@@ -668,9 +643,6 @@ void wusbhc_handle_dn(struct wusbhc *wusbhc, u8 srcaddr, ...@@ -668,9 +643,6 @@ void wusbhc_handle_dn(struct wusbhc *wusbhc, u8 srcaddr,
dev_warn(dev, "unknown DN %u (%d octets) from %u\n", dev_warn(dev, "unknown DN %u (%d octets) from %u\n",
dn_hdr->bType, (int)size, srcaddr); dn_hdr->bType, (int)size, srcaddr);
} }
out:
d_fnend(3, dev, "(%p, %p) = void\n", wusbhc, dn_hdr);
return;
} }