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/i915_dma.c | |
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/i915_dma.c')
-rw-r--r-- | drivers/char/drm/i915_dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c index ef7bf143a80..f47e46e3529 100644 --- a/drivers/char/drm/i915_dma.c +++ b/drivers/char/drm/i915_dma.c | |||
@@ -194,7 +194,7 @@ static int i915_dma_resume(struct drm_device * dev) | |||
194 | { | 194 | { |
195 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; | 195 | drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private; |
196 | 196 | ||
197 | DRM_DEBUG("%s\n", __FUNCTION__); | 197 | DRM_DEBUG("%s\n", __func__); |
198 | 198 | ||
199 | if (!dev_priv->sarea) { | 199 | if (!dev_priv->sarea) { |
200 | DRM_ERROR("can not find sarea!\n"); | 200 | DRM_ERROR("can not find sarea!\n"); |
@@ -609,7 +609,7 @@ static int i915_quiescent(struct drm_device * dev) | |||
609 | drm_i915_private_t *dev_priv = dev->dev_private; | 609 | drm_i915_private_t *dev_priv = dev->dev_private; |
610 | 610 | ||
611 | i915_kernel_lost_context(dev); | 611 | i915_kernel_lost_context(dev); |
612 | return i915_wait_ring(dev, dev_priv->ring.Size - 8, __FUNCTION__); | 612 | return i915_wait_ring(dev, dev_priv->ring.Size - 8, __func__); |
613 | } | 613 | } |
614 | 614 | ||
615 | static int i915_flush_ioctl(struct drm_device *dev, void *data, | 615 | static int i915_flush_ioctl(struct drm_device *dev, void *data, |