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

Commit 5a346a10 authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

atm: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d4f77514

drivers/atm/firestream.c

+2 −2
Original line number Diff line number Diff line
@@ -331,8 +331,8 @@ module_param(fs_keystream, int, 0); 
#define FS_DEBUG_QSIZE   0x00001000





#define func_enter() fs_dprintk (FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__)

#define func_exit()  fs_dprintk (FS_DEBUG_FLOW, "fs: exit  %s\n", __FUNCTION__)

#define func_enter() fs_dprintk(FS_DEBUG_FLOW, "fs: enter %s\n", __func__)

#define func_exit()  fs_dprintk(FS_DEBUG_FLOW, "fs: exit  %s\n", __func__)





static struct fs_dev *fs_boards = NULL;

drivers/atm/fore200e.c

+2 −2
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ 
#if 1

#define ASSERT(expr)     if (!(expr)) { \

			     printk(FORE200E "assertion failed! %s[%d]: %s\n", \

				    __FUNCTION__, __LINE__, #expr); \

			     panic(FORE200E "%s", __FUNCTION__); \

				    __func__, __LINE__, #expr); \

			     panic(FORE200E "%s", __func__); \

			 }

#else

#define ASSERT(expr)     do {} while (0)

drivers/atm/idt77252.c

+6 −6
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ idt77252_tx_dump(struct idt77252_dev *card) 
	struct vc_map *vc;

	int i;



	printk("%s\n", __FUNCTION__);

	printk("%s\n", __func__);

	for (i = 0; i < card->tct_size; i++) {

		vc = card->vcs[i];

		if (!vc)
@@ -1035,7 +1035,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe) 
	skb = sb_pool_skb(card, le32_to_cpu(rsqe->word_2));

	if (skb == NULL) {

		printk("%s: NULL skb in %s, rsqe: %08x %08x %08x %08x\n",

		       card->name, __FUNCTION__,

		       card->name, __func__,

		       le32_to_cpu(rsqe->word_1), le32_to_cpu(rsqe->word_2),

		       le32_to_cpu(rsqe->word_3), le32_to_cpu(rsqe->word_4));

		return;
@@ -1873,7 +1873,7 @@ add_rx_skb(struct idt77252_dev *card, int queue, 
			return;



		if (sb_pool_add(card, skb, queue)) {

			printk("%s: SB POOL full\n", __FUNCTION__);

			printk("%s: SB POOL full\n", __func__);

			goto outfree;

		}
@@ -1883,7 +1883,7 @@ add_rx_skb(struct idt77252_dev *card, int queue, 
		IDT77252_PRV_PADDR(skb) = paddr;



		if (push_rx_skb(card, skb, queue)) {

			printk("%s: FB QUEUE full\n", __FUNCTION__);

			printk("%s: FB QUEUE full\n", __func__);

			goto outunmap;

		}

	}
@@ -3821,12 +3821,12 @@ static int __init idt77252_init(void) 
{

	struct sk_buff *skb;



	printk("%s: at %p\n", __FUNCTION__, idt77252_init);

	printk("%s: at %p\n", __func__, idt77252_init);



	if (sizeof(skb->cb) < sizeof(struct atm_skb_data) +

			      sizeof(struct idt77252_skb_prv)) {

		printk(KERN_ERR "%s: skb->cb is too small (%lu < %lu)\n",

		       __FUNCTION__, (unsigned long) sizeof(skb->cb),

		       __func__, (unsigned long) sizeof(skb->cb),

		       (unsigned long) sizeof(struct atm_skb_data) +

				       sizeof(struct idt77252_skb_prv));

		return -EIO;