1 files changed, 27 insertions, 27 deletions

diff --git a/drivers/char/drm/r128_cce.c b/drivers/char/drm/r128_cce.c
index b163ed09bd81..15e873627d53 100644
--- a/drivers/char/drm/r128_cce.c
+++ b/drivers/char/drm/r128_cce.c
@@ -129,7 +129,7 @@ static int r128_do_pixcache_flush(drm_r128_private_t * dev_priv)
 #if R128_FIFO_DEBUG
         DRM_ERROR("failed!\n");
 #endif
-        return DRM_ERR(EBUSY);
+        return -EBUSY;
 }
 
 static int r128_do_wait_for_fifo(drm_r128_private_t * dev_priv, int entries)
@@ -146,7 +146,7 @@ static int r128_do_wait_for_fifo(drm_r128_private_t * dev_priv, int entries)
 #if R128_FIFO_DEBUG
         DRM_ERROR("failed!\n");
 #endif
-        return DRM_ERR(EBUSY);
+        return -EBUSY;
 }
 
 static int r128_do_wait_for_idle(drm_r128_private_t * dev_priv)
@@ -168,7 +168,7 @@ static int r128_do_wait_for_idle(drm_r128_private_t * dev_priv)
 #if R128_FIFO_DEBUG
         DRM_ERROR("failed!\n");
 #endif
-        return DRM_ERR(EBUSY);
+        return -EBUSY;
 }
 
 /* ================================================================
@@ -227,7 +227,7 @@ int r128_do_cce_idle(drm_r128_private_t * dev_priv)
         DRM_ERROR("failed!\n");
         r128_status(dev_priv);
 #endif
-        return DRM_ERR(EBUSY);
+        return -EBUSY;
 }
 
 /* Start the Concurrent Command Engine.
@@ -355,7 +355,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
 
         dev_priv = drm_alloc(sizeof(drm_r128_private_t), DRM_MEM_DRIVER);
         if (dev_priv == NULL)
-                return DRM_ERR(ENOMEM);
+                return -ENOMEM;
 
         memset(dev_priv, 0, sizeof(drm_r128_private_t));
 
@@ -365,7 +365,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                 DRM_ERROR("PCI GART memory not allocated!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         dev_priv->usec_timeout = init->usec_timeout;
@@ -374,7 +374,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                 DRM_DEBUG("TIMEOUT problem!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         dev_priv->cce_mode = init->cce_mode;
@@ -394,7 +394,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                 DRM_DEBUG("Bad cce_mode!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         switch (init->cce_mode) {
@@ -461,7 +461,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                 DRM_ERROR("could not find sarea!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
@@ -469,21 +469,21 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                 DRM_ERROR("could not find mmio region!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         dev_priv->cce_ring = drm_core_findmap(dev, init->ring_offset);
         if (!dev_priv->cce_ring) {
                 DRM_ERROR("could not find cce ring region!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         dev_priv->ring_rptr = drm_core_findmap(dev, init->ring_rptr_offset);
         if (!dev_priv->ring_rptr) {
                 DRM_ERROR("could not find ring read pointer!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         dev->agp_buffer_token = init->buffers_offset;
         dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
@@ -491,7 +491,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                 DRM_ERROR("could not find dma buffer region!\n");
                 dev->dev_private = (void *)dev_priv;
                 r128_do_cleanup_cce(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (!dev_priv->is_pci) {
@@ -501,7 +501,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                         DRM_ERROR("could not find agp texture region!\n");
                         dev->dev_private = (void *)dev_priv;
                         r128_do_cleanup_cce(dev);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         }
 
@@ -520,7 +520,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                         DRM_ERROR("Could not ioremap agp regions!\n");
                         dev->dev_private = (void *)dev_priv;
                         r128_do_cleanup_cce(dev);
-                        return DRM_ERR(ENOMEM);
+                        return -ENOMEM;
                 }
         } else
 #endif
@@ -567,7 +567,7 @@ static int r128_do_init_cce(struct drm_device * dev, drm_r128_init_t * init)
                         DRM_ERROR("failed to init PCI GART!\n");
                         dev->dev_private = (void *)dev_priv;
                         r128_do_cleanup_cce(dev);
-                        return DRM_ERR(ENOMEM);
+                        return -ENOMEM;
                 }
                 R128_WRITE(R128_PCI_GART_PAGE, dev_priv->gart_info.bus_addr);
 #if __OS_HAS_AGP
@@ -644,7 +644,7 @@ int r128_cce_init(DRM_IOCTL_ARGS)
                 return r128_do_cleanup_cce(dev);
         }
 
-        return DRM_ERR(EINVAL);
+        return -EINVAL;
 }
 
 int r128_cce_start(DRM_IOCTL_ARGS)
@@ -721,7 +721,7 @@ int r128_cce_reset(DRM_IOCTL_ARGS)
 
         if (!dev_priv) {
                 DRM_DEBUG("%s called before init done\n", __FUNCTION__);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         r128_do_cce_reset(dev_priv);
@@ -759,7 +759,7 @@ int r128_engine_reset(DRM_IOCTL_ARGS)
 
 int r128_fullscreen(DRM_IOCTL_ARGS)
 {
-        return DRM_ERR(EINVAL);
+        return -EINVAL;
 }
 
 /* ================================================================
@@ -780,7 +780,7 @@ static int r128_freelist_init(struct drm_device * dev)
 
         dev_priv->head = drm_alloc(sizeof(drm_r128_freelist_t), DRM_MEM_DRIVER);
         if (dev_priv->head == NULL)
-                return DRM_ERR(ENOMEM);
+                return -ENOMEM;
 
         memset(dev_priv->head, 0, sizeof(drm_r128_freelist_t));
         dev_priv->head->age = R128_BUFFER_USED;
@@ -791,7 +791,7 @@ static int r128_freelist_init(struct drm_device * dev)
 
                 entry = drm_alloc(sizeof(drm_r128_freelist_t), DRM_MEM_DRIVER);
                 if (!entry)
-                        return DRM_ERR(ENOMEM);
+                        return -ENOMEM;
 
                 entry->age = R128_BUFFER_FREE;
                 entry->buf = buf;
@@ -883,7 +883,7 @@ int r128_wait_ring(drm_r128_private_t * dev_priv, int n)
 
         /* FIXME: This is being ignored... */
         DRM_ERROR("failed!\n");
