Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 156f1ed6 authored Apr 28, 2008 by Harvey Harrison Committed by Linus Torvalds Apr 28, 2008

isdn: replace remaining FUNCTION occurrences



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Cc: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent dd58c0dd

drivers/isdn/capi/capidrv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1388,12 +1388,12 @@ static void capidrv_recv_message(struct capi20_appl ap, struct sk_buff skb)
		_cdebbuf *cdb = capi_cmsg2str(&s_cmsg);

		if (cdb) {
		printk(KERN_DEBUG "%s: applid=%d %s\n", __FUNCTION__,
		printk(KERN_DEBUG "%s: applid=%d %s\n", __func__,
		ap->applid, cdb->buf);
		cdebbuf_free(cdb);
		} else
		printk(KERN_DEBUG "%s: applid=%d %s not traced\n",
		__FUNCTION__, ap->applid,
		__func__, ap->applid,
		capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand));
		}
		if (s_cmsg.Command == CAPI_DATA_B3

drivers/isdn/capi/capilib.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		#include <linux/isdn/capilli.h>

		#define DBG(format, arg...) do { \
		printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
		printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
		} while (0)

		struct capilib_msgidqueue {

drivers/isdn/capi/kcapi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ static void register_appl(struct capi_ctr *card, u16 applid, capi_register_param
		if (card)
		card->register_appl(card, applid, rparam);
		else
		printk(KERN_WARNING "%s: cannot get card resources\n", __FUNCTION__);
		printk(KERN_WARNING "%s: cannot get card resources\n", __func__);
		}


		@@ -178,7 +178,7 @@ static void notify_up(u32 contr)
		printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr);
		}
		if (!card) {
		printk(KERN_WARNING "%s: invalid contr %d\n", __FUNCTION__, contr);
		printk(KERN_WARNING "%s: invalid contr %d\n", __func__, contr);
		return;
		}
		for (applid = 1; applid <= CAPI_MAXAPPL; applid++) {

drivers/isdn/capi/kcapi.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@

		#ifdef KCAPI_DEBUG
		#define DBG(format, arg...) do { \
		printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \
		printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \
		} while (0)
		#else
		#define DBG(format, arg...) /* */

drivers/isdn/hisax/asuscom.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -344,7 +344,7 @@ setup_asuscom(struct IsdnCard *card)
		err = pnp_activate_dev(pnp_d);
		if (err<0) {
		printk(KERN_WARNING "%s: pnp_activate_dev ret(%d)\n",
		__FUNCTION__, err);
		__func__, err);
		return(0);
		}
		card->para[1] = pnp_port_start(pnp_d, 0);