[PATCH] staging: remove remaining uses of __FUNCTION__ - Kernel

This is a discussion on [PATCH] staging: remove remaining uses of __FUNCTION__ - Kernel ; __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison --- drivers/staging/usbip/usbip_common.c | 2 +- drivers/staging/wlan-ng/wlan_compat.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index e64918f..72e2092 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c @@ -221,7 +221,7 @@ static ...

+ Reply to Thread
Results 1 to 2 of 2

Thread: [PATCH] staging: remove remaining uses of __FUNCTION__

  1. [PATCH] staging: remove remaining uses of __FUNCTION__

    __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison
    ---
    drivers/staging/usbip/usbip_common.c | 2 +-
    drivers/staging/wlan-ng/wlan_compat.h | 8 ++++----
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c
    index e64918f..72e2092 100644
    --- a/drivers/staging/usbip/usbip_common.c
    +++ b/drivers/staging/usbip/usbip_common.c
    @@ -221,7 +221,7 @@ static void usbip_dump_request_type(__u8 rt)
    static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd)
    {
    if (!cmd) {
    - printk(" %s : null pointer\n", __FUNCTION__);
    + printk(" %s : null pointer\n", __func__);
    return;
    }

    diff --git a/drivers/staging/wlan-ng/wlan_compat.h b/drivers/staging/wlan-ng/wlan_compat.h
    index 1702657..59dfa8f 100644
    --- a/drivers/staging/wlan-ng/wlan_compat.h
    +++ b/drivers/staging/wlan-ng/wlan_compat.h
    @@ -245,11 +245,11 @@ typedef int64_t INT64;
    # define preempt_count() (0UL)
    #endif

    -#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __FUNCTION__ , ##args);
    +#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args);

    -#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __FUNCTION__ , ##args);
    +#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __func__ , ##args);

    -#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __FUNCTION__ , ##args);
    +#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __func__ , ##args);

    #define WLAN_LOG_INFO(args... ) printk(KERN_INFO args)

    @@ -265,7 +265,7 @@ typedef int64_t INT64;
    #define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } }
    #define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } }

    - #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __FUNCTION__, (preempt_count() & PREEMPT_MASK), ##args );
    + #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __func__, (preempt_count() & PREEMPT_MASK), ##args );
    #else
    #define WLAN_ASSERT(c)
    #define WLAN_HEX_DUMP( l, s, p, n)
    --
    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. patch staging-remove-remaining-uses-of-__function__.patch added to gregkh-2.6 tree


    This is a note to let you know that I've just added the patch titled

    Subject: Staging: remove remaining uses of __FUNCTION__

    to my gregkh-2.6 tree. Its filename is

    staging-remove-remaining-uses-of-__function__.patch

    This tree can be found at
    http://www.kernel.org/pub/linux/kern...h-2.6/patches/


    From harvey.harrison@gmail.com Mon Oct 20 15:48:28 2008
    From: Harvey Harrison
    Date: Mon, 20 Oct 2008 15:45:25 -0700
    Subject: Staging: remove remaining uses of __FUNCTION__
    To: Greg KH
    Cc: LKML
    Message-ID: <1224542725.31861.224.camel@brick>


    __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison
    Signed-off-by: Greg Kroah-Hartman

    ---
    drivers/staging/usbip/usbip_common.c | 2 +-
    drivers/staging/wlan-ng/wlan_compat.h | 8 ++++----
    2 files changed, 5 insertions(+), 5 deletions(-)

    --- a/drivers/staging/usbip/usbip_common.c
    +++ b/drivers/staging/usbip/usbip_common.c
    @@ -221,7 +221,7 @@ static void usbip_dump_request_type(__u8
    static void usbip_dump_usb_ctrlrequest(struct usb_ctrlrequest *cmd)
    {
    if (!cmd) {
    - printk(" %s : null pointer\n", __FUNCTION__);
    + printk(" %s : null pointer\n", __func__);
    return;
    }

    --- a/drivers/staging/wlan-ng/wlan_compat.h
    +++ b/drivers/staging/wlan-ng/wlan_compat.h
    @@ -245,11 +245,11 @@ typedef int64_t INT64;
    # define preempt_count() (0UL)
    #endif

    -#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __FUNCTION__ , ##args);
    +#define WLAN_LOG_ERROR(x,args...) printk(KERN_ERR "%s: " x , __func__ , ##args);

    -#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __FUNCTION__ , ##args);
    +#define WLAN_LOG_WARNING(x,args...) printk(KERN_WARNING "%s: " x , __func__ , ##args);

    -#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __FUNCTION__ , ##args);
    +#define WLAN_LOG_NOTICE(x,args...) printk(KERN_NOTICE "%s: " x , __func__ , ##args);

    #define WLAN_LOG_INFO(args... ) printk(KERN_INFO args)

    @@ -265,7 +265,7 @@ typedef int64_t INT64;
    #define DBFENTER { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"---->\n"); } }
    #define DBFEXIT { if ( WLAN_DBVAR >= 5 ){ WLAN_LOG_DEBUG(3,"<----\n"); } }

    - #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __FUNCTION__, (preempt_count() & PREEMPT_MASK), ##args );
    + #define WLAN_LOG_DEBUG(l,x,args...) if ( WLAN_DBVAR >= (l)) printk(KERN_DEBUG "%s(%lu): " x , __func__, (preempt_count() & PREEMPT_MASK), ##args );
    #else
    #define WLAN_ASSERT(c)
    #define WLAN_HEX_DUMP( l, s, p, n)


    Patches currently in gregkh-2.6 which might be from harvey.harrison@gmail.com are

    staging/staging-sxg-replace-__function__-with-__func__.patch
    staging/staging-remove-remaining-uses-of-__function__.patch
    --
    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