From: Harvey Harrison Date: Mon, 21 Apr 2008 07:51:04 +0000 (+0200) Subject: block: replace remaining __FUNCTION__ occurrences X-Git-Tag: v2.6.26-rc1~1115^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cece933994428974f7a0ee1e8843ba5bd0b18563;p=linux-2.6-omap-h63xx.git block: replace remaining __FUNCTION__ occurrences __FUNCTION__ is gcc-specific, use __func__ Signed-off-by: Harvey Harrison Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe --- diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index cd5674b63fa..a18e1ca0f76 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c @@ -79,9 +79,9 @@ MODULE_PARM_DESC(max_queue, "Maximum number of queued commands. (min==1, max==30 /* note: prints function name for you */ #ifdef CARM_DEBUG -#define DPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args) +#define DPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) #ifdef CARM_VERBOSE_DEBUG -#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args) +#define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) #else #define VPRINTK(fmt, args...) #endif /* CARM_VERBOSE_DEBUG */ @@ -96,7 +96,7 @@ MODULE_PARM_DESC(max_queue, "Maximum number of queued commands. (min==1, max==30 #define assert(expr) \ if(unlikely(!(expr))) { \ printk(KERN_ERR "Assertion failed! %s,%s,%s,line=%d\n", \ - #expr,__FILE__,__FUNCTION__,__LINE__); \ + #expr, __FILE__, __func__, __LINE__); \ } #endif