1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/char/drm/i915_irq.c b/drivers/char/drm/i915_irq.c
index b273fe4e1345..92653b38e64c 100644
--- a/drivers/char/drm/i915_irq.c
+++ b/drivers/char/drm/i915_irq.c
@@ -276,7 +276,7 @@ static int i915_emit_irq(struct drm_device * dev)
 
         i915_kernel_lost_context(dev);
 
-        DRM_DEBUG("%s\n", __FUNCTION__);
+        DRM_DEBUG("\n");
 
         dev_priv->sarea_priv->last_enqueue = ++dev_priv->counter;
 
@@ -300,7 +300,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
         drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
         int ret = 0;
 
-        DRM_DEBUG("%s irq_nr=%d breadcrumb=%d\n", __FUNCTION__, irq_nr,
+        DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
                   READ_BREADCRUMB(dev_priv));
 
         if (READ_BREADCRUMB(dev_priv) >= irq_nr)
@@ -312,8 +312,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
                     READ_BREADCRUMB(dev_priv) >= irq_nr);
 
         if (ret == -EBUSY) {
-                DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n",
-                          __FUNCTION__,
+                DRM_ERROR("EBUSY -- rec: %d emitted: %d\n",
                           READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
         }
 
@@ -329,7 +328,7 @@ static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequ
         int ret = 0;
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
@@ -365,7 +364,7 @@ int i915_irq_emit(struct drm_device *dev, void *data,
         LOCK_TEST_WITH_RETURN(dev, file_priv);
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
@@ -388,7 +387,7 @@ int i915_irq_wait(struct drm_device *dev, void *data,
         drm_i915_irq_wait_t *irqwait = data;
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
@@ -418,13 +417,12 @@ int i915_vblank_pipe_set(struct drm_device *dev, void *data,
         drm_i915_vblank_pipe_t *pipe = data;
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
         if (pipe->pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {
-                DRM_ERROR("%s called with invalid pipe 0x%x\n",
-                          __FUNCTION__, pipe->pipe);
+                DRM_ERROR("called with invalid pipe 0x%x\n", pipe->pipe);
                 return -EINVAL;
         }
 
@@ -443,7 +441,7 @@ int i915_vblank_pipe_get(struct drm_device *dev, void *data,
         u16 flag;
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }