misc: replace remaining __FUNCTION__ with __func__
__FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
e8848a170f
commit
653c031683
5 changed files with 8 additions and 8 deletions
|
@ -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>
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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__ */
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue