2002-09-09 23:10:40

by Frank Davis

Subject: [PATCH] 2.5.34 : drivers/net/irda/irtty.c __FUNCTION__ fix

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;

2002-09-09 23:47:17

by Jean Tourrilhes

Subject: Re: [PATCH] 2.5.34 : drivers/net/irda/irtty.c __FUNCTION__ fix

On Mon, Sep 09, 2002 at 07:03:53PM -0400, Frank Davis wrote:
> Hello all,
> The following patch fixes several __FUNCTION__ related errors. Please
> review for inclusion.
>
> Regards,
> Frank

I can only promise you to put it in my patch queue (which is
already backlogged). I've already added it on my web page (so I won't
forget it). It would have been nicer to not add a space around the
function name, but who cares.
Please also note that currently irtty is broken, so use at
your own risks...
Thanks...

Jean

2002-09-10 15:56:43

by Jean Tourrilhes

Subject: Re: [PATCH] 2.5.34 : drivers/net/irda/irtty.c __FUNCTION__ fix

On Mon, Sep 09, 2002 at 10:22:50PM -0500, Bob_Tracy wrote:
> Jean Tourrilhes wrote:
> > I've already added it on my web page (so I won't
> > forget it).
>
> What's the URL, for those of us who haven't been paying attention?

Google is your friend :
http://www.hpl.hp.com/personal/Jean_Tourrilhes/IrDA/IrDA.html

Jean