1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/char/drm/mga_state.c b/drivers/char/drm/mga_state.c
index 4cb95ecd465c..d3f8aade07b3 100644
--- a/drivers/char/drm/mga_state.c
+++ b/drivers/char/drm/mga_state.c
@@ -619,7 +619,7 @@ static void mga_dma_dispatch_swap(struct drm_device * dev)
 
         FLUSH_DMA();
 
-        DRM_DEBUG("%s... done.\n", __FUNCTION__);
+        DRM_DEBUG("... done.\n");
 }
 
 static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * buf)
@@ -631,7 +631,7 @@ static void mga_dma_dispatch_vertex(struct drm_device * dev, struct drm_buf * bu
         u32 length = (u32) buf->used;
         int i = 0;
         DMA_LOCALS;
-        DRM_DEBUG("vertex: buf=%d used=%d\n", buf->idx, buf->used);
+        DRM_DEBUG("buf=%d used=%d\n", buf->idx, buf->used);
 
         if (buf->used) {
                 buf_priv->dispatched = 1;
@@ -678,7 +678,7 @@ static void mga_dma_dispatch_indices(struct drm_device * dev, struct drm_buf * b
         u32 address = (u32) buf->bus_address;
         int i = 0;
         DMA_LOCALS;
-        DRM_DEBUG("indices: buf=%d start=%d end=%d\n", buf->idx, start, end);
+        DRM_DEBUG("buf=%d start=%d end=%d\n", buf->idx, start, end);
 
         if (start != end) {
                 buf_priv->dispatched = 1;
@@ -955,7 +955,7 @@ static int mga_dma_iload(struct drm_device *dev, void *data, struct drm_file *fi
 #if 0
         if (mga_do_wait_for_idle(dev_priv) < 0) {
                 if (MGA_DMA_DEBUG)
-                        DRM_INFO("%s: -EBUSY\n", __FUNCTION__);
+                        DRM_INFO("-EBUSY\n");
                 return -EBUSY;
         }
 #endif
@@ -1014,7 +1014,7 @@ static int mga_getparam(struct drm_device *dev, void *data, struct drm_file *fil
         int value;
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
@@ -1046,7 +1046,7 @@ static int mga_set_fence(struct drm_device *dev, void *data, struct drm_file *fi
         DMA_LOCALS;
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }
 
@@ -1075,7 +1075,7 @@ file_priv)
         u32 *fence = data;
 
         if (!dev_priv) {
-                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
+                DRM_ERROR("called with no initialization\n");
                 return -EINVAL;
         }