patch-2.4.23 linux-2.4.23/drivers/net/irda/mcp2120.c
Next file: linux-2.4.23/drivers/net/irda/nsc-ircc.c
Previous file: linux-2.4.23/drivers/net/irda/ma600.c
Back to the patch index
Back to the overall index
- Lines: 27
- Date:
2003-11-28 10:26:20.000000000 -0800
- Orig file:
linux-2.4.22/drivers/net/irda/mcp2120.c
- Orig date:
2002-11-28 15:53:13.000000000 -0800
diff -urN linux-2.4.22/drivers/net/irda/mcp2120.c linux-2.4.23/drivers/net/irda/mcp2120.c
@@ -110,7 +110,7 @@
}
break;
case IRDA_TASK_CHILD_WAIT:
- WARNING(__FUNCTION__ "(), resetting dongle timed out!\n");
+ WARNING("%s(), resetting dongle timed out!\n", __FUNCTION__);
ret = -1;
break;
case IRDA_TASK_CHILD_DONE:
@@ -158,7 +158,7 @@
//printk("mcp2120_change_speed irda_task_wait\n");
break;
default:
- ERROR(__FUNCTION__ "(), unknown state %d\n", task->state);
+ ERROR("%s(), unknown state %d\n", __FUNCTION__, task->state);
irda_task_next_state(task, IRDA_TASK_DONE);
self->speed_task = NULL;
ret = -1;
@@ -213,7 +213,7 @@
self->reset_task = NULL;
break;
default:
- ERROR(__FUNCTION__ "(), unknown state %d\n", task->state);
+ ERROR("%s(), unknown state %d\n", __FUNCTION__ , task->state);
irda_task_next_state(task, IRDA_TASK_DONE);
self->reset_task = NULL;
ret = -1;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)