[PATCH] misc: replace remaining __FUNCTION__ with __func__ - Kernel

This is a discussion on [PATCH] misc: replace remaining __FUNCTION__ with __func__ - Kernel ; __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison --- These are the last occurences in-tree that are not already coming through a subsystem tree. xtensa, staging and blackfin (serial driver and a fb driver) will catch the remaining ones as ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH] misc: replace remaining __FUNCTION__ with __func__

  1. [PATCH] misc: replace remaining __FUNCTION__ with __func__

    __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison
    ---
    These are the last occurences in-tree that are not already coming
    through a subsystem tree.

    xtensa, staging and blackfin (serial driver and a fb driver) will
    catch the remaining ones as they merge.

    Documentation/DocBook/kernel-hacking.tmpl | 2 +-
    arch/arm/mach-iop13xx/include/mach/time.h | 4 ++--
    arch/arm/mach-pxa/include/mach/zylonite.h | 4 ++--
    arch/powerpc/include/asm/ptrace.h | 2 +-
    drivers/net/usb/pegasus.c | 4 ++--
    5 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl
    index 4c63e58..ae15d55 100644
    --- a/Documentation/DocBook/kernel-hacking.tmpl
    +++ b/Documentation/DocBook/kernel-hacking.tmpl
    @@ -1105,7 +1105,7 @@ static struct block_device_operations opt_fops = {



    - Function names as strings (__FUNCTION__).
    + Function names as strings (__func__).



    diff --git a/arch/arm/mach-iop13xx/include/mach/time.h b/arch/arm/mach-iop13xx/include/mach/time.h
    index 49213d9..d6d5252 100644
    --- a/arch/arm/mach-iop13xx/include/mach/time.h
    +++ b/arch/arm/mach-iop13xx/include/mach/time.h
    @@ -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;
    diff --git a/arch/arm/mach-pxa/include/mach/zylonite.h b/arch/arm/mach-pxa/include/mach/zylonite.h
    index 0d35ca0..bf6785a 100644
    --- a/arch/arm/mach-pxa/include/mach/zylonite.h
    +++ b/arch/arm/mach-pxa/include/mach/zylonite.h
    @@ -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

    diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h
    index 734e075..280a90c 100644
    --- a/arch/powerpc/include/asm/ptrace.h
    +++ b/arch/powerpc/include/asm/ptrace.h
    @@ -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__ */

    diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
    index 38b90e7..7914867 100644
    --- a/drivers/net/usb/pegasus.c
    +++ b/drivers/net/usb/pegasus.c
    @@ -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);
    --
    1.6.0.2



    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [PATCH] misc: replace remaining __FUNCTION__ with __func__

    Harvey Harrison wrote:
    > __FUNCTION__ is gcc-specific, use __func__
    >
    > Signed-off-by: Harvey Harrison
    > ---
    > These are the last occurences in-tree that are not already coming
    > through a subsystem tree.
    >
    > xtensa, staging and blackfin (serial driver and a fb driver) will
    > catch the remaining ones as they merge.
    >
    > Documentation/DocBook/kernel-hacking.tmpl | 2 +-
    > arch/arm/mach-iop13xx/include/mach/time.h | 4 ++--
    > arch/arm/mach-pxa/include/mach/zylonite.h | 4 ++--
    > arch/powerpc/include/asm/ptrace.h | 2 +-
    > drivers/net/usb/pegasus.c | 4 ++--
    > 5 files changed, 8 insertions(+), 8 deletions(-)
    >
    > diff --git a/Documentation/DocBook/kernel-hacking.tmpl b/Documentation/DocBook/kernel-hacking.tmpl
    > index 4c63e58..ae15d55 100644
    > --- a/Documentation/DocBook/kernel-hacking.tmpl
    > +++ b/Documentation/DocBook/kernel-hacking.tmpl
    > @@ -1105,7 +1105,7 @@ static struct block_device_operations opt_fops = {
    >
    >
    >
    > - Function names as strings (__FUNCTION__).
    > + Function names as strings (__func__).
    >

    >

    >


    Ack that part.

    Thanks.
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread