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

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
...@@ -1105,7 +1105,7 @@ static struct block_device_operations opt_fops = { ...@@ -1105,7 +1105,7 @@ static struct block_device_operations opt_fops = {
</listitem> </listitem>
<listitem> <listitem>
<para> <para>
Function names as strings (__FUNCTION__). Function names as strings (__func__).
</para> </para>
</listitem> </listitem>
<listitem> <listitem>
......
...@@ -41,7 +41,7 @@ static inline unsigned long iop13xx_core_freq(void) ...@@ -41,7 +41,7 @@ static inline unsigned long iop13xx_core_freq(void)
return 1200000000; return 1200000000;
default: default:
printk("%s: warning unknown frequency, defaulting to 800Mhz\n", printk("%s: warning unknown frequency, defaulting to 800Mhz\n",
__FUNCTION__); __func__);
} }
return 800000000; return 800000000;
...@@ -60,7 +60,7 @@ static inline unsigned long iop13xx_xsi_bus_ratio(void) ...@@ -60,7 +60,7 @@ static inline unsigned long iop13xx_xsi_bus_ratio(void)
return 4; return 4;
default: default:
printk("%s: warning unknown ratio, defaulting to 2\n", printk("%s: warning unknown ratio, defaulting to 2\n",
__FUNCTION__); __func__);
} }
return 2; return 2;
......
...@@ -30,7 +30,7 @@ extern void zylonite_pxa300_init(void); ...@@ -30,7 +30,7 @@ extern void zylonite_pxa300_init(void);
static inline void zylonite_pxa300_init(void) static inline void zylonite_pxa300_init(void)
{ {
if (cpu_is_pxa300() || cpu_is_pxa310()) if (cpu_is_pxa300() || cpu_is_pxa310())
panic("%s: PXA300/PXA310 not supported\n", __FUNCTION__); panic("%s: PXA300/PXA310 not supported\n", __func__);
} }
#endif #endif
...@@ -40,7 +40,7 @@ extern void zylonite_pxa320_init(void); ...@@ -40,7 +40,7 @@ extern void zylonite_pxa320_init(void);
static inline void zylonite_pxa320_init(void) static inline void zylonite_pxa320_init(void)
{ {
if (cpu_is_pxa320()) if (cpu_is_pxa320())
panic("%s: PXA320 not supported\n", __FUNCTION__); panic("%s: PXA320 not supported\n", __func__);
} }
#endif #endif
......
...@@ -129,7 +129,7 @@ extern int ptrace_put_reg(struct task_struct *task, int regno, ...@@ -129,7 +129,7 @@ extern int ptrace_put_reg(struct task_struct *task, int regno,
#define CHECK_FULL_REGS(regs) \ #define CHECK_FULL_REGS(regs) \
do { \ do { \
if ((regs)->trap & 1) \ if ((regs)->trap & 1) \
printk(KERN_CRIT "%s: partial register set\n", __FUNCTION__); \ printk(KERN_CRIT "%s: partial register set\n", __func__); \
} while (0) } while (0)
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
......
...@@ -168,7 +168,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, ...@@ -168,7 +168,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
netif_device_detach(pegasus->net); netif_device_detach(pegasus->net);
if (netif_msg_drv(pegasus) && printk_ratelimit()) if (netif_msg_drv(pegasus) && printk_ratelimit())
dev_err(&pegasus->intf->dev, "%s, status %d\n", dev_err(&pegasus->intf->dev, "%s, status %d\n",
__FUNCTION__, ret); __func__, ret);
goto out; goto out;
} }
...@@ -192,7 +192,7 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size, ...@@ -192,7 +192,7 @@ static int set_registers(pegasus_t * pegasus, __u16 indx, __u16 size,
if (!buffer) { if (!buffer) {
if (netif_msg_drv(pegasus)) if (netif_msg_drv(pegasus))
dev_warn(&pegasus->intf->dev, "out of memory in %s\n", dev_warn(&pegasus->intf->dev, "out of memory in %s\n",
__FUNCTION__); __func__);
return -ENOMEM; return -ENOMEM;
} }
memcpy(buffer, data, size); memcpy(buffer, data, size);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment