diff options
Diffstat (limited to 'net/irda/iriap_event.c')
| -rw-r--r-- | net/irda/iriap_event.c | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c index ce209ad44eaf..a73607450de1 100644 --- a/net/irda/iriap_event.c +++ b/net/irda/iriap_event.c @@ -93,32 +93,32 @@ static void (*iriap_state[])(struct iriap_cb *self, IRIAP_EVENT event, void iriap_next_client_state(struct iriap_cb *self, IRIAP_STATE state) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); self->client_state = state; } void iriap_next_call_state(struct iriap_cb *self, IRIAP_STATE state) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); self->call_state = state; } void iriap_next_server_state(struct iriap_cb *self, IRIAP_STATE state) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); self->server_state = state; } void iriap_next_r_connect_state(struct iriap_cb *self, IRIAP_STATE state) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); self->r_connect_state = state; } @@ -126,8 +126,8 @@ void iriap_next_r_connect_state(struct iriap_cb *self, IRIAP_STATE state) void iriap_do_client_event(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); (*iriap_state[ self->client_state]) (self, event, skb); } @@ -135,8 +135,8 @@ void iriap_do_client_event(struct iriap_cb *self, IRIAP_EVENT event, void iriap_do_call_event(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); (*iriap_state[ self->call_state]) (self, event, skb); } @@ -144,8 +144,8 @@ void iriap_do_call_event(struct iriap_cb *self, IRIAP_EVENT event, void iriap_do_server_event(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); (*iriap_state[ self->server_state]) (self, event, skb); } @@ -153,8 +153,8 @@ void iriap_do_server_event(struct iriap_cb *self, IRIAP_EVENT event, void iriap_do_r_connect_event(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); (*iriap_state[ self->r_connect_state]) (self, event, skb); } @@ -169,13 +169,13 @@ void iriap_do_r_connect_event(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_disconnect(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); switch (event) { case IAP_CALL_REQUEST_GVBC: iriap_next_client_state(self, S_CONNECTING); - ASSERT(self->request_skb == NULL, return;); + IRDA_ASSERT(self->request_skb == NULL, return;); /* Don't forget to refcount it - * see iriap_getvaluebyclass_request(). */ skb_get(skb); @@ -199,8 +199,8 @@ static void state_s_disconnect(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_connecting(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); switch (event) { case IAP_LM_CONNECT_CONFIRM: @@ -232,7 +232,7 @@ static void state_s_connecting(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_call(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); + IRDA_ASSERT(self != NULL, return;); switch (event) { case IAP_LM_DISCONNECT_INDICATION: @@ -257,7 +257,7 @@ static void state_s_make_call(struct iriap_cb *self, IRIAP_EVENT event, { struct sk_buff *tx_skb; - ASSERT(self != NULL, return;); + IRDA_ASSERT(self != NULL, return;); switch (event) { case IAP_CALL_REQUEST: @@ -295,7 +295,7 @@ static void state_s_calling(struct iriap_cb *self, IRIAP_EVENT event, static void state_s_outstanding(struct iriap_cb *self, IRIAP_EVENT event, struct sk_buff *skb) { - ASSERT(self != NULL, return;); + IRDA_ASSERT(self != NULL, return;); switch (event) { case IAP_RECV_F_LST: @@ -367,7 +367,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event, case IAP_LM_CONNECT_INDICATION: tx_skb = dev_alloc_skb(64); if (tx_skb == NULL) { - WARNING("%s: unable to malloc!\n", __FUNCTION__); + IRDA_WARNING("%s: unable to malloc!\n", __FUNCTION__); return; } @@ -464,9 +464,9 @@ static void state_r_execute(struct iriap_cb *self, IRIAP_EVENT event, { IRDA_DEBUG(4, "%s()\n", __FUNCTION__); - ASSERT(skb != NULL, return;); - ASSERT(self != NULL, return;); - ASSERT(self->magic == IAS_MAGIC, return;); + IRDA_ASSERT(skb != NULL, return;); + IRDA_ASSERT(self != NULL, return;); + IRDA_ASSERT(self->magic == IAS_MAGIC, return;); switch (event) { case IAP_CALL_RESPONSE: |