-        return DRM_ERR(EBUSY);
+        return -EBUSY;
 }
 
 static int r128_cce_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm_dma * d)
@@ -894,16 +894,16 @@ static int r128_cce_get_buffers(DRMFILE filp, struct drm_device * dev, struct dr
         for (i = d->granted_count; i < d->request_count; i++) {
                 buf = r128_freelist_get(dev);
                 if (!buf)
-                        return DRM_ERR(EAGAIN);
+                        return -EAGAIN;
 
                 buf->filp = filp;
 
                 if (DRM_COPY_TO_USER(&d->request_indices[i], &buf->idx,
                                      sizeof(buf->idx)))
-                        return DRM_ERR(EFAULT);
+                        return -EFAULT;
                 if (DRM_COPY_TO_USER(&d->request_sizes[i], &buf->total,
                                      sizeof(buf->total)))
-                        return DRM_ERR(EFAULT);
+                        return -EFAULT;
 
                 d->granted_count++;
         }
@@ -927,7 +927,7 @@ int r128_cce_buffers(DRM_IOCTL_ARGS)
         if (d.send_count != 0) {
                 DRM_ERROR("Process %d trying to send %d buffers via drmDMA\n",
                           DRM_CURRENTPID, d.send_count);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         /* We'll send you buffers.
@@ -935,7 +935,7 @@ int r128_cce_buffers(DRM_IOCTL_ARGS)
         if (d.request_count < 0 || d.request_count > dma->buf_count) {
                 DRM_ERROR("Process %d trying to get %d buffers (of %d max)\n",
                           DRM_CURRENTPID, d.request_count, dma->buf_count);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         d.granted_count = 0;