lkml.org 
[lkml]   [2008]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 28/42] Staging: remove remaining uses of __FUNCTION__
    Date
    From: Harvey Harrison <harvey.harrison@gmail.com>

    __FUNCTION__ is gcc-specific, use __func__

    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    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


    \
     
     \ /
      Last update: 2008-10-22 19:47    [W:0.023 / U:93.292 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site