vserver 2.0 rc7

[linux-2.6.git] / net / irda / ircomm / ircomm_tty_attach.c

diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c
index e01be88..99f5edd 100644 (file)
--- a/net/irda/ircomm/ircomm_tty_attach.c
+++ b/net/irda/ircomm/ircomm_tty_attach.c
@@ -132,8 +132,8 @@ int ircomm_tty_attach_cable(struct ircomm_tty_cb *self)
 {
        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return -1;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+       IRDA_ASSERT(self != NULL, return -1;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
                /* Check if somebody has already connected to us */
        if (ircomm_is_connected(self->ircomm)) {
@@ -161,8 +161,8 @@ void ircomm_tty_detach_cable(struct ircomm_tty_cb *self)
 {
        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        del_timer(&self->watchdog_timer);
 
@@ -210,8 +210,8 @@ static void ircomm_tty_ias_register(struct ircomm_tty_cb *self)
 
        IRDA_DEBUG(0, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
        
        /* Compute hint bits based on service */
        hints = irlmp_service_to_hint(S_COMM);
@@ -299,8 +299,8 @@ static void ircomm_tty_ias_unregister(struct ircomm_tty_cb *self)
  */
 int ircomm_tty_send_initial_parameters(struct ircomm_tty_cb *self)
 {
-       ASSERT(self != NULL, return -1;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+       IRDA_ASSERT(self != NULL, return -1;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
        if (self->service_type & IRCOMM_3_WIRE_RAW) 
                return 0;
@@ -387,7 +387,7 @@ static void ircomm_tty_discovery_indication(discinfo_t *discovery,
         * need to ensure that "line" is unique. - Jean II */
        self = (struct ircomm_tty_cb *) hashbin_get_first(ircomm_tty);
        while (self != NULL) {
-               ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+               IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
                
                ircomm_tty_do_event(self, IRCOMM_TTY_DISCOVERY_INDICATION, 
                                    NULL, &info);
@@ -410,8 +410,8 @@ void ircomm_tty_disconnect_indication(void *instance, void *sap,
 
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        if (!self->tty)
                return;
@@ -440,8 +440,8 @@ static void ircomm_tty_getvalue_confirm(int result, __u16 obj_id,
 
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        /* We probably don't need to make any more queries */
        iriap_close(self->iriap);
@@ -501,8 +501,8 @@ void ircomm_tty_connect_confirm(void *instance, void *sap,
 
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        self->client = TRUE;
        self->max_data_size = max_data_size;
@@ -532,8 +532,8 @@ void ircomm_tty_connect_indication(void *instance, void *sap,
 
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        self->client = FALSE;
        self->max_data_size = max_data_size;
@@ -561,8 +561,8 @@ void ircomm_tty_link_established(struct ircomm_tty_cb *self)
 {
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        if (!self->tty)
                return;
@@ -600,8 +600,8 @@ void ircomm_tty_link_established(struct ircomm_tty_cb *self)
 static void ircomm_tty_start_watchdog_timer(struct ircomm_tty_cb *self,
                                            int timeout)
 {
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        irda_start_timer(&self->watchdog_timer, timeout, (void *) self,
                         ircomm_tty_watchdog_timer_expired);
@@ -619,8 +619,8 @@ static void ircomm_tty_watchdog_timer_expired(void *data)
        
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        ircomm_tty_do_event(self, IRCOMM_TTY_WD_TIMER_EXPIRED, NULL, NULL);
 }
@@ -635,8 +635,8 @@ static void ircomm_tty_watchdog_timer_expired(void *data)
 int ircomm_tty_do_event(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
                        struct sk_buff *skb, struct ircomm_tty_info *info) 
 {
-       ASSERT(self != NULL, return -1;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
+       IRDA_ASSERT(self != NULL, return -1;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
        IRDA_DEBUG(2, "%s: state=%s, event=%s\n", __FUNCTION__ ,
                   ircomm_tty_state[self->state], ircomm_tty_event[event]);
@@ -653,8 +653,8 @@ int ircomm_tty_do_event(struct ircomm_tty_cb *self, IRCOMM_TTY_EVENT event,
 static inline void ircomm_tty_next_state(struct ircomm_tty_cb *self, IRCOMM_TTY_STATE state)
 {
        /*
-       ASSERT(self != NULL, return;);
-       ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
+       IRDA_ASSERT(self != NULL, return;);
+       IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
        IRDA_DEBUG(2, "%s: next state=%s, service type=%d\n", __FUNCTION__ , 
                   ircomm_tty_state[self->state], self->service_type);
@@ -690,7 +690,8 @@ static int ircomm_tty_state_idle(struct ircomm_tty_cb *self,
                self->saddr = info->saddr;
 
                if (self->iriap) {
-                       WARNING("%s(), busy with a previous query\n", __FUNCTION__);
+                       IRDA_WARNING("%s(), busy with a previous query\n",
+                                    __FUNCTION__);
                        return -EBUSY;
                }
 
@@ -747,7 +748,8 @@ static int ircomm_tty_state_search(struct ircomm_tty_cb *self,
                self->saddr = info->saddr;
 
                if (self->iriap) {
-                       WARNING("%s(), busy with a previous query\n", __FUNCTION__);
+                       IRDA_WARNING("%s(), busy with a previous query\n",
+                                    __FUNCTION__);
                        return -EBUSY;
                }
                
@@ -816,7 +818,8 @@ static int ircomm_tty_state_query_parameters(struct ircomm_tty_cb *self,
        switch (event) {
        case IRCOMM_TTY_GOT_PARAMETERS:
                if (self->iriap) {
-                       WARNING("%s(), busy with a previous query\n", __FUNCTION__);
+                       IRDA_WARNING("%s(), busy with a previous query\n",
+                                    __FUNCTION__);
                        return -EBUSY;
                }