aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/irlan
diff options
context:
space:
mode:
Diffstat (limited to 'net/irda/irlan')
-rw-r--r--net/irda/irlan/irlan_client.c10
-rw-r--r--net/irda/irlan/irlan_common.c10
-rw-r--r--net/irda/irlan/irlan_eth.c2
-rw-r--r--net/irda/irlan/irlan_provider.c10
4 files changed, 16 insertions, 16 deletions
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 7ed3af957935..ba1a3fc39b5c 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -198,7 +198,7 @@ static int irlan_client_ctrl_data_indication(void *instance, void *sap,
198 198
199 IRDA_DEBUG(2, "%s()\n", __func__ ); 199 IRDA_DEBUG(2, "%s()\n", __func__ );
200 200
201 self = (struct irlan_cb *) instance; 201 self = instance;
202 202
203 IRDA_ASSERT(self != NULL, return -1;); 203 IRDA_ASSERT(self != NULL, return -1;);
204 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); 204 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -226,8 +226,8 @@ static void irlan_client_ctrl_disconnect_indication(void *instance, void *sap,
226 226
227 IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason); 227 IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
228 228
229 self = (struct irlan_cb *) instance; 229 self = instance;
230 tsap = (struct tsap_cb *) sap; 230 tsap = sap;
231 231
232 IRDA_ASSERT(self != NULL, return;); 232 IRDA_ASSERT(self != NULL, return;);
233 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 233 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -298,7 +298,7 @@ static void irlan_client_ctrl_connect_confirm(void *instance, void *sap,
298 298
299 IRDA_DEBUG(4, "%s()\n", __func__ ); 299 IRDA_DEBUG(4, "%s()\n", __func__ );
300 300
301 self = (struct irlan_cb *) instance; 301 self = instance;
302 302
303 IRDA_ASSERT(self != NULL, return;); 303 IRDA_ASSERT(self != NULL, return;);
304 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 304 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -542,7 +542,7 @@ void irlan_client_get_value_confirm(int result, __u16 obj_id,
542 542
543 IRDA_ASSERT(priv != NULL, return;); 543 IRDA_ASSERT(priv != NULL, return;);
544 544
545 self = (struct irlan_cb *) priv; 545 self = priv;
546 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 546 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
547 547
548 /* We probably don't need to make any more queries */ 548 /* We probably don't need to make any more queries */
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 6130f9d9dbe1..779117636270 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -317,8 +317,8 @@ static void irlan_connect_indication(void *instance, void *sap,
317 317
318 IRDA_DEBUG(2, "%s()\n", __func__ ); 318 IRDA_DEBUG(2, "%s()\n", __func__ );
319 319
320 self = (struct irlan_cb *) instance; 320 self = instance;
321 tsap = (struct tsap_cb *) sap; 321 tsap = sap;
322 322
323 IRDA_ASSERT(self != NULL, return;); 323 IRDA_ASSERT(self != NULL, return;);
324 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 324 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -361,7 +361,7 @@ static void irlan_connect_confirm(void *instance, void *sap,
361{ 361{
362 struct irlan_cb *self; 362 struct irlan_cb *self;
363 363
364 self = (struct irlan_cb *) instance; 364 self = instance;
365 365
366 IRDA_ASSERT(self != NULL, return;); 366 IRDA_ASSERT(self != NULL, return;);
367 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 367 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -406,8 +406,8 @@ static void irlan_disconnect_indication(void *instance,
406 406
407 IRDA_DEBUG(0, "%s(), reason=%d\n", __func__ , reason); 407 IRDA_DEBUG(0, "%s(), reason=%d\n", __func__ , reason);
408 408
409 self = (struct irlan_cb *) instance; 409 self = instance;
410 tsap = (struct tsap_cb *) sap; 410 tsap = sap;
411 411
412 IRDA_ASSERT(self != NULL, return;); 412 IRDA_ASSERT(self != NULL, return;);
413 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 413 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 8ee1ff6c742f..e8d5f4405d68 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -272,7 +272,7 @@ void irlan_eth_flow_indication(void *instance, void *sap, LOCAL_FLOW flow)
272 struct irlan_cb *self; 272 struct irlan_cb *self;
273 struct net_device *dev; 273 struct net_device *dev;
274 274
275 self = (struct irlan_cb *) instance; 275 self = instance;
276 276
277 IRDA_ASSERT(self != NULL, return;); 277 IRDA_ASSERT(self != NULL, return;);
278 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 278 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index b8af74ab8b68..8b61cf0d8a69 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -73,7 +73,7 @@ static int irlan_provider_data_indication(void *instance, void *sap,
73 73
74 IRDA_DEBUG(4, "%s()\n", __func__ ); 74 IRDA_DEBUG(4, "%s()\n", __func__ );
75 75
76 self = (struct irlan_cb *) instance; 76 self = instance;
77 77
78 IRDA_ASSERT(self != NULL, return -1;); 78 IRDA_ASSERT(self != NULL, return -1;);
79 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;); 79 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -131,8 +131,8 @@ static void irlan_provider_connect_indication(void *instance, void *sap,
131 131
132 IRDA_DEBUG(0, "%s()\n", __func__ ); 132 IRDA_DEBUG(0, "%s()\n", __func__ );
133 133
134 self = (struct irlan_cb *) instance; 134 self = instance;
135 tsap = (struct tsap_cb *) sap; 135 tsap = sap;
136 136
137 IRDA_ASSERT(self != NULL, return;); 137 IRDA_ASSERT(self != NULL, return;);
138 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 138 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
@@ -182,8 +182,8 @@ static void irlan_provider_disconnect_indication(void *instance, void *sap,
182 182
183 IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason); 183 IRDA_DEBUG(4, "%s(), reason=%d\n", __func__ , reason);
184 184
185 self = (struct irlan_cb *) instance; 185 self = instance;
186 tsap = (struct tsap_cb *) sap; 186 tsap = sap;
187 187
188 IRDA_ASSERT(self != NULL, return;); 188 IRDA_ASSERT(self != NULL, return;);
189 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); 189 IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);