[PATCH] [2.4.28-pre1] two __FUNCTION__ patches

From: O.Sezer
Date: Tue Aug 17 2004 - 11:08:20 EST


Here are two __FUNCTION__ patches from the -ac/-pac tree.
Review and please apply to 2.4.28.

Regards,
Ozkan Sezer

diff -urN 28pre1/drivers/char/ftape/lowlevel/ftape-tracing.h 28pre1ac/drivers/char/ftape/lowlevel/ftape-tracing.h
--- 28pre1/drivers/char/ftape/lowlevel/ftape-tracing.h 2000-09-03 21:22:09.000000000 +0300
+++ 28pre1ac/drivers/char/ftape/lowlevel/ftape-tracing.h 2004-08-16 16:09:03.000000000 +0300
@@ -70,8 +70,8 @@
#define TRACE(l, m, i...) \
{ \
if ((ft_trace_t)(l) == FT_TRACE_TOP_LEVEL) { \
- printk(KERN_INFO"ftape"__FILE__"("__FUNCTION__"):\n" \
- KERN_INFO m".\n" ,##i); \
+ printk(KERN_INFO"ftape"__FILE__"(%s):\n" \
+ KERN_INFO m".\n" ,__FUNCTION__, ##i); \
} \
}
#define SET_TRACE_LEVEL(l) if ((l) == (l)) do {} while(0)
diff -urN 28pre1/net/irda/irlmp.c 28pre1ac/net/irda/irlmp.c
--- 28pre1/net/irda/irlmp.c 2003-06-13 17:51:39.000000000 +0300
+++ 28pre1ac/net/irda/irlmp.c 2004-08-16 16:09:05.000000000 +0300
@@ -1241,7 +1241,7 @@
/* Get the number of lsap. That's the only safe way to know
* that we have looped around... - Jean II */
lsap_todo = HASHBIN_GET_SIZE(self->lsaps);
- IRDA_DEBUG(4, __FUNCTION__ "() : %d lsaps to scan\n", lsap_todo);
+ IRDA_DEBUG(4, "%s() : %d lsaps to scan\n", __FUNCTION__, lsap_todo);

/* Poll lsap in order until the queue is full or until we
* tried them all.
@@ -1255,7 +1255,7 @@
/* Note that if there is only one LSAP on the LAP
* (most common case), self->flow_next is always NULL,
* so we always avoid this loop. - Jean II */
- IRDA_DEBUG(4, __FUNCTION__ "() : searching my LSAP\n");
+ IRDA_DEBUG(4, "%s() : searching my LSAP\n", __FUNCTION__);

/* We look again in hashbins, because the lsap
* might have gone away... - Jean II */
@@ -1274,14 +1274,14 @@

/* Next time, we will get the next one (or the first one) */
self->flow_next = (struct lsap_cb *) hashbin_get_next(self->lsaps);
- IRDA_DEBUG(4, __FUNCTION__ "() : curr is %p, next was %p and is now %p, still %d to go - queue len = %d\n", curr, next, self->flow_next, lsap_todo, IRLAP_GET_TX_QUEUE_LEN(self->irlap));
+ IRDA_DEBUG(4, "%s() : curr is %p, next was %p and is now %p, still %d to go - queue len = %d\n", __FUNCTION__, curr, next, self->flow_next, lsap_todo, IRLAP_GET_TX_QUEUE_LEN(self->irlap));

/* Inform lsap user that it can send one more packet. */
if (curr->notify.flow_indication != NULL)
curr->notify.flow_indication(curr->notify.instance,
curr, flow);
else
- IRDA_DEBUG(1, __FUNCTION__ "(), no handler\n");
+ IRDA_DEBUG(1, "%s(), no handler\n", __FUNCTION__);
}
}