diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-30 03:55:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-30 11:29:54 -0400 |
commit | bf9d89295233ae2ba7b312c78ee5657307b09f4c (patch) | |
tree | 3da2fbcd93937bfa1907a893dc0d418c78f3d37b /drivers/char/drm/drmP.h | |
parent | 8e24eea728068bbeb6a3c500b848f883a20bf225 (diff) |
drivers/char: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/drm/drmP.h')
-rw-r--r-- | drivers/char/drm/drmP.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index ecee3547a13f..213b3ca3468e 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h | |||
@@ -160,7 +160,7 @@ struct drm_device; | |||
160 | * \param arg arguments | 160 | * \param arg arguments |
161 | */ | 161 | */ |
162 | #define DRM_ERROR(fmt, arg...) \ | 162 | #define DRM_ERROR(fmt, arg...) \ |
163 | printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __FUNCTION__ , ##arg) | 163 | printk(KERN_ERR "[" DRM_NAME ":%s] *ERROR* " fmt , __func__ , ##arg) |
164 | 164 | ||
165 | /** | 165 | /** |
166 | * Memory error output. | 166 | * Memory error output. |
@@ -170,7 +170,7 @@ struct drm_device; | |||
170 | * \param arg arguments | 170 | * \param arg arguments |
171 | */ | 171 | */ |
172 | #define DRM_MEM_ERROR(area, fmt, arg...) \ | 172 | #define DRM_MEM_ERROR(area, fmt, arg...) \ |
173 | printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __FUNCTION__, \ | 173 | printk(KERN_ERR "[" DRM_NAME ":%s:%s] *ERROR* " fmt , __func__, \ |
174 | drm_mem_stats[area].name , ##arg) | 174 | drm_mem_stats[area].name , ##arg) |
175 | 175 | ||
176 | #define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg) | 176 | #define DRM_INFO(fmt, arg...) printk(KERN_INFO "[" DRM_NAME "] " fmt , ##arg) |
@@ -187,7 +187,7 @@ struct drm_device; | |||
187 | if ( drm_debug ) \ | 187 | if ( drm_debug ) \ |
188 | printk(KERN_DEBUG \ | 188 | printk(KERN_DEBUG \ |
189 | "[" DRM_NAME ":%s] " fmt , \ | 189 | "[" DRM_NAME ":%s] " fmt , \ |
190 | __FUNCTION__ , ##arg); \ | 190 | __func__ , ##arg); \ |
191 | } while (0) | 191 | } while (0) |
192 | #else | 192 | #else |
193 | #define DRM_DEBUG(fmt, arg...) do { } while (0) | 193 | #define DRM_DEBUG(fmt, arg...) do { } while (0) |
@@ -238,7 +238,7 @@ do { \ | |||
238 | if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) || \ | 238 | if ( !_DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ) || \ |
239 | dev->lock.file_priv != file_priv ) { \ | 239 | dev->lock.file_priv != file_priv ) { \ |
240 | DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\ | 240 | DRM_ERROR( "%s called without lock held, held %d owner %p %p\n",\ |
241 | __FUNCTION__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\ | 241 | __func__, _DRM_LOCK_IS_HELD( dev->lock.hw_lock->lock ),\ |
242 | dev->lock.file_priv, file_priv ); \ | 242 | dev->lock.file_priv, file_priv ); \ |
243 | return -EINVAL; \ | 243 | return -EINVAL; \ |
244 | } \ | 244 | } \ |