patch-2.4.23 linux-2.4.23/net/irda/irlan/irlan_client_event.c
Next file: linux-2.4.23/net/irda/irlan/irlan_common.c
Previous file: linux-2.4.23/net/irda/irlan/irlan_client.c
Back to the patch index
Back to the overall index
- Lines: 249
- Date:
2003-11-28 10:26:21.000000000 -0800
- Orig file:
linux-2.4.22/net/irda/irlan/irlan_client_event.c
- Orig date:
2000-11-27 18:07:31.000000000 -0800
diff -urN linux-2.4.22/net/irda/irlan/irlan_client_event.c linux-2.4.23/net/irda/irlan/irlan_client_event.c
@@ -92,7 +92,7 @@
static int irlan_client_state_idle(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -100,8 +100,7 @@
switch (event) {
case IRLAN_DISCOVERY_INDICATION:
if (self->client.iriap) {
- WARNING(__FUNCTION__
- "(), busy with a previous query\n");
+ WARNING("%s(), busy with a previous query\n", __FUNCTION__);
return -EBUSY;
}
@@ -114,10 +113,10 @@
"IrLAN", "IrDA:TinyTP:LsapSel");
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(4, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(4, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -136,7 +135,7 @@
static int irlan_client_state_query(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -154,7 +153,7 @@
irlan_next_client_state(self, IRLAN_CONN);
break;
case IRLAN_IAS_PROVIDER_NOT_AVAIL:
- IRDA_DEBUG(2, __FUNCTION__ "(), IAS_PROVIDER_NOT_AVAIL\n");
+ IRDA_DEBUG(2, "%s(), IAS_PROVIDER_NOT_AVAIL\n", __FUNCTION__);
irlan_next_client_state(self, IRLAN_IDLE);
/* Give the client a kick! */
@@ -167,10 +166,10 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__"(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -189,7 +188,7 @@
static int irlan_client_state_conn(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
@@ -204,10 +203,10 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -224,7 +223,7 @@
static int irlan_client_state_info(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
@@ -244,10 +243,10 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -266,7 +265,7 @@
static int irlan_client_state_media(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
@@ -281,10 +280,10 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -305,7 +304,7 @@
{
struct qos_info qos;
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
@@ -344,7 +343,7 @@
irlan_next_client_state(self, IRLAN_DATA);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), unknown access type!\n");
+ IRDA_DEBUG(2, "%s(), unknown access type!\n", __FUNCTION__);
break;
}
break;
@@ -353,10 +352,10 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
@@ -376,7 +375,7 @@
static int irlan_client_state_wait(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
@@ -390,10 +389,10 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -407,7 +406,7 @@
{
struct qos_info qos;
- IRDA_DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
@@ -429,7 +428,7 @@
} else if (self->client.recv_arb_val >
self->provider.send_arb_val)
{
- IRDA_DEBUG(2, __FUNCTION__ "(), lost the battle :-(\n");
+ IRDA_DEBUG(2, "%s(), lost the battle :-(\n", __FUNCTION__);
}
break;
case IRLAN_DATA_CONNECT_INDICATION:
@@ -440,10 +439,10 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
case IRLAN_WATCHDOG_TIMEOUT:
- IRDA_DEBUG(2, __FUNCTION__ "(), IRLAN_WATCHDOG_TIMEOUT\n");
+ IRDA_DEBUG(2, "%s(), IRLAN_WATCHDOG_TIMEOUT\n", __FUNCTION__);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -462,7 +461,7 @@
static int irlan_client_state_data(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(4, __FUNCTION__ "()\n");
+ IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
ASSERT(self != NULL, return -1;);
ASSERT(self->magic == IRLAN_MAGIC, return -1;);
@@ -476,7 +475,7 @@
irlan_next_client_state(self, IRLAN_IDLE);
break;
default:
- IRDA_DEBUG(2, __FUNCTION__ "(), Unknown event %d\n", event);
+ IRDA_DEBUG(2, "%s(), Unknown event %d\n", __FUNCTION__, event);
break;
}
if (skb)
@@ -494,7 +493,7 @@
static int irlan_client_state_close(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (skb)
dev_kfree_skb(skb);
@@ -511,7 +510,7 @@
static int irlan_client_state_sync(struct irlan_cb *self, IRLAN_EVENT event,
struct sk_buff *skb)
{
- IRDA_DEBUG(2, __FUNCTION__ "()\n");
+ IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
if (skb)
dev_kfree_skb(skb);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)