1 files changed, 30 insertions, 30 deletions

diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c
index 4e5aca6ba59a..669aee68ce24 100644
--- a/drivers/char/drm/r300_cmdbuf.c
+++ b/drivers/char/drm/r300_cmdbuf.c
@@ -74,7 +74,7 @@ static int r300_emit_cliprects(drm_radeon_private_t *dev_priv,
                         if (DRM_COPY_FROM_USER_UNCHECKED
                             (&box, &cmdbuf->boxes[n + i], sizeof(box))) {
                                 DRM_ERROR("copy cliprect faulted\n");
-                                return DRM_ERR(EFAULT);
+                                return -EFAULT;
                         }
 
                         box.x1 =
@@ -263,7 +263,7 @@ static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
                 DRM_ERROR
                     ("Cannot emit more than 64 values at a time (reg=%04x sz=%d)\n",
                      reg, sz);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         for (i = 0; i < sz; i++) {
                 values[i] = ((int *)cmdbuf->buf)[i];
@@ -275,13 +275,13 @@ static __inline__ int r300_emit_carefully_checked_packet0(drm_radeon_private_t *
                                 DRM_ERROR
                                     ("Offset failed range check (reg=%04x sz=%d)\n",
                                      reg, sz);
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
                         break;
                 default:
                         DRM_ERROR("Register %04x failed check as flag=%02x\n",
                                   reg + i * 4, r300_reg_flags[(reg >> 2) + i]);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         }
 
@@ -317,12 +317,12 @@ static __inline__ int r300_emit_packet0(drm_radeon_private_t *dev_priv,
                 return 0;
 
         if (sz * 4 > cmdbuf->bufsz)
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
 
         if (reg + sz * 4 >= 0x10000) {
                 DRM_ERROR("No such registers in hardware reg=%04x sz=%d\n", reg,
                           sz);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (r300_check_range(reg, sz)) {
@@ -362,7 +362,7 @@ static __inline__ int r300_emit_vpu(drm_radeon_private_t *dev_priv,
         if (!sz)
                 return 0;
         if (sz * 16 > cmdbuf->bufsz)
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
 
         BEGIN_RING(5 + sz * 4);
         /* Wait for VAP to come to senses.. */
@@ -391,7 +391,7 @@ static __inline__ int r300_emit_clear(drm_radeon_private_t *dev_priv,
         RING_LOCALS;
 
         if (8 * 4 > cmdbuf->bufsz)
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
 
         BEGIN_RING(10);
         OUT_RING(CP_PACKET3(R200_3D_DRAW_IMMD_2, 8));
@@ -421,7 +421,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
         if ((count + 1) > MAX_ARRAY_PACKET) {
                 DRM_ERROR("Too large payload in 3D_LOAD_VBPNTR (count=%d)\n",
                           count);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         memset(payload, 0, MAX_ARRAY_PACKET * 4);
         memcpy(payload, cmdbuf->buf + 4, (count + 1) * 4);
@@ -437,7 +437,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
                         DRM_ERROR
                             ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
                              k, i);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 k++;
                 i++;
@@ -448,7 +448,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
                         DRM_ERROR
                             ("Offset failed range check (k=%d i=%d) while processing 3D_LOAD_VBPNTR packet.\n",
                              k, i);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 k++;
                 i++;
@@ -458,7 +458,7 @@ static __inline__ int r300_emit_3d_load_vbpntr(drm_radeon_private_t *dev_priv,
                 DRM_ERROR
                     ("Malformed 3D_LOAD_VBPNTR packet (k=%d i=%d narrays=%d count+1=%d).\n",
                      k, i, narrays, count + 1);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         /* all clear, output packet */
@@ -492,7 +492,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
                         ret = !radeon_check_offset(dev_priv, offset);
                         if (ret) {
                                 DRM_ERROR("Invalid bitblt first offset is %08X\n", offset);
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
                 }
 
@@ -502,7 +502,7 @@ static __inline__ int r300_emit_bitblt_multi(drm_radeon_private_t *dev_priv,
                         ret = !radeon_check_offset(dev_priv, offset);
                         if (ret) {
                                 DRM_ERROR("Invalid bitblt second offset is %08X\n", offset);
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
                         
                 }
@@ -530,12 +530,12 @@ static __inline__ int r300_emit_indx_buffer(drm_radeon_private_t *dev_priv,
 
         if ((cmd[1] & 0x8000ffff) != 0x80000810) {
                 DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         ret = !radeon_check_offset(dev_priv, cmd[2]);
         if (ret) {
                 DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         BEGIN_RING(count+2);
@@ -557,7 +557,7 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
         RING_LOCALS;
 
         if (4 > cmdbuf->bufsz)
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
 
         /* Fixme !! This simply emits a packet without much checking.
            We need to be smarter. */
@@ -568,7 +568,7 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
         /* Is it packet 3 ? */
         if ((header >> 30) != 0x3) {
                 DRM_ERROR("Not a packet3 header (0x%08x)\n", header);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         count = (header >> 16) & 0x3fff;
@@ -578,7 +578,7 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
                 DRM_ERROR
                     ("Expected packet3 of length %d but have only %d bytes left\n",
                      (count + 2) * 4, cmdbuf->bufsz);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         /* Is it a packet type we know about ? */
@@ -600,7 +600,7 @@ static __inline__ int r300_emit_raw_packet3(drm_radeon_private_t *dev_priv,
                 break;
         default:
                 DRM_ERROR("Unknown packet3 header (0x%08x)\n", header);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         BEGIN_RING(count + 2);
@@ -664,7 +664,7 @@ static __inline__ int r300_emit_packet3(drm_radeon_private_t *dev_priv,
                         DRM_ERROR("bad packet3 type %i at %p\n",
                                   header.packet3.packet,
                                   cmdbuf->buf - sizeof(header));
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
 
                 n += R300_SIMULTANEOUS_CLIPRECTS;
@@ -726,11 +726,11 @@ static int r300_scratch(drm_radeon_private_t *dev_priv,
         
         if (cmdbuf->bufsz < 
             (sizeof(u64) + header.scratch.n_bufs * sizeof(buf_idx))) {
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         
         if (header.scratch.reg >= 5) {
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         
         dev_priv->scratch_ages[header.scratch.reg]++;
@@ -745,21 +745,21 @@ static int r300_scratch(drm_radeon_private_t *dev_priv,
                 buf_idx *= 2; /* 8 bytes per buf */
                 
                 if (DRM_COPY_TO_USER(ref_age_base + buf_idx, &dev_priv->scratch_ages[header.scratch.reg], sizeof(u32))) {
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                                         
                 if (DRM_COPY_FROM_USER(&h_pending, ref_age_base + buf_idx + 1, sizeof(u32))) {
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                                         
                 if (h_pending == 0) {
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                                         
                 h_pending--;
                                                 
                 if (DRM_COPY_TO_USER(ref_age_base + buf_idx + 1, &h_pending, sizeof(u32))) {
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                                         
                 cmdbuf->buf += sizeof(buf_idx);
@@ -879,7 +879,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                         if (idx < 0 || idx >= dma->buf_count) {
                                 DRM_ERROR("buffer index %d (of %d max)\n",
                                           idx, dma->buf_count - 1);
-                                ret = DRM_ERR(EINVAL);
+                                ret = -EINVAL;
                                 goto cleanup;
                         }
 
@@ -887,7 +887,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                         if (buf->filp != filp || buf->pending) {
                                 DRM_ERROR("bad buffer %p %p %d\n",
                                           buf->filp, filp, buf->pending);
-                                ret = DRM_ERR(EINVAL);
+                                ret = -EINVAL;
                                 goto cleanup;
                         }
 
@@ -924,7 +924,7 @@ int r300_do_cp_cmdbuf(struct drm_device *dev,
                         DRM_ERROR("bad cmd_type %i at %p\n",
                                   header.header.cmd_type,
                                   cmdbuf->buf - sizeof(header));
-                        ret = DRM_ERR(EINVAL);
+                        ret = -EINVAL;
                         goto cleanup;
                 }
         }