diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-28 05:14:40 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 11:58:34 -0400 |
commit | 156f1ed640170d70c9fc8e5f6f797ea1f2a1653b (patch) | |
tree | 4709685cf46fce1ef552ccbee6d30f5073f99216 /drivers/isdn/capi | |
parent | dd58c0dd30ac761837b1d0d8cc434c7ec7b2df68 (diff) |
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>
Diffstat (limited to 'drivers/isdn/capi')
-rw-r--r-- | drivers/isdn/capi/capidrv.c | 4 | ||||
-rw-r--r-- | drivers/isdn/capi/capilib.c | 2 | ||||
-rw-r--r-- | drivers/isdn/capi/kcapi.c | 4 | ||||
-rw-r--r-- | drivers/isdn/capi/kcapi.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/isdn/capi/capidrv.c b/drivers/isdn/capi/capidrv.c index 2e602dd07ffa..d5b4cc357a3c 100644 --- a/drivers/isdn/capi/capidrv.c +++ b/drivers/isdn/capi/capidrv.c | |||
@@ -1388,12 +1388,12 @@ static void capidrv_recv_message(struct capi20_appl *ap, struct sk_buff *skb) | |||
1388 | _cdebbuf *cdb = capi_cmsg2str(&s_cmsg); | 1388 | _cdebbuf *cdb = capi_cmsg2str(&s_cmsg); |
1389 | 1389 | ||
1390 | if (cdb) { | 1390 | if (cdb) { |
1391 | printk(KERN_DEBUG "%s: applid=%d %s\n", __FUNCTION__, | 1391 | printk(KERN_DEBUG "%s: applid=%d %s\n", __func__, |
1392 | ap->applid, cdb->buf); | 1392 | ap->applid, cdb->buf); |
1393 | cdebbuf_free(cdb); | 1393 | cdebbuf_free(cdb); |
1394 | } else | 1394 | } else |
1395 | printk(KERN_DEBUG "%s: applid=%d %s not traced\n", | 1395 | printk(KERN_DEBUG "%s: applid=%d %s not traced\n", |
1396 | __FUNCTION__, ap->applid, | 1396 | __func__, ap->applid, |
1397 | capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand)); | 1397 | capi_cmd2str(s_cmsg.Command, s_cmsg.Subcommand)); |
1398 | } | 1398 | } |
1399 | if (s_cmsg.Command == CAPI_DATA_B3 | 1399 | if (s_cmsg.Command == CAPI_DATA_B3 |
diff --git a/drivers/isdn/capi/capilib.c b/drivers/isdn/capi/capilib.c index 34d8be2761c1..fcaa1241ee77 100644 --- a/drivers/isdn/capi/capilib.c +++ b/drivers/isdn/capi/capilib.c | |||
@@ -4,7 +4,7 @@ | |||
4 | #include <linux/isdn/capilli.h> | 4 | #include <linux/isdn/capilli.h> |
5 | 5 | ||
6 | #define DBG(format, arg...) do { \ | 6 | #define DBG(format, arg...) do { \ |
7 | printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ | 7 | printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \ |
8 | } while (0) | 8 | } while (0) |
9 | 9 | ||
10 | struct capilib_msgidqueue { | 10 | struct capilib_msgidqueue { |
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index ef6de217b9fc..063de5a29fcf 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c | |||
@@ -154,7 +154,7 @@ static void register_appl(struct capi_ctr *card, u16 applid, capi_register_param | |||
154 | if (card) | 154 | if (card) |
155 | card->register_appl(card, applid, rparam); | 155 | card->register_appl(card, applid, rparam); |
156 | else | 156 | else |
157 | printk(KERN_WARNING "%s: cannot get card resources\n", __FUNCTION__); | 157 | printk(KERN_WARNING "%s: cannot get card resources\n", __func__); |
158 | } | 158 | } |
159 | 159 | ||
160 | 160 | ||
@@ -178,7 +178,7 @@ static void notify_up(u32 contr) | |||
178 | printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr); | 178 | printk(KERN_DEBUG "kcapi: notify up contr %d\n", contr); |
179 | } | 179 | } |
180 | if (!card) { | 180 | if (!card) { |
181 | printk(KERN_WARNING "%s: invalid contr %d\n", __FUNCTION__, contr); | 181 | printk(KERN_WARNING "%s: invalid contr %d\n", __func__, contr); |
182 | return; | 182 | return; |
183 | } | 183 | } |
184 | for (applid = 1; applid <= CAPI_MAXAPPL; applid++) { | 184 | for (applid = 1; applid <= CAPI_MAXAPPL; applid++) { |
diff --git a/drivers/isdn/capi/kcapi.h b/drivers/isdn/capi/kcapi.h index 1cb2c40f9921..244711f7f838 100644 --- a/drivers/isdn/capi/kcapi.h +++ b/drivers/isdn/capi/kcapi.h | |||
@@ -17,7 +17,7 @@ | |||
17 | 17 | ||
18 | #ifdef KCAPI_DEBUG | 18 | #ifdef KCAPI_DEBUG |
19 | #define DBG(format, arg...) do { \ | 19 | #define DBG(format, arg...) do { \ |
20 | printk(KERN_DEBUG "%s: " format "\n" , __FUNCTION__ , ## arg); \ | 20 | printk(KERN_DEBUG "%s: " format "\n" , __func__ , ## arg); \ |
21 | } while (0) | 21 | } while (0) |
22 | #else | 22 | #else |
23 | #define DBG(format, arg...) /* */ | 23 | #define DBG(format, arg...) /* */ |