drm: Remove DRM_ERR OS macro.

This was used to make all ioctl handlers return -errno on linux and errno on
*BSD.  Instead, just return -errno in shared code, and flip sign on return f
shared code to *BSD code.

Signed-off-by: Dave Airlie <airlied@linux.ie>

1 files changed, 48 insertions, 48 deletions

diff --git a/drivers/char/drm/savage_state.c b/drivers/char/drm/savage_state.c
index 77497841478..00e59bfd658 100644
--- a/drivers/char/drm/savage_state.c
+++ b/drivers/char/drm/savage_state.c
@@ -83,7 +83,7 @@ static int savage_verify_texaddr(drm_savage_private_t * dev_priv, int unit,
 {
         if ((addr & 6) != 2) {  /* reserved bits */
                 DRM_ERROR("bad texAddr%d %08x (reserved bits)\n", unit, addr);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
         if (!(addr & 1)) {      /* local */
                 addr &= ~7;
@@ -92,13 +92,13 @@ static int savage_verify_texaddr(drm_savage_private_t * dev_priv, int unit,
                         DRM_ERROR
                             ("bad texAddr%d %08x (local addr out of range)\n",
                              unit, addr);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         } else {                /* AGP */
                 if (!dev_priv->agp_textures) {
                         DRM_ERROR("bad texAddr%d %08x (AGP not available)\n",
                                   unit, addr);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 addr &= ~7;
                 if (addr < dev_priv->agp_textures->offset ||
@@ -107,7 +107,7 @@ static int savage_verify_texaddr(drm_savage_private_t * dev_priv, int unit,
                         DRM_ERROR
                             ("bad texAddr%d %08x (AGP addr out of range)\n",
                              unit, addr);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         }
         return 0;
@@ -133,7 +133,7 @@ static int savage_verify_state_s3d(drm_savage_private_t * dev_priv,
             start + count - 1 > SAVAGE_DESTTEXRWWATERMARK_S3D) {
                 DRM_ERROR("invalid register range (0x%04x-0x%04x)\n",
                           start, start + count - 1);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         SAVE_STATE_MASK(SAVAGE_SCSTART_S3D, s3d.new_scstart,
@@ -165,7 +165,7 @@ static int savage_verify_state_s4(drm_savage_private_t * dev_priv,
             start + count - 1 > SAVAGE_TEXBLENDCOLOR_S4) {
                 DRM_ERROR("invalid register range (0x%04x-0x%04x)\n",
                           start, start + count - 1);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         SAVE_STATE_MASK(SAVAGE_DRAWCTRL0_S4, s4.new_drawctrl0,
@@ -289,7 +289,7 @@ static int savage_dispatch_dma_prim(drm_savage_private_t * dev_priv,
 
         if (!dmabuf) {
                 DRM_ERROR("called without dma buffers!\n");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (!n)
@@ -303,7 +303,7 @@ static int savage_dispatch_dma_prim(drm_savage_private_t * dev_priv,
                 if (n % 3 != 0) {
                         DRM_ERROR("wrong number of vertices %u in TRILIST\n",
                                   n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         case SAVAGE_PRIM_TRISTRIP:
@@ -312,18 +312,18 @@ static int savage_dispatch_dma_prim(drm_savage_private_t * dev_priv,
                         DRM_ERROR
                             ("wrong number of vertices %u in TRIFAN/STRIP\n",
                              n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         default:
                 DRM_ERROR("invalid primitive type %u\n", prim);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
                 if (skip != 0) {
                         DRM_ERROR("invalid skip flags 0x%04x for DMA\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         } else {
                 unsigned int size = 10 - (skip & 1) - (skip >> 1 & 1) -
@@ -331,18 +331,18 @@ static int savage_dispatch_dma_prim(drm_savage_private_t * dev_priv,
                     (skip >> 5 & 1) - (skip >> 6 & 1) - (skip >> 7 & 1);
                 if (skip > SAVAGE_SKIP_ALL_S4 || size != 8) {
                         DRM_ERROR("invalid skip flags 0x%04x for DMA\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 if (reorder) {
                         DRM_ERROR("TRILIST_201 used on Savage4 hardware\n");
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         }
 
         if (start + n > dmabuf->total / 32) {
                 DRM_ERROR("vertex indices (%u-%u) out of range (0-%u)\n",
                           start, start + n - 1, dmabuf->total / 32);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         /* Vertex DMA doesn't work with command DMA at the same time,
@@ -440,7 +440,7 @@ static int savage_dispatch_vb_prim(drm_savage_private_t * dev_priv,
                 if (n % 3 != 0) {
                         DRM_ERROR("wrong number of vertices %u in TRILIST\n",
                                   n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         case SAVAGE_PRIM_TRISTRIP:
@@ -449,24 +449,24 @@ static int savage_dispatch_vb_prim(drm_savage_private_t * dev_priv,
                         DRM_ERROR
                             ("wrong number of vertices %u in TRIFAN/STRIP\n",
                              n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         default:
                 DRM_ERROR("invalid primitive type %u\n", prim);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
                 if (skip > SAVAGE_SKIP_ALL_S3D) {
                         DRM_ERROR("invalid skip flags 0x%04x\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 vtx_size = 8;   /* full vertex */
         } else {
                 if (skip > SAVAGE_SKIP_ALL_S4) {
                         DRM_ERROR("invalid skip flags 0x%04x\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 vtx_size = 10;  /* full vertex */
         }
@@ -478,13 +478,13 @@ static int savage_dispatch_vb_prim(drm_savage_private_t * dev_priv,
         if (vtx_size > vb_stride) {
                 DRM_ERROR("vertex size greater than vb stride (%u > %u)\n",
                           vtx_size, vb_stride);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (start + n > vb_size / (vb_stride * 4)) {
                 DRM_ERROR("vertex indices (%u-%u) out of range (0-%u)\n",
                           start, start + n - 1, vb_size / (vb_stride * 4));
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         prim <<= 25;
@@ -547,7 +547,7 @@ static int savage_dispatch_dma_idx(drm_savage_private_t * dev_priv,
 
         if (!dmabuf) {
                 DRM_ERROR("called without dma buffers!\n");
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (!n)
@@ -560,7 +560,7 @@ static int savage_dispatch_dma_idx(drm_savage_private_t * dev_priv,
         case SAVAGE_PRIM_TRILIST:
                 if (n % 3 != 0) {
                         DRM_ERROR("wrong number of indices %u in TRILIST\n", n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         case SAVAGE_PRIM_TRISTRIP:
@@ -568,18 +568,18 @@ static int savage_dispatch_dma_idx(drm_savage_private_t * dev_priv,
                 if (n < 3) {
                         DRM_ERROR
                             ("wrong number of indices %u in TRIFAN/STRIP\n", n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         default:
                 DRM_ERROR("invalid primitive type %u\n", prim);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
                 if (skip != 0) {
                         DRM_ERROR("invalid skip flags 0x%04x for DMA\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         } else {
                 unsigned int size = 10 - (skip & 1) - (skip >> 1 & 1) -
@@ -587,11 +587,11 @@ static int savage_dispatch_dma_idx(drm_savage_private_t * dev_priv,
                     (skip >> 5 & 1) - (skip >> 6 & 1) - (skip >> 7 & 1);
                 if (skip > SAVAGE_SKIP_ALL_S4 || size != 8) {
                         DRM_ERROR("invalid skip flags 0x%04x for DMA\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 if (reorder) {
                         DRM_ERROR("TRILIST_201 used on Savage4 hardware\n");
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
         }
 
@@ -628,7 +628,7 @@ static int savage_dispatch_dma_idx(drm_savage_private_t * dev_priv,
                         if (idx[i] > dmabuf->total / 32) {
                                 DRM_ERROR("idx[%u]=%u out of range (0-%u)\n",
                                           i, idx[i], dmabuf->total / 32);
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
                 }
 
@@ -698,7 +698,7 @@ static int savage_dispatch_vb_idx(drm_savage_private_t * dev_priv,
         case SAVAGE_PRIM_TRILIST:
                 if (n % 3 != 0) {
                         DRM_ERROR("wrong number of indices %u in TRILIST\n", n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         case SAVAGE_PRIM_TRISTRIP:
@@ -706,24 +706,24 @@ static int savage_dispatch_vb_idx(drm_savage_private_t * dev_priv,
                 if (n < 3) {
                         DRM_ERROR
                             ("wrong number of indices %u in TRIFAN/STRIP\n", n);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 break;
         default:
                 DRM_ERROR("invalid primitive type %u\n", prim);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         if (S3_SAVAGE3D_SERIES(dev_priv->chipset)) {
                 if (skip > SAVAGE_SKIP_ALL_S3D) {
                         DRM_ERROR("invalid skip flags 0x%04x\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 vtx_size = 8;   /* full vertex */
         } else {
                 if (skip > SAVAGE_SKIP_ALL_S4) {
                         DRM_ERROR("invalid skip flags 0x%04x\n", skip);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 vtx_size = 10;  /* full vertex */
         }
@@ -735,7 +735,7 @@ static int savage_dispatch_vb_idx(drm_savage_private_t * dev_priv,
         if (vtx_size > vb_stride) {
                 DRM_ERROR("vertex size greater than vb stride (%u > %u)\n",
                           vtx_size, vb_stride);
-                return DRM_ERR(EINVAL);
+                return -EINVAL;
         }
 
         prim <<= 25;
@@ -748,7 +748,7 @@ static int savage_dispatch_vb_idx(drm_savage_private_t * dev_priv,
                         if (idx[i] > vb_size / (vb_stride * 4)) {
                                 DRM_ERROR("idx[%u]=%u out of range (0-%u)\n",
                                           i, idx[i], vb_size / (vb_stride * 4));
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
                 }
 
@@ -942,7 +942,7 @@ static int savage_dispatch_draw(drm_savage_private_t * dev_priv,
                                 DRM_ERROR("IMPLEMENTATION ERROR: "
                                           "non-drawing-command %d\n",
                                           cmd_header.cmd.cmd);
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
 
                         if (ret != 0)
@@ -979,7 +979,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
                         DRM_ERROR
                             ("vertex buffer index %u out of range (0-%u)\n",
                              cmdbuf.dma_idx, dma->buf_count - 1);
-                        return DRM_ERR(EINVAL);
+                        return -EINVAL;
                 }
                 dmabuf = dma->buflist[cmdbuf.dma_idx];
         } else {
@@ -994,26 +994,26 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
         if (cmdbuf.size) {
                 kcmd_addr = drm_alloc(cmdbuf.size * 8, DRM_MEM_DRIVER);
                 if (kcmd_addr == NULL)
-                        return DRM_ERR(ENOMEM);
+                        return -ENOMEM;
 
                 if (DRM_COPY_FROM_USER(kcmd_addr, cmdbuf.cmd_addr,
                                        cmdbuf.size * 8))
                 {
                         drm_free(kcmd_addr, cmdbuf.size * 8, DRM_MEM_DRIVER);
-                        return DRM_ERR(EFAULT);
+                        return -EFAULT;
                 }
                 cmdbuf.cmd_addr = kcmd_addr;
         }
         if (cmdbuf.vb_size) {
                 kvb_addr = drm_alloc(cmdbuf.vb_size, DRM_MEM_DRIVER);
                 if (kvb_addr == NULL) {
-                        ret = DRM_ERR(ENOMEM);
+                        ret = -ENOMEM;
                         goto done;
                 }
 
                 if (DRM_COPY_FROM_USER(kvb_addr, cmdbuf.vb_addr,
                                        cmdbuf.vb_size)) {
-                        ret = DRM_ERR(EFAULT);
+                        ret = -EFAULT;
                         goto done;
                 }
                 cmdbuf.vb_addr = kvb_addr;
@@ -1022,13 +1022,13 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
                 kbox_addr = drm_alloc(cmdbuf.nbox * sizeof(struct drm_clip_rect),
                                        DRM_MEM_DRIVER);
                 if (kbox_addr == NULL) {
-                        ret = DRM_ERR(ENOMEM);
+                        ret = -ENOMEM;
                         goto done;
                 }
 
                 if (DRM_COPY_FROM_USER(kbox_addr, cmdbuf.box_addr,
                                        cmdbuf.nbox * sizeof(struct drm_clip_rect))) {
-                        ret = DRM_ERR(EFAULT);
+                        ret = -EFAULT;
                         goto done;
                 }
         cmdbuf.box_addr = kbox_addr;
@@ -1061,7 +1061,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
                                 DRM_ERROR("indexed drawing command extends "
                                           "beyond end of command buffer\n");
                                 DMA_FLUSH();
-                                return DRM_ERR(EINVAL);
+                                return -EINVAL;
                         }
                         /* fall through */
                 case SAVAGE_CMD_DMA_PRIM:
@@ -1094,7 +1094,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
                                 DRM_ERROR("command SAVAGE_CMD_STATE extends "
                                           "beyond end of command buffer\n");
                                 DMA_FLUSH();
-                                ret = DRM_ERR(EINVAL);
+                                ret = -EINVAL;
                                 goto done;
                         }
                         ret = savage_dispatch_state(dev_priv, &cmd_header,
@@ -1107,7 +1107,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
                                 DRM_ERROR("command SAVAGE_CMD_CLEAR extends "
                                           "beyond end of command buffer\n");
                                 DMA_FLUSH();
-                                ret = DRM_ERR(EINVAL);
+                                ret = -EINVAL;
                                 goto done;
                         }
                         ret = savage_dispatch_clear(dev_priv, &cmd_header,
@@ -1123,7 +1123,7 @@ int savage_bci_cmdbuf(DRM_IOCTL_ARGS)
                 default:
                         DRM_ERROR("invalid command 0x%x\n", cmd_header.cmd.cmd);
                         DMA_FLUSH();
-                        ret = DRM_ERR(EINVAL);
+                        ret = -EINVAL;
                         goto done;
                 }