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

Commit 653c0316 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

misc: replace remaining __FUNCTION__ with __func__ 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e8848a17

Documentation/DocBook/kernel-hacking.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static struct block_device_operations opt_fops = { 
    </listitem>

    <listitem>

     <para>

      Function names as strings (__FUNCTION__).

      Function names as strings (__func__).

     </para>

    </listitem>

    <listitem>

arch/arm/mach-iop13xx/include/mach/time.h

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static inline unsigned long iop13xx_core_freq(void) 
		return 1200000000;

	default:

		printk("%s: warning unknown frequency, defaulting to 800Mhz\n",

			__FUNCTION__);

			__func__);

	}



	return 800000000;
@@ -60,7 +60,7 @@ static inline unsigned long iop13xx_xsi_bus_ratio(void) 
		return 4;

	default:

		printk("%s: warning unknown ratio, defaulting to 2\n",

			__FUNCTION__);

			__func__);

	}



	return 2;

arch/arm/mach-pxa/include/mach/zylonite.h

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ extern void zylonite_pxa300_init(void); 
static inline void zylonite_pxa300_init(void)

{

	if (cpu_is_pxa300() || cpu_is_pxa310())

		panic("%s: PXA300/PXA310 not supported\n", __FUNCTION__);

		panic("%s: PXA300/PXA310 not supported\n", __func__);

}

#endif
@@ -40,7 +40,7 @@ extern void zylonite_pxa320_init(void); 
static inline void zylonite_pxa320_init(void)

{

	if (cpu_is_pxa320())

		panic("%s: PXA320 not supported\n", __FUNCTION__);

		panic("%s: PXA320 not supported\n", __func__);

}

#endif

arch/powerpc/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ extern int ptrace_put_reg(struct task_struct *task, int regno, 
#define CHECK_FULL_REGS(regs)						      \

do {									      \

	if ((regs)->trap & 1)						      \

		printk(KERN_CRIT "%s: partial register set\n", __FUNCTION__); \

		printk(KERN_CRIT "%s: partial register set\n", __func__); \

} while (0)

#endif /* __powerpc64__ */

drivers/net/usb/pegasus.c

+2 −2
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 
			netif_device_detach(pegasus->net);

		if (netif_msg_drv(pegasus) && printk_ratelimit())

			dev_err(&pegasus->intf->dev, "%s, status %d\n",

					__FUNCTION__, ret);

					__func__, ret);

		goto out;

	}
@@ -192,7 +192,7 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 
	if (!buffer) {

		if (netif_msg_drv(pegasus))

			dev_warn(&pegasus->intf->dev, "out of memory in %s\n",

					__FUNCTION__);

					__func__);

		return -ENOMEM;

	}

	memcpy(buffer, data, size);