vserver 2.0 rc7

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

diff --git a/drivers/net/irda/act200l.c b/drivers/net/irda/act200l.c
index e18de72..756cd44 100644 (file)
--- a/drivers/net/irda/act200l.c
+++ b/drivers/net/irda/act200l.c
@@ -152,7 +152,8 @@ static int act200l_change_speed(struct irda_task *task)
                }
                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:
@@ -197,7 +198,8 @@ static int act200l_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;
@@ -263,7 +265,8 @@ static int act200l_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;