patch-2.4.20 linux-2.4.20/drivers/net/irda/actisys.c

Next file: linux-2.4.20/drivers/net/irda/ali-ircc.c
Previous file: linux-2.4.20/drivers/net/irda/act200l.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.19/drivers/net/irda/actisys.c linux-2.4.20/drivers/net/irda/actisys.c
@@ -166,8 +166,8 @@
 	int ret = 0;
 	int i = 0;
 
-        IRDA_DEBUG(4, __FUNCTION__ "(), speed=%d (was %d)\n", speed, 
-		   self->speed);
+        IRDA_DEBUG(4, "%s(), speed=%d (was %d)\n", __FUNCTION__,
+        	speed, self->speed);
 
 	/* Go to a known state by reseting the dongle */
 
@@ -260,7 +260,7 @@
 		self->speed = 9600;	/* That's the default */
 		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)