summaryrefslogtreecommitdiffstats
path: root/net/irda/discovery.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda/discovery.c')
-rw-r--r--net/irda/discovery.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/net/irda/discovery.c b/net/irda/discovery.c
index 6786e7f193d2..364d70aed068 100644
--- a/net/irda/discovery.c
+++ b/net/irda/discovery.c
@@ -112,8 +112,6 @@ void irlmp_add_discovery_log(hashbin_t *cachelog, hashbin_t *log)
112{ 112{
113 discovery_t *discovery; 113 discovery_t *discovery;
114 114
115 IRDA_DEBUG(4, "%s()\n", __func__);
116
117 /* 115 /*
118 * If log is missing this means that IrLAP was unable to perform the 116 * If log is missing this means that IrLAP was unable to perform the
119 * discovery, so restart discovery again with just the half timeout 117 * discovery, so restart discovery again with just the half timeout
@@ -159,8 +157,6 @@ void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force)
159 int i = 0; /* How many we expired */ 157 int i = 0; /* How many we expired */
160 158
161 IRDA_ASSERT(log != NULL, return;); 159 IRDA_ASSERT(log != NULL, return;);
162 IRDA_DEBUG(4, "%s()\n", __func__);
163
164 spin_lock_irqsave(&log->hb_spinlock, flags); 160 spin_lock_irqsave(&log->hb_spinlock, flags);
165 161
166 discovery = (discovery_t *) hashbin_get_first(log); 162 discovery = (discovery_t *) hashbin_get_first(log);
@@ -232,10 +228,10 @@ void irlmp_dump_discoveries(hashbin_t *log)
232 228
233 discovery = (discovery_t *) hashbin_get_first(log); 229 discovery = (discovery_t *) hashbin_get_first(log);
234 while (discovery != NULL) { 230 while (discovery != NULL) {
235 IRDA_DEBUG(0, "Discovery:\n"); 231 pr_debug("Discovery:\n");
236 IRDA_DEBUG(0, " daddr=%08x\n", discovery->data.daddr); 232 pr_debug(" daddr=%08x\n", discovery->data.daddr);
237 IRDA_DEBUG(0, " saddr=%08x\n", discovery->data.saddr); 233 pr_debug(" saddr=%08x\n", discovery->data.saddr);
238 IRDA_DEBUG(0, " nickname=%s\n", discovery->data.info); 234 pr_debug(" nickname=%s\n", discovery->data.info);
239 235
240 discovery = (discovery_t *) hashbin_get_next(log); 236 discovery = (discovery_t *) hashbin_get_next(log);
241 } 237 }