1 files changed, 29 insertions, 29 deletions

diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c
index 8e7d713a5a15..a7566ff1a3ea 100644
--- a/drivers/char/drm/i915_dma.c
+++ b/drivers/char/drm/i915_dma.c
@@ -70,7 +70,7 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
                 last_head = ring->head;
         }
 
-        return DRM_ERR(EBUSY);
+        return -EBUSY;
 }
 
 void i915_kernel_lost_context(struct drm_device * dev)
@@ -137,7 +137,7 @@ static int i915_initialize(struct drm_device * dev,
                 DRM_ERROR("can not find sarea!\n");
                 dev->dev_private = (void *)dev_priv;
                 i915_dma_cleanup(dev);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         dev_priv->mmio_map = drm_core_findmap(dev, init->mmio_offset);
@@ -145,7 +145,7 @@ static int i915_initialize(struct drm_device * dev,
                 dev->dev_private = (void *)dev_priv;
                 i915_dma_cleanup(dev);
                 DRM_ERROR("can not find mmio map!\n");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         dev_priv->sarea_priv = (drm_i915_sarea_t *)
@@ -169,7 +169,7 @@ static int i915_initialize(struct drm_device * dev,
                 i915_dma_cleanup(dev);
                 DRM_ERROR("can not ioremap virtual address for"
                           " ring buffer\n");
-                return DRM_ERR(ENOMEM);
+                return -ENOMEM;
         }
 
         dev_priv->ring.virtual_start = dev_priv->ring.map.handle;
@@ -200,7 +200,7 @@ static int i915_initialize(struct drm_device * dev,
                         dev->dev_private = (void *)dev_priv;
                         i915_dma_cleanup(dev);
                         DRM_ERROR("Can not allocate hardware status page\n");
-                        return DRM_ERR(ENOMEM);
+                        return -ENOMEM;
                 }
                 dev_priv->hw_status_page = dev_priv->status_page_dmah->vaddr;
                 dev_priv->dma_status_page = dev_priv->status_page_dmah->busaddr;
@@ -221,24 +221,24 @@ static int i915_dma_resume(struct drm_device * dev)
 
         if (!dev_priv->sarea) {
                 DRM_ERROR("can not find sarea!\n");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (!dev_priv->mmio_map) {
                 DRM_ERROR("can not find mmio map!\n");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (dev_priv->ring.map.handle == NULL) {
                 DRM_ERROR("can not ioremap virtual address for"
                           " ring buffer\n");
-                return DRM_ERR(ENOMEM);
+                return -ENOMEM;
         }
 
         /* Program Hardware Status Page */
         if (!dev_priv->hw_status_page) {
                 DRM_ERROR("Can not find hardware status page\n");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         DRM_DEBUG("hw status page @ %p\n", dev_priv->hw_status_page);
 
@@ -266,7 +266,7 @@ static int i915_dma_init(DRM_IOCTL_ARGS)
                 dev_priv = drm_alloc(sizeof(drm_i915_private_t),
                                      DRM_MEM_DRIVER);
                 if (dev_priv == NULL)
-                        return DRM_ERR(ENOMEM);
+                        return -ENOMEM;
                 retcode = i915_initialize(dev, dev_priv, &init);
                 break;
         case I915_CLEANUP_DMA:
@@ -276,7 +276,7 @@ static int i915_dma_init(DRM_IOCTL_ARGS)
                 retcode = i915_dma_resume(dev);
                 break;
         default:
-                retcode = DRM_ERR(EINVAL);
+                retcode = -EINVAL;
                 break;
         }
 
@@ -366,7 +366,7 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor
         RING_LOCALS;
 
         if ((dwords+1) * sizeof(int) >= dev_priv->ring.Size - 8)
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
 
         BEGIN_LP_RING((dwords+1)&~1);
 
@@ -374,17 +374,17 @@ static int i915_emit_cmds(struct drm_device * dev, int __user * buffer, int dwor
                 int cmd, sz;
 
                 if (DRM_COPY_FROM_USER_UNCHECKED(&cmd, &buffer[i], sizeof(cmd)))
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
 
                 if ((sz = validate_cmd(cmd)) == 0 || i + sz > dwords)
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
 
                 OUT_RING(cmd);
 
                 while (++i, --sz) {
                         if (DRM_COPY_FROM_USER_UNCHECKED(&cmd, &buffer[i],
                                                          sizeof(cmd))) {
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
                         OUT_RING(cmd);
                 }
@@ -407,13 +407,13 @@ static int i915_emit_box(struct drm_device * dev,
         RING_LOCALS;
 
         if (DRM_COPY_FROM_USER_UNCHECKED(&box, &boxes[i], sizeof(box))) {
-                return DRM_ERR(EFAULT);
+                return -EFAULT;
         }
 
         if (box.y2 <= box.y1 || box.x2 <= box.x1 || box.y2 <= 0 || box.x2 <= 0) {
                 DRM_ERROR("Bad box %d,%d..%d,%d\n",
                           box.x1, box.y1, box.x2, box.y2);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (IS_I965G(dev)) {
@@ -467,7 +467,7 @@ static int i915_dispatch_cmdbuffer(struct drm_device * dev,
 
         if (cmd->sz & 0x3) {
                 DRM_ERROR("alignment");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         i915_kernel_lost_context(dev);
@@ -502,7 +502,7 @@ static int i915_dispatch_batchbuffer(struct drm_device * dev,
 
         if ((batch->start | batch->used) & 0x7) {
                 DRM_ERROR("alignment");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         i915_kernel_lost_context(dev);
@@ -619,7 +619,7 @@ static int i915_batchbuffer(DRM_IOCTL_ARGS)
 
         if (!dev_priv->allow_batchbuffer) {
                 DRM_ERROR("Batchbuffer ioctl disabled\n");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         DRM_COPY_FROM_USER_IOCTL(batch, (drm_i915_batchbuffer_t __user *) data,
@@ -633,7 +633,7 @@ static int i915_batchbuffer(DRM_IOCTL_ARGS)
         if (batch.num_cliprects && DRM_VERIFYAREA_READ(batch.cliprects,
                                                        batch.num_cliprects *
                                                        sizeof(struct drm_clip_rect)))
-                return DRM_ERR(EFAULT);
+                return -EFAULT;
 
         ret = i915_dispatch_batchbuffer(dev, &batch);
 
@@ -664,7 +664,7 @@ static int i915_cmdbuffer(DRM_IOCTL_ARGS)
                                 cmdbuf.num_cliprects *
                                 sizeof(struct drm_clip_rect))) {
                 DRM_ERROR("Fault accessing cliprects\n");
-                return DRM_ERR(EFAULT);
+                return -EFAULT;
         }
 
         ret = i915_dispatch_cmdbuffer(dev, &cmdbuf);
@@ -697,7 +697,7 @@ static int i915_getparam(DRM_IOCTL_ARGS)
 
         if (!dev_priv) {
                 DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         DRM_COPY_FROM_USER_IOCTL(param, (drm_i915_getparam_t __user *) data,
@@ -715,12 +715,12 @@ static int i915_getparam(DRM_IOCTL_ARGS)
                 break;
         default:
                 DRM_ERROR("Unknown parameter %d\n", param.param);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
                 DRM_ERROR("DRM_COPY_TO_USER failed\n");
-                return DRM_ERR(EFAULT);
+                return -EFAULT;
         }
 
         return 0;
@@ -734,7 +734,7 @@ static int i915_setparam(DRM_IOCTL_ARGS)
 
         if (!dev_priv) {
                 DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         DRM_COPY_FROM_USER_IOCTL(param, (drm_i915_setparam_t __user *) data,
@@ -753,7 +753,7 @@ static int i915_setparam(DRM_IOCTL_ARGS)
                 break;
         default:
                 DRM_ERROR("unknown parameter %d\n", param.param);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         return 0;
@@ -767,7 +767,7 @@ static int i915_set_status_page(DRM_IOCTL_ARGS)
 
         if (!dev_priv) {
                 DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         DRM_COPY_FROM_USER_IOCTL(hws, (drm_i915_hws_addr_t __user *) data,
                         sizeof(hws));
@@ -788,7 +788,7 @@ static int i915_set_status_page(DRM_IOCTL_ARGS)
                 dev_priv->status_gfx_addr = 0;
                 DRM_ERROR("can not ioremap virtual address for"
                                 " G33 hw status page\n");
-                return DRM_ERR(ENOMEM);
+                return -ENOMEM;
         }
         dev_priv->hw_status_page = dev_priv->hws_map.handle;