Commit 5a346a10c0b1192e7eae52f0f3a332f1d3f11226
Committed by
David S. Miller
David S. Miller
1 parent
d4f7751495
Exists in
master
and in
7 other branches
atm: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 3 changed files with 10 additions and 10 deletions Side-by-side Diff
drivers/atm/firestream.c
| ... | ... | @@ -331,8 +331,8 @@ |
| 331 | 331 | #define FS_DEBUG_QSIZE 0x00001000 |
| 332 | 332 | |
| 333 | 333 | |
| 334 | -#define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__) | |
| 335 | -#define func_exit() fs_dprintk (FS_DEBUG_FLOW, "fs: exit %s\n", __FUNCTION__) | |
| 334 | +#define func_enter() fs_dprintk(FS_DEBUG_FLOW, "fs: enter %s\n", __func__) | |
| 335 | +#define func_exit() fs_dprintk(FS_DEBUG_FLOW, "fs: exit %s\n", __func__) | |
| 336 | 336 | |
| 337 | 337 | |
| 338 | 338 | static struct fs_dev *fs_boards = NULL; |
drivers/atm/fore200e.c
| ... | ... | @@ -95,8 +95,8 @@ |
| 95 | 95 | #if 1 |
| 96 | 96 | #define ASSERT(expr) if (!(expr)) { \ |
| 97 | 97 | printk(FORE200E "assertion failed! %s[%d]: %s\n", \ |
| 98 | - __FUNCTION__, __LINE__, #expr); \ | |
| 99 | - panic(FORE200E "%s", __FUNCTION__); \ | |
| 98 | + __func__, __LINE__, #expr); \ | |
| 99 | + panic(FORE200E "%s", __func__); \ | |
| 100 | 100 | } |
| 101 | 101 | #else |
| 102 | 102 | #define ASSERT(expr) do {} while (0) |
drivers/atm/idt77252.c
| ... | ... | @@ -555,7 +555,7 @@ |
| 555 | 555 | struct vc_map *vc; |
| 556 | 556 | int i; |
| 557 | 557 | |
| 558 | - printk("%s\n", __FUNCTION__); | |
| 558 | + printk("%s\n", __func__); | |
| 559 | 559 | for (i = 0; i < card->tct_size; i++) { |
| 560 | 560 | vc = card->vcs[i]; |
| 561 | 561 | if (!vc) |
| ... | ... | @@ -1035,7 +1035,7 @@ |
| 1035 | 1035 | skb = sb_pool_skb(card, le32_to_cpu(rsqe->word_2)); |
| 1036 | 1036 | if (skb == NULL) { |
| 1037 | 1037 | printk("%s: NULL skb in %s, rsqe: %08x %08x %08x %08x\n", |
| 1038 | - card->name, __FUNCTION__, | |
| 1038 | + card->name, __func__, | |
| 1039 | 1039 | le32_to_cpu(rsqe->word_1), le32_to_cpu(rsqe->word_2), |
| 1040 | 1040 | le32_to_cpu(rsqe->word_3), le32_to_cpu(rsqe->word_4)); |
| 1041 | 1041 | return; |
| ... | ... | @@ -1873,7 +1873,7 @@ |
| 1873 | 1873 | return; |
| 1874 | 1874 | |
| 1875 | 1875 | if (sb_pool_add(card, skb, queue)) { |
| 1876 | - printk("%s: SB POOL full\n", __FUNCTION__); | |
| 1876 | + printk("%s: SB POOL full\n", __func__); | |
| 1877 | 1877 | goto outfree; |
| 1878 | 1878 | } |
| 1879 | 1879 | |
| ... | ... | @@ -1883,7 +1883,7 @@ |
| 1883 | 1883 | IDT77252_PRV_PADDR(skb) = paddr; |
| 1884 | 1884 | |
| 1885 | 1885 | if (push_rx_skb(card, skb, queue)) { |
| 1886 | - printk("%s: FB QUEUE full\n", __FUNCTION__); | |
| 1886 | + printk("%s: FB QUEUE full\n", __func__); | |
| 1887 | 1887 | goto outunmap; |
| 1888 | 1888 | } |
| 1889 | 1889 | } |
| 1890 | 1890 | |
| ... | ... | @@ -3821,12 +3821,12 @@ |
| 3821 | 3821 | { |
| 3822 | 3822 | struct sk_buff *skb; |
| 3823 | 3823 | |
| 3824 | - printk("%s: at %p\n", __FUNCTION__, idt77252_init); | |
| 3824 | + printk("%s: at %p\n", __func__, idt77252_init); | |
| 3825 | 3825 | |
| 3826 | 3826 | if (sizeof(skb->cb) < sizeof(struct atm_skb_data) + |
| 3827 | 3827 | sizeof(struct idt77252_skb_prv)) { |
| 3828 | 3828 | printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n", |
| 3829 | - __FUNCTION__, (unsigned long) sizeof(skb->cb), | |
| 3829 | + __func__, (unsigned long) sizeof(skb->cb), | |
| 3830 | 3830 | (unsigned long) sizeof(struct atm_skb_data) + |
| 3831 | 3831 | sizeof(struct idt77252_skb_prv)); |
| 3832 | 3832 | return -EIO; |