vserver 2.0 rc7

[linux-2.6.git] / drivers / net / irda / tekram.c

diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c
index d0de866..8f62582 100644 (file)
--- a/drivers/net/irda/tekram.c
+++ b/drivers/net/irda/tekram.c
@@ -109,7 +109,7 @@ static int tekram_change_speed(struct irda_task *task)
        
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(task != NULL, return -1;);
+       IRDA_ASSERT(task != NULL, return -1;);
 
        if (self->speed_task && self->speed_task != task) {
                IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ );
@@ -155,7 +155,8 @@ static int tekram_change_speed(struct irda_task *task)
                        irda_task_next_state(task, IRDA_TASK_CHILD_DONE);
                break;
        case IRDA_TASK_CHILD_WAIT:
-               WARNING("%s(), resetting dongle timed out!\n", __FUNCTION__);
+               IRDA_WARNING("%s(), resetting dongle timed out!\n",
+                            __FUNCTION__);
                ret = -1;
                break;
        case IRDA_TASK_CHILD_DONE:
@@ -181,7 +182,8 @@ static int tekram_change_speed(struct irda_task *task)
                self->speed_task = NULL;
                break;
        default:
-               ERROR("%s(), unknown state %d\n", __FUNCTION__, task->state);
+               IRDA_ERROR("%s(), unknown state %d\n",
+                          __FUNCTION__, task->state);
                irda_task_next_state(task, IRDA_TASK_DONE);
                self->speed_task = NULL;
                ret = -1;
@@ -210,7 +212,7 @@ int tekram_reset(struct irda_task *task)
 
        IRDA_DEBUG(2, "%s()\n", __FUNCTION__ );
 
-       ASSERT(task != NULL, return -1;);
+       IRDA_ASSERT(task != NULL, return -1;);
 
        if (self->reset_task && self->reset_task != task) {
                IRDA_DEBUG(0, "%s(), busy!\n", __FUNCTION__ );
@@ -249,7 +251,8 @@ int tekram_reset(struct irda_task *task)
                self->reset_task = NULL;
                break;
        default:
-               ERROR("%s(), unknown state %d\n", __FUNCTION__, task->state);
+               IRDA_ERROR("%s(), unknown state %d\n",
+                          __FUNCTION__, task->state);
                irda_task_next_state(task, IRDA_TASK_DONE);             
                self->reset_task = NULL;
                ret = -1;