Hello all,
The following patch fixes several __FUNCTION__ related errors. Please
review for inclusion.
Regards,
Frank
--- linux/drivers/net/irda/irtty.c.old Thu Jun 20 19:57:59 2002
+++ linux/drivers/net/irda/irtty.c Mon Sep 9 18:51:29 2002
@@ -118,9 +118,7 @@
/* Unregister tty line-discipline */
if ((ret = tty_register_ldisc(N_IRDA, NULL))) {
- ERROR(__FUNCTION__
- "(), can't unregister line discipline (err = %d)\n",
- ret);
+ ERROR("%s (), can't unregister line discipline (err = %d)\n", __FUNCTION, ret);
}
/*
@@ -226,7 +224,7 @@
self->rx_buff.data = self->rx_buff.head;
if (!(dev = dev_alloc("irda%d", &err))) {
- ERROR(__FUNCTION__ "(), dev_alloc() failed!\n");
+ ERROR(" %s (), dev_alloc() failed!\n", __FUNCTION__);
return -ENOMEM;
}
@@ -245,7 +243,7 @@
err = register_netdevice(dev);
rtnl_unlock();
if (err) {
- ERROR(__FUNCTION__ "(), register_netdev() failed!\n");
+ ERROR(" %s (), register_netdev() failed!\n", __FUNCTION__);
return -1;
}
@@ -451,8 +449,7 @@
irda_task_next_state(task, IRDA_TASK_CHILD_DONE);
break;
case IRDA_TASK_CHILD_WAIT:
- WARNING(__FUNCTION__
- "(), changing speed of dongle timed out!\n");
+ WARNING(" %s (), changing speed of dongle timed out!\n", __FUNCTION__);
ret = -1;
break;
case IRDA_TASK_CHILD_DONE:
@@ -463,7 +460,7 @@
self->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->task = NULL;
ret = -1;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun Sep 15 2002 - 22:00:19 EST