Remove DRM_ERR OS macro.
authorEric Anholt <eric@anholt.net>
Fri, 20 Jul 2007 00:00:17 +0000 (17:00 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 20 Jul 2007 19:53:52 +0000 (12:53 -0700)
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 from
shared code to *BSD code.

59 files changed:
bsd-core/drmP.h
bsd-core/drm_auth.c
bsd-core/drm_bufs.c
bsd-core/drm_context.c
bsd-core/drm_dma.c
bsd-core/drm_drv.c
bsd-core/drm_fops.c
bsd-core/drm_ioctl.c
bsd-core/drm_irq.c
bsd-core/drm_vm.c
linux-core/drm_drawable.c
linux-core/drm_ioctl.c
linux-core/drm_lock.c
linux-core/drm_os_linux.h
linux-core/i810_dma.c
linux-core/nouveau_sgdma.c
linux-core/sis_drv.c
linux-core/sis_mm.c
linux-core/via_buffer.c
linux-core/via_dmablit.c
linux-core/via_fence.c
linux-core/via_mm.c
shared-core/i915_dma.c
shared-core/i915_irq.c
shared-core/i915_mem.c
shared-core/mach64_dma.c
shared-core/mach64_drv.h
shared-core/mach64_state.c
shared-core/mga_dma.c
shared-core/mga_drv.h
shared-core/mga_state.c
shared-core/mga_warp.c
shared-core/nouveau_fifo.c
shared-core/nouveau_mem.c
shared-core/nouveau_notifier.c
shared-core/nouveau_object.c
shared-core/nouveau_state.c
shared-core/nv04_instmem.c
shared-core/nv20_graph.c
shared-core/nv30_graph.c
shared-core/nv40_graph.c
shared-core/nv50_fifo.c
shared-core/nv50_graph.c
shared-core/nv50_instmem.c
shared-core/r128_cce.c
shared-core/r128_drv.h
shared-core/r128_state.c
shared-core/r300_cmdbuf.c
shared-core/radeon_cp.c
shared-core/radeon_irq.c
shared-core/radeon_mem.c
shared-core/radeon_state.c
shared-core/savage_bci.c
shared-core/savage_state.c
shared-core/sis_mm.c
shared-core/via_dma.c
shared-core/via_irq.c
shared-core/via_map.c
shared-core/via_verifier.c

index ff8ad47..e9271ff 100644 (file)
@@ -377,7 +377,6 @@ typedef vaddr_t vm_offset_t;
 #define cpu_to_le32(x) htole32(x)
 #define le32_to_cpu(x) le32toh(x)
 
-#define DRM_ERR(v)             v
 #define DRM_HZ                 hz
 #define DRM_UDELAY(udelay)     DELAY(udelay)
 #define DRM_TIME_SLICE         (hz/20)  /* Time slice for GLXContexts    */
@@ -415,7 +414,7 @@ for ( ret = 0 ; !ret && !(condition) ; ) {                  \
        DRM_UNLOCK();                                           \
        mtx_lock(&dev->irq_lock);                               \
        if (!(condition))                                       \
-          ret = msleep(&(queue), &dev->irq_lock,               \
+          ret = -msleep(&(queue), &dev->irq_lock,              \
                         PZERO | PCATCH, "drmwtq", (timeout));  \
        mtx_unlock(&dev->irq_lock);                             \
        DRM_LOCK();                                             \
index aa0e29c..556bf89 100644 (file)
@@ -66,7 +66,7 @@ static int drm_add_magic(drm_device_t *dev, drm_file_t *priv, drm_magic_t magic)
 
        hash = drm_hash_magic(magic);
        entry = malloc(sizeof(*entry), M_DRM, M_ZERO | M_NOWAIT);
-       if (!entry) return DRM_ERR(ENOMEM);
+       if (!entry) return ENOMEM;
        entry->magic = magic;
        entry->priv  = priv;
        entry->next  = NULL;
@@ -112,7 +112,7 @@ static int drm_remove_magic(drm_device_t *dev, drm_magic_t magic)
        DRM_UNLOCK();
 
        free(pt, M_DRM);
-       return DRM_ERR(EINVAL);
+       return EINVAL;
 }
 
 int drm_getmagic(DRM_IOCTL_ARGS)
@@ -168,5 +168,5 @@ int drm_authmagic(DRM_IOCTL_ARGS)
                drm_remove_magic(dev, auth.magic);
                return 0;
        }
-       return DRM_ERR(EINVAL);
+       return EINVAL;
 }
index 343ab1e..de28a2c 100644 (file)
@@ -149,7 +149,7 @@ int drm_addmap(drm_device_t * dev, unsigned long offset, unsigned long size,
         */
        map = malloc(sizeof(*map), M_DRM, M_ZERO | M_NOWAIT);
        if ( !map )
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
 
        map->offset = offset;
        map->size = size;
@@ -172,7 +172,7 @@ int drm_addmap(drm_device_t * dev, unsigned long offset, unsigned long size,
                           map->size, drm_order(map->size), map->handle );
                if ( !map->handle ) {
                        free(map, M_DRM);
-                       return DRM_ERR(ENOMEM);
+                       return ENOMEM;
                }
                map->offset = (unsigned long)map->handle;
                if ( map->flags & _DRM_CONTAINS_LOCK ) {
@@ -182,7 +182,7 @@ int drm_addmap(drm_device_t * dev, unsigned long offset, unsigned long size,
                                DRM_UNLOCK();
                                free(map->handle, M_DRM);
                                free(map, M_DRM);
-                               return DRM_ERR(EBUSY);
+                               return EBUSY;
                        }
                        dev->lock.hw_lock = map->handle; /* Pointer to lock */
                        DRM_UNLOCK();
@@ -202,13 +202,13 @@ int drm_addmap(drm_device_t * dev, unsigned long offset, unsigned long size,
                }
                if (!valid) {
                        free(map, M_DRM);
-                       return DRM_ERR(EACCES);
+                       return EACCES;
                }*/
                break;
        case _DRM_SCATTER_GATHER:
                if (!dev->sg) {
                        free(map, M_DRM);
-                       return DRM_ERR(EINVAL);
+                       return EINVAL;
                }
                map->offset = map->offset + dev->sg->handle;
                break;
@@ -225,7 +225,7 @@ int drm_addmap(drm_device_t * dev, unsigned long offset, unsigned long size,
                map->dmah = drm_pci_alloc(dev, map->size, align, 0xfffffffful);
                if (map->dmah == NULL) {
                        free(map, M_DRM);
-                       return DRM_ERR(ENOMEM);
+                       return ENOMEM;
                }
                map->handle = map->dmah->vaddr;
                map->offset = map->dmah->busaddr;
@@ -233,7 +233,7 @@ int drm_addmap(drm_device_t * dev, unsigned long offset, unsigned long size,
        default:
                DRM_ERROR("Bad map type %d\n", map->type);
                free(map, M_DRM);
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 
        DRM_LOCK();
@@ -258,12 +258,12 @@ int drm_addmap_ioctl(DRM_IOCTL_ARGS)
        DRM_DEVICE;
 
        if (!(dev->flags & (FREAD|FWRITE)))
-               return DRM_ERR(EACCES); /* Require read/write */
+               return EACCES; /* Require read/write */
 
        DRM_COPY_FROM_USER_IOCTL(request, (drm_map_t *)data, sizeof(drm_map_t));
 
        if (!DRM_SUSER(p) && request.type != _DRM_AGP)
-               return DRM_ERR(EACCES);
+               return EACCES;
 
        DRM_LOCK();
        err = drm_addmap(dev, request.offset, request.size, request.type,
@@ -351,7 +351,7 @@ int drm_rmmap_ioctl(DRM_IOCTL_ARGS)
        /* No match found. */
        if (map == NULL) {
                DRM_UNLOCK();
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 
        drm_rmmap(dev, map);
@@ -441,7 +441,7 @@ static int drm_do_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
        }
        if (!valid) {
                DRM_DEBUG("zone invalid\n");
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }*/
 
        entry = &dma->bufs[order];
@@ -449,7 +449,7 @@ static int drm_do_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
        entry->buflist = malloc(count * sizeof(*entry->buflist), M_DRM,
            M_NOWAIT | M_ZERO);
        if ( !entry->buflist ) {
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
 
        entry->buf_size = size;
@@ -478,7 +478,7 @@ static int drm_do_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
                        /* Set count correctly so we free the proper amount. */
                        entry->buf_count = count;
                        drm_cleanup_buf_error(dev, entry);
-                       return DRM_ERR(ENOMEM);
+                       return ENOMEM;
                }
 
                offset += alignment;
@@ -494,7 +494,7 @@ static int drm_do_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
        if (temp_buflist == NULL) {
                /* Free the entry because it isn't valid */
                drm_cleanup_buf_error(dev, entry);
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
        dma->buflist = temp_buflist;
 
@@ -563,7 +563,7 @@ static int drm_do_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
            temp_pagelist == NULL) {
                free(entry->buflist, M_DRM);
                free(entry->seglist, M_DRM);
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
        
        memcpy(temp_pagelist, dma->pagelist, dma->page_count * 
@@ -586,7 +586,7 @@ static int drm_do_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
                        entry->seg_count = count;
                        drm_cleanup_buf_error(dev, entry);
                        free(temp_pagelist, M_DRM);
-                       return DRM_ERR(ENOMEM);
+                       return ENOMEM;
                }
 
                entry->seglist[entry->seg_count++] = dmah;
@@ -621,7 +621,7 @@ static int drm_do_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
                                entry->seg_count = count;
                                drm_cleanup_buf_error(dev, entry);
                                free(temp_pagelist, M_DRM);
-                               return DRM_ERR(ENOMEM);
+                               return ENOMEM;
                        }
 
                        DRM_DEBUG( "buffer %d @ %p\n",
@@ -637,7 +637,7 @@ static int drm_do_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
                /* Free the entry because it isn't valid */
                drm_cleanup_buf_error(dev, entry);
                free(temp_pagelist, M_DRM);
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
        dma->buflist = temp_buflist;
 
@@ -705,7 +705,7 @@ static int drm_do_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
        entry->buflist = malloc(count * sizeof(*entry->buflist), M_DRM,
            M_NOWAIT | M_ZERO);
        if (entry->buflist == NULL)
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
 
        entry->buf_size = size;
        entry->page_order = page_order;
@@ -733,7 +733,7 @@ static int drm_do_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
                        /* Set count correctly so we free the proper amount. */
                        entry->buf_count = count;
                        drm_cleanup_buf_error(dev, entry);
-                       return DRM_ERR(ENOMEM);
+                       return ENOMEM;
                }
 
                DRM_DEBUG( "buffer %d @ %p\n",
@@ -752,7 +752,7 @@ static int drm_do_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
        if (temp_buflist == NULL) {
                /* Free the entry because it isn't valid */
                drm_cleanup_buf_error(dev, entry);
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
        dma->buflist = temp_buflist;
 
@@ -781,21 +781,21 @@ int drm_addbufs_agp(drm_device_t *dev, drm_buf_desc_t *request)
        DRM_SPINLOCK(&dev->dma_lock);
 
        if (request->count < 0 || request->count > 4096)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        
        order = drm_order(request->size);
        if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
 
        /* No more allocations after first buffer-using ioctl. */
        if (dev->buf_use != 0) {
                DRM_SPINUNLOCK(&dev->dma_lock);
-               return DRM_ERR(EBUSY);
+               return EBUSY;
        }
        /* No more than one allocation per order */
        if (dev->dma->bufs[order].buf_count != 0) {
                DRM_SPINUNLOCK(&dev->dma_lock);
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
 
        ret = drm_do_addbufs_agp(dev, request);
@@ -812,24 +812,24 @@ int drm_addbufs_sg(drm_device_t *dev, drm_buf_desc_t *request)
        DRM_SPINLOCK(&dev->dma_lock);
 
        if (!DRM_SUSER(DRM_CURPROC))
-               return DRM_ERR(EACCES);
+               return EACCES;
 
        if (request->count < 0 || request->count > 4096)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        
        order = drm_order(request->size);
        if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
 
        /* No more allocations after first buffer-using ioctl. */
        if (dev->buf_use != 0) {
                DRM_SPINUNLOCK(&dev->dma_lock);
-               return DRM_ERR(EBUSY);
+               return EBUSY;
        }
        /* No more than one allocation per order */
        if (dev->dma->bufs[order].buf_count != 0) {
                DRM_SPINUNLOCK(&dev->dma_lock);
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
 
        ret = drm_do_addbufs_sg(dev, request);
@@ -846,24 +846,24 @@ int drm_addbufs_pci(drm_device_t *dev, drm_buf_desc_t *request)
        DRM_SPINLOCK(&dev->dma_lock);
 
        if (!DRM_SUSER(DRM_CURPROC))
-               return DRM_ERR(EACCES);
+               return EACCES;
 
        if (request->count < 0 || request->count > 4096)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        
        order = drm_order(request->size);
        if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
 
        /* No more allocations after first buffer-using ioctl. */
        if (dev->buf_use != 0) {
                DRM_SPINUNLOCK(&dev->dma_lock);
-               return DRM_ERR(EBUSY);
+               return EBUSY;
        }
        /* No more than one allocation per order */
        if (dev->dma->bufs[order].buf_count != 0) {
                DRM_SPINUNLOCK(&dev->dma_lock);
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
 
        ret = drm_do_addbufs_pci(dev, request);
@@ -928,7 +928,7 @@ int drm_infobufs(DRM_IOCTL_ARGS)
 
                                if (DRM_COPY_TO_USER(&request.list[count], &from,
                                    sizeof(drm_buf_desc_t)) != 0) {
-                                       retcode = DRM_ERR(EFAULT);
+                                       retcode = EFAULT;
                                        break;
                                }
 
@@ -965,13 +965,13 @@ int drm_markbufs(DRM_IOCTL_ARGS)
        order = drm_order(request.size);        
        if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER ||
            request.low_mark < 0 || request.high_mark < 0) {
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 
        DRM_SPINLOCK(&dev->dma_lock);
        if (request.low_mark > dma->bufs[order].buf_count ||
            request.high_mark > dma->bufs[order].buf_count) {
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 
        dma->bufs[order].freelist.low_mark  = request.low_mark;
@@ -998,20 +998,20 @@ int drm_freebufs(DRM_IOCTL_ARGS)
        DRM_SPINLOCK(&dev->dma_lock);
        for ( i = 0 ; i < request.count ; i++ ) {
                if (DRM_COPY_FROM_USER(&idx, &request.list[i], sizeof(idx))) {
-                       retcode = DRM_ERR(EFAULT);
+                       retcode = EFAULT;
                        break;
                }
                if ( idx < 0 || idx >= dma->buf_count ) {
                        DRM_ERROR( "Index %d (of %d max)\n",
                                   idx, dma->buf_count - 1 );
-                       retcode = DRM_ERR(EINVAL);
+                       retcode = EINVAL;
                        break;
                }
                buf = dma->buflist[idx];
                if ( buf->filp != filp ) {
                        DRM_ERROR("Process %d freeing buffer not owned\n",
                                   DRM_CURRENTPID);
-                       retcode = DRM_ERR(EINVAL);
+                       retcode = EINVAL;
                        break;
                }
                drm_free_buffer(dev, buf);
@@ -1129,5 +1129,5 @@ int drm_mapbufs(DRM_IOCTL_ARGS)
 
        DRM_COPY_TO_USER_IOCTL((drm_buf_map_t *)data, request, sizeof(request));
 
-       return DRM_ERR(retcode);
+       return retcode;
 }
index 8e00954..e8df7df 100644 (file)
@@ -109,7 +109,7 @@ int drm_ctxbitmap_init(drm_device_t *dev)
        dev->ctx_bitmap = malloc(PAGE_SIZE, M_DRM, M_NOWAIT | M_ZERO);
        if ( dev->ctx_bitmap == NULL ) {
                DRM_UNLOCK();
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
        dev->context_sareas = NULL;
        dev->max_context = -1;
@@ -148,7 +148,7 @@ int drm_getsareactx( DRM_IOCTL_ARGS )
        DRM_LOCK();
        if (dev->max_context < 0 || request.ctx_id >= (unsigned) dev->max_context) {
                DRM_UNLOCK();
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 
        map = dev->context_sareas[request.ctx_id];
@@ -185,7 +185,7 @@ int drm_setsareactx( DRM_IOCTL_ARGS )
 
 bad:
        DRM_UNLOCK();
-       return DRM_ERR(EINVAL);
+       return EINVAL;
 }
 
 /* ================================================================
@@ -196,7 +196,7 @@ int drm_context_switch(drm_device_t *dev, int old, int new)
 {
         if ( test_and_set_bit( 0, &dev->context_flag ) ) {
                 DRM_ERROR( "Reentering -- FIXME\n" );
-                return DRM_ERR(EBUSY);
+                return EBUSY;
         }
 
         DRM_DEBUG( "Context switch from %d to %d\n", old, new );
@@ -239,7 +239,7 @@ int drm_resctx(DRM_IOCTL_ARGS)
                        ctx.handle = i;
                        if ( DRM_COPY_TO_USER( &res.contexts[i],
                                           &ctx, sizeof(ctx) ) )
-                               return DRM_ERR(EFAULT);
+                               return EFAULT;
                }
        }
        res.count = DRM_RESERVED_CONTEXTS;
@@ -265,7 +265,7 @@ int drm_addctx(DRM_IOCTL_ARGS)
        if ( ctx.handle == -1 ) {
                DRM_DEBUG( "Not enough free contexts.\n" );
                                /* Should this return -EBUSY instead? */
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
        }
 
        if (dev->driver.context_ctor && ctx.handle != DRM_KERNEL_CONTEXT) {
index 086a9fa..90678df 100644 (file)
@@ -38,7 +38,7 @@ int drm_dma_setup(drm_device_t *dev)
 
        dev->dma = malloc(sizeof(*dev->dma), M_DRM, M_NOWAIT | M_ZERO);
        if (dev->dma == NULL)
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
 
        DRM_SPININIT(&dev->dma_lock, "drmdma");
 
@@ -122,7 +122,7 @@ int drm_dma(DRM_IOCTL_ARGS)
        DRM_DEVICE;
 
        if (dev->driver.dma_ioctl) {
-               return dev->driver.dma_ioctl(kdev, cmd, data, flags, p, filp);
+               return -dev->driver.dma_ioctl(kdev, cmd, data, flags, p, filp);
        } else {
                DRM_DEBUG("DMA ioctl on driver with no dma handler\n");
                return EINVAL;
index 75866b1..fa2958b 100644 (file)
@@ -532,7 +532,8 @@ static int drm_load(drm_device_t *dev)
 
        if (dev->driver.load != NULL) {
                DRM_LOCK();
-               retcode = dev->driver.load(dev, dev->id_entry->driver_private);
+               retcode = -dev->driver.load(dev,
+                   dev->id_entry->driver_private);
                DRM_UNLOCK();
                if (retcode != 0)
                        goto error;
@@ -544,7 +545,7 @@ static int drm_load(drm_device_t *dev)
                if (dev->driver.require_agp && dev->agp == NULL) {
                        DRM_ERROR("Card isn't AGP, or couldn't initialize "
                            "AGP.\n");
-                       retcode = DRM_ERR(ENOMEM);
+                       retcode = ENOMEM;
                        goto error;
                }
                if (dev->agp != NULL) {
@@ -660,7 +661,7 @@ int drm_version(DRM_IOCTL_ARGS)
        name##_len = strlen( value );                                   \
        if ( len && name ) {                                            \
                if ( DRM_COPY_TO_USER( name, value, len ) )             \
-                       return DRM_ERR(EFAULT);                         \
+                       return EFAULT;                          \
        }
 
        version.version_major           = dev->driver.major;
@@ -755,7 +756,7 @@ int drm_close(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p)
                for (;;) {
                        if ( !dev->lock.hw_lock ) {
                                /* Device has been unregistered */
-                               retcode = DRM_ERR(EINTR);
+                               retcode = EINTR;
                                break;
                        }
                        if (drm_lock_take(&dev->lock.hw_lock->lock,
@@ -914,13 +915,18 @@ int drm_ioctl(struct cdev *kdev, u_long cmd, caddr_t data, int flags,
        if (is_driver_ioctl)
                DRM_LOCK();
        retcode = func(kdev, cmd, data, flags, p, filp);
-       if (is_driver_ioctl)
+       if (is_driver_ioctl) {
                DRM_UNLOCK();
+               /* Driver ioctls in shared code follow the linux convention of
+                * returning -errno instead of errno.
+                */
+               retcode = -retcode;
+       }
 
        if (retcode != 0)
                DRM_DEBUG("    returning %d\n", retcode);
 
-       return DRM_ERR(retcode);
+       return retcode;
 }
 
 drm_local_map_t *drm_getsarea(drm_device_t *dev)
index f5c9349..870e4d2 100644 (file)
@@ -75,7 +75,7 @@ int drm_open_helper(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p,
                priv = malloc(sizeof(*priv), M_DRM, M_NOWAIT | M_ZERO);
                if (priv == NULL) {
                        DRM_UNLOCK();
-                       return DRM_ERR(ENOMEM);
+                       return ENOMEM;
                }
 #if __FreeBSD_version >= 500000
                priv->uid               = p->td_ucred->cr_svuid;
@@ -93,7 +93,7 @@ int drm_open_helper(struct cdev *kdev, int flags, int fmt, DRM_STRUCTPROC *p,
                priv->authenticated     = DRM_SUSER(p);
 
                if (dev->driver.open) {
-                       retcode = dev->driver.open(dev, priv);
+                       retcode = -dev->driver.open(dev, priv);
                        if (retcode != 0) {
                                free(priv, M_DRM);
                                DRM_UNLOCK();
index b5b5cf5..e450066 100644 (file)
@@ -48,7 +48,7 @@ int drm_getunique(DRM_IOCTL_ARGS)
 
        if (u.unique_len >= dev->unique_len) {
                if (DRM_COPY_TO_USER(u.unique, dev->unique, dev->unique_len))
-                       return DRM_ERR(EFAULT);
+                       return EFAULT;
        }
        u.unique_len = dev->unique_len;
 
@@ -71,15 +71,15 @@ int drm_setunique(DRM_IOCTL_ARGS)
 
        /* Check and copy in the submitted Bus ID */
        if (!u.unique_len || u.unique_len > 1024)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
 
        busid = malloc(u.unique_len + 1, M_DRM, M_WAITOK);
        if (busid == NULL)
-               return DRM_ERR(ENOMEM);
+               return ENOMEM;
 
        if (DRM_COPY_FROM_USER(busid, u.unique, u.unique_len)) {
                free(busid, M_DRM);
-               return DRM_ERR(EFAULT);
+               return EFAULT;
        }
        busid[u.unique_len] = '\0';
 
@@ -89,7 +89,7 @@ int drm_setunique(DRM_IOCTL_ARGS)
        ret = sscanf(busid, "PCI:%d:%d:%d", &bus, &slot, &func);
        if (ret != 3) {
                free(busid, M_DRM);
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
        domain = bus >> 8;
        bus &= 0xff;
@@ -99,14 +99,14 @@ int drm_setunique(DRM_IOCTL_ARGS)
            (slot != dev->pci_slot) ||
            (func != dev->pci_func)) {
                free(busid, M_DRM);
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 
        /* Actually set the device's busid now. */
        DRM_LOCK();
        if (dev->unique_len || dev->unique) {
                DRM_UNLOCK();
-               return DRM_ERR(EBUSY);
+               return EBUSY;
        }
 
        dev->unique_len = u.unique_len;
@@ -158,7 +158,7 @@ int drm_getmap(DRM_IOCTL_ARGS)
        DRM_LOCK();
        if (idx < 0) {
                DRM_UNLOCK();
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 
        TAILQ_FOREACH(mapinlist, &dev->maplist, link) {
index 2a69e01..215eb0c 100644 (file)
@@ -76,14 +76,14 @@ int drm_irq_install(drm_device_t *dev)
 #endif
 
        if (dev->irq == 0 || dev->dev_private == NULL)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
 
        DRM_DEBUG( "%s: irq=%d\n", __FUNCTION__, dev->irq );
 
        DRM_LOCK();
        if (dev->irq_enabled) {
                DRM_UNLOCK();
-               return DRM_ERR(EBUSY);
+               return EBUSY;
        }
        dev->irq_enabled = 1;
 
@@ -157,7 +157,7 @@ int drm_irq_uninstall(drm_device_t *dev)
 #endif
 
        if (!dev->irq_enabled)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
 
        dev->irq_enabled = 0;
 #ifdef __FreeBSD__
@@ -199,7 +199,7 @@ int drm_control(DRM_IOCTL_ARGS)
                        return 0;
                if (dev->if_version < DRM_IF_VERSION(1, 2) &&
                    ctl.irq != dev->irq)
-                       return DRM_ERR(EINVAL);
+                       return EINVAL;
                return drm_irq_install(dev);
        case DRM_UNINST_HANDLER:
                if (!dev->driver.use_irq)
@@ -209,7 +209,7 @@ int drm_control(DRM_IOCTL_ARGS)
                DRM_UNLOCK();
                return err;
        default:
-               return DRM_ERR(EINVAL);
+               return EINVAL;
        }
 }
 
@@ -221,7 +221,7 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
        int ret;
 
        if (!dev->irq_enabled)
-               return DRM_ERR(EINVAL);
+               return EINVAL;
 
        DRM_COPY_FROM_USER_IOCTL( vblwait, (drm_wait_vblank_t *)data,
                                  sizeof(vblwait) );
@@ -253,7 +253,7 @@ int drm_wait_vblank(DRM_IOCTL_ARGS)
                ret = EINVAL;
        } else {
                DRM_LOCK();
-               ret = dev->driver.vblank_wait(dev, &vblwait.request.sequence);
+               ret = -dev->driver.vblank_wait(dev, &vblwait.request.sequence);
                DRM_UNLOCK();
 
                microtime(&now);
index 7f732c9..d856169 100644 (file)
@@ -52,7 +52,7 @@ paddr_t drm_mmap(dev_t kdev, off_t offset, int prot)
        }
 
        if (!priv->authenticated)
-               return DRM_ERR(EACCES);
+               return EACCES;
 
        if (dev->dma && offset >= 0 && offset < ptoa(dev->dma->page_count)) {
                drm_device_dma_t *dma = dev->dma;
index d6cdba5..2787c9a 100644 (file)
@@ -130,7 +130,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS)
 
                if (update.num && !rects) {
                        DRM_ERROR("Failed to allocate cliprect memory\n");
-                       err = DRM_ERR(ENOMEM);
+                       err = -ENOMEM;
                        goto error;
                }
 
@@ -140,7 +140,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS)
                                                     update.num *
                                                     sizeof(*rects))) {
                        DRM_ERROR("Failed to copy cliprects from userspace\n");
-                       err = DRM_ERR(EFAULT);
+                       err = -EFAULT;
                        goto error;
                }
 
@@ -161,7 +161,7 @@ int drm_update_drawable_info(DRM_IOCTL_ARGS)
                break;
        default:
                DRM_ERROR("Invalid update type %d\n", update.type);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
index a7bacbb..a2c3952 100644 (file)
@@ -121,7 +121,7 @@ int drm_setunique(struct inode *inode, struct file *filp,
         */
        ret = sscanf(dev->unique, "PCI:%d:%d:%d", &bus, &slot, &func);
        if (ret != 3)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        domain = bus >> 8;
        bus &= 0xff;
 
index 1ba01aa..f3685ce 100644 (file)
@@ -125,7 +125,7 @@ int drm_lock(struct inode *inode, struct file *filp,
        if (dev->driver->dma_quiescent && (lock.flags & _DRM_LOCK_QUIESCENT)) {
                if (dev->driver->dma_quiescent(dev)) {
                        DRM_DEBUG( "%d waiting for DMA quiescent\n", lock.context);
-                       return DRM_ERR(EBUSY);
+                       return -EBUSY;
                }
        }
 
index 9d0d3f6..3d2ad77 100644 (file)
@@ -10,7 +10,6 @@
 #define DRMFILE                         struct file *
 /** Ioctl arguments */
 #define DRM_IOCTL_ARGS                 struct inode *inode, struct file *filp, unsigned int cmd, unsigned long data
-#define DRM_ERR(d)                     -(d)
 /** Current process ID */
 #define DRM_CURRENTPID                 current->pid
 #define DRM_SUSER(p)                   capable(CAP_SYS_ADMIN)
index 1e6d8cd..4b43647 100644 (file)
@@ -399,7 +399,7 @@ static int i810_dma_initialize(struct drm_device * dev,
                i810_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;
index a65317c..0ddac95 100644 (file)
@@ -33,7 +33,7 @@ nouveau_sgdma_populate(struct drm_ttm_backend *be, unsigned long num_pages,
        DRM_DEBUG("num_pages = %ld\n", num_pages);
 
        if (nvbe->pagelist)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        nvbe->pages    = (num_pages << PAGE_SHIFT) >> NV_CTXDMA_PAGE_SHIFT;
        nvbe->pagelist = drm_alloc(nvbe->pages*sizeof(dma_addr_t),
                                   DRM_MEM_PAGES);
@@ -48,7 +48,7 @@ nouveau_sgdma_populate(struct drm_ttm_backend *be, unsigned long num_pages,
                        if (pci_dma_mapping_error(nvbe->pagelist[d])) {
                                be->func->clear(be);
                                DRM_ERROR("pci_map_page failed\n");
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
                        nvbe->pages_populated = ++d;
                }
@@ -92,7 +92,7 @@ nouveau_sgdma_bind(struct drm_ttm_backend *be, unsigned long pg_start,
        DRM_DEBUG("pg=0x%lx (0x%llx), cached=%d\n", pg_start, offset, cached);
 
        if (offset & NV_CTXDMA_PAGE_MASK)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        nvbe->pte_start = (offset >> NV_CTXDMA_PAGE_SHIFT);
        if (dev_priv->card_type < NV_50)
                nvbe->pte_start += 2; /* skip ctxdma header */
@@ -102,7 +102,7 @@ nouveau_sgdma_bind(struct drm_ttm_backend *be, unsigned long pg_start,
 
                if (pteval & NV_CTXDMA_PAGE_MASK) {
                        DRM_ERROR("Bad pteval 0x%llx\n", pteval);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                if (dev_priv->card_type < NV_50) {
@@ -282,7 +282,7 @@ nouveau_sgdma_nottm_hack_init(struct drm_device *dev)
 
        dev_priv->gart_info.sg_be = nouveau_sgdma_init_ttm(dev);
        if (!dev_priv->gart_info.sg_be)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        be = dev_priv->gart_info.sg_be;
 
        /* Hack the aperture size down to the amount of system memory
index b4c3f93..c9112c6 100644 (file)
@@ -43,7 +43,7 @@ static int sis_driver_load(struct drm_device *dev, unsigned long chipset)
 
        dev_priv = drm_calloc(1, sizeof(drm_sis_private_t), DRM_MEM_DRIVER);
        if (dev_priv == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        dev->dev_private = (void *)dev_priv;
        dev_priv->chipset = chipset;
index edbf8bf..f9c7a7e 100644 (file)
@@ -139,7 +139,7 @@ static int sis_drm_alloc(struct drm_device * dev, struct drm_file * priv,
                      dev_priv->agp_initialized)) {
                DRM_ERROR
                    ("Attempt to allocate from uninitialized memory manager.\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        mem.size = (mem.size + SIS_MM_ALIGN_MASK) >> SIS_MM_ALIGN_SHIFT;
@@ -158,7 +158,7 @@ static int sis_drm_alloc(struct drm_device * dev, struct drm_file * priv,
                mem.offset = 0;
                mem.size = 0;
                mem.free = 0;
-               retval = DRM_ERR(ENOMEM);
+               retval = -ENOMEM;
        }
 
        DRM_COPY_TO_USER_IOCTL(argp, mem, sizeof(mem));
index 0461b3c..eb5ea82 100644 (file)
@@ -60,7 +60,7 @@ static int via_vram_info(struct drm_device *dev,
        struct pci_dev *pdev = dev->pdev;
        unsigned long flags;
 
-       int ret = DRM_ERR(EINVAL);
+       int ret = -EINVAL;
        int i;
        for (i=0; i<6; ++i) {
                flags = pci_resource_flags(pdev, i);
index 6422609..5e73bd1 100644 (file)
@@ -236,7 +236,7 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg,  drm_via_dmablit_t *xfer)
                first_pfn + 1;
        
        if (NULL == (vsg->pages = vmalloc(sizeof(struct page *) * vsg->num_pages)))
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        memset(vsg->pages, 0, sizeof(struct page *) * vsg->num_pages);
        down_read(&current->mm->mmap_sem);
        ret = get_user_pages(current, current->mm, (unsigned long) xfer->mem_addr,
@@ -248,7 +248,7 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg,  drm_via_dmablit_t *xfer)
                if (ret < 0) 
                        return ret;
                vsg->state = dr_via_pages_locked;
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        vsg->state = dr_via_pages_locked;
        DRM_DEBUG("DMA pages locked\n");
@@ -271,14 +271,14 @@ via_alloc_desc_pages(drm_via_sg_info_t *vsg)
                vsg->descriptors_per_page;
 
        if (NULL ==  (vsg->desc_pages = kmalloc(sizeof(void *) * vsg->num_desc_pages, GFP_KERNEL))) 
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        
        memset(vsg->desc_pages, 0, sizeof(void *) * vsg->num_desc_pages);
        vsg->state = dr_via_desc_pages_alloc;
        for (i=0; i<vsg->num_desc_pages; ++i) {
                if (NULL == (vsg->desc_pages[i] = 
                             (drm_via_descriptor_t *) __get_free_page(GFP_KERNEL)))
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
        }
        DRM_DEBUG("Allocated %d pages for %d descriptors.\n", vsg->num_desc_pages,
                  vsg->num_desc);
@@ -606,7 +606,7 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
 
        if (xfer->num_lines <= 0 || xfer->line_length <= 0) {
                DRM_ERROR("Zero size bitblt.\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /*
@@ -619,7 +619,7 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
        if ((xfer->mem_stride - xfer->line_length) >= PAGE_SIZE) {
                DRM_ERROR("Too large system memory stride. Stride: %d, "
                          "Length: %d\n", xfer->mem_stride, xfer->line_length);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if ((xfer->mem_stride == xfer->line_length) &&
@@ -637,7 +637,7 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
 
        if (xfer->num_lines > 2048 || (xfer->num_lines*xfer->mem_stride > (2048*2048*4))) {
                DRM_ERROR("Too large PCI DMA bitblt.\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }               
 
        /* 
@@ -648,7 +648,7 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
        if (xfer->mem_stride < xfer->line_length ||
            abs(xfer->fb_stride) < xfer->line_length) {
                DRM_ERROR("Invalid frame-buffer / memory stride.\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /*
@@ -661,13 +661,13 @@ via_build_sg_info(struct drm_device *dev, drm_via_sg_info_t *vsg, drm_via_dmabli
        if ((((unsigned long)xfer->mem_addr & 3) != ((unsigned long)xfer->fb_addr & 3)) ||
            ((xfer->num_lines > 1) && ((xfer->mem_stride & 3) != (xfer->fb_stride & 3)))) {
                DRM_ERROR("Invalid DRM bitblt alignment.\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 #else
        if ((((unsigned long)xfer->mem_addr & 15) || ((unsigned long)xfer->fb_addr & 3)) ||
            ((xfer->num_lines > 1) && ((xfer->mem_stride & 15) || (xfer->fb_stride & 3)))) {
                DRM_ERROR("Invalid DRM bitblt alignment.\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }       
 #endif
 
@@ -707,7 +707,7 @@ via_dmablit_grab_slot(drm_via_blitq_t *blitq, int engine)
 
                DRM_WAIT_ON(ret, blitq->busy_queue, DRM_HZ, blitq->num_free > 0);
                if (ret) {
-                       return (DRM_ERR(EINTR) == ret) ? DRM_ERR(EAGAIN) : ret;
+                       return (-EINTR == ret) ? -EAGAIN : ret;
                }
                
                spin_lock_irqsave(&blitq->blit_lock, irqsave);
@@ -751,7 +751,7 @@ via_dmablit(struct drm_device *dev, drm_via_dmablit_t *xfer)
 
        if (dev_priv == NULL) {
                DRM_ERROR("Called without initialization.\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        engine = (xfer->to_fb) ? 0 : 1;
@@ -761,7 +761,7 @@ via_dmablit(struct drm_device *dev, drm_via_dmablit_t *xfer)
        }
        if (NULL == (vsg = kmalloc(sizeof(*vsg), GFP_KERNEL))) {
                via_dmablit_release_slot(blitq);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        if (0 != (ret = via_build_sg_info(dev, vsg, xfer))) {
                via_dmablit_release_slot(blitq);
@@ -801,12 +801,12 @@ via_dma_blit_sync( DRM_IOCTL_ARGS )
        DRM_COPY_FROM_USER_IOCTL(sync, (drm_via_blitsync_t *)data, sizeof(sync));
        
        if (sync.engine >= VIA_NUM_BLIT_ENGINES) 
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        err = via_dmablit_sync(dev, sync.sync_handle, sync.engine);
 
-       if (DRM_ERR(EINTR) == err)
-               err = DRM_ERR(EAGAIN);
+       if (-EINTR) == err
+               err = -EAGAIN;
 
        return err;
 }
index a8db3d1..a6d4ece 100644 (file)
@@ -142,7 +142,7 @@ int via_fence_emit_sequence(struct drm_device * dev, uint32_t class, uint32_t fl
                *native_type = DRM_FENCE_TYPE_EXE;
                break;
        default:
-               ret = DRM_ERR(EINVAL);
+               ret = -EINVAL;
                break;
        }
        return ret;
index 1ac5105..7cb8651 100644 (file)
@@ -138,7 +138,7 @@ int via_mem_alloc(DRM_IOCTL_ARGS)
 
        if (mem.type > VIA_MEM_AGP) {
                DRM_ERROR("Unknown memory type allocation\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        mutex_lock(&dev->struct_mutex);
        if (0 == ((mem.type == VIA_MEM_VIDEO) ? dev_priv->vram_initialized :
@@ -146,7 +146,7 @@ int via_mem_alloc(DRM_IOCTL_ARGS)
                DRM_ERROR
                    ("Attempt to allocate from uninitialized memory manager.\n");
                mutex_unlock(&dev->struct_mutex);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        tmpSize = (mem.size + VIA_MM_ALIGN_MASK) >> VIA_MM_ALIGN_SHIFT;
@@ -164,7 +164,7 @@ int via_mem_alloc(DRM_IOCTL_ARGS)
                mem.size = 0;
                mem.index = 0;
                DRM_DEBUG("Video memory allocation failed\n");
-               retval = DRM_ERR(ENOMEM);
+               retval = -ENOMEM;
        }
        DRM_COPY_TO_USER_IOCTL((drm_via_mem_t __user *) data, mem, sizeof(mem));
 
index 5fb9fcf..81e6981 100644 (file)
@@ -71,7 +71,7 @@ int i915_wait_ring(struct drm_device * dev, int n, const char *caller)
                DRM_UDELAY(1);
        }
 
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 void i915_kernel_lost_context(struct drm_device * dev)
@@ -136,7 +136,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);
@@ -144,7 +144,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 *)
@@ -168,7 +168,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;
@@ -198,7 +198,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;
@@ -220,24 +220,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);
 
@@ -265,7 +265,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:
@@ -275,7 +275,7 @@ static int i915_dma_init(DRM_IOCTL_ARGS)
                retcode = i915_dma_resume(dev);
                break;
        default:
-               retcode = DRM_ERR(EINVAL);
+               retcode = -EINVAL;
                break;
        }
 
@@ -365,7 +365,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);
 
@@ -373,17 +373,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);
                }
@@ -406,13 +406,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)) {
@@ -493,7 +493,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);
@@ -531,7 +531,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);
@@ -670,7 +670,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,
@@ -684,7 +684,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);
 
@@ -714,7 +714,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);
@@ -764,7 +764,7 @@ static int i915_flip_bufs(DRM_IOCTL_ARGS)
        if (param.pipes & ~0x3) {
                DRM_ERROR("Invalid pipes 0x%x, only <= 0x3 is valid\n",
                          param.pipes);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        i915_dispatch_flip(dev, param.pipes, 0);
@@ -782,7 +782,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,
@@ -800,12 +800,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;
@@ -819,7 +819,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,
@@ -837,7 +837,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;
@@ -865,13 +865,13 @@ static int i915_mmio(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(mmio, (drm_i915_mmio_t __user *) data,
                                 sizeof(mmio));
 
        if (mmio.reg >= mmio_table_size)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        e = &mmio_table[mmio.reg];
        base = (u8 *) dev_priv->mmio_map->handle + e->offset;
@@ -879,21 +879,21 @@ static int i915_mmio(DRM_IOCTL_ARGS)
        switch (mmio.read_write) {
                case I915_MMIO_READ:
                        if (!(e->flag & I915_MMIO_MAY_READ))
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        for (i = 0; i < e->size / 4; i++)
                                buf[i] = I915_READ(e->offset + i * 4);
                        if (DRM_COPY_TO_USER(mmio.data, buf, e->size)) {
                                DRM_ERROR("DRM_COPY_TO_USER failed\n");
-                               return DRM_ERR(EFAULT);
+                               return -EFAULT;
                        }
                        break;
 
                case I915_MMIO_WRITE:
                        if (!(e->flag & I915_MMIO_MAY_WRITE))
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        if(DRM_COPY_FROM_USER(buf, mmio.data, e->size)) {
                                DRM_ERROR("DRM_COPY_TO_USER failed\n");
-                               return DRM_ERR(EFAULT);
+                               return -EFAULT;
                        }
                        for (i = 0; i < e->size / 4; i++)
                                I915_WRITE(e->offset + i * 4, buf[i]);
@@ -910,7 +910,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));
@@ -931,7 +931,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;
 
index 698ecce..f4775b7 100644 (file)
@@ -406,7 +406,7 @@ static int i915_wait_irq(struct drm_device * dev, int irq_nr)
                    READ_BREADCRUMB(dev_priv) >= irq_nr);
        i915_user_irq_off(dev_priv);
 
-       if (ret == DRM_ERR(EBUSY)) {
+       if (ret == -EBUSY) {
                DRM_ERROR("%s: EBUSY -- rec: %d emitted: %d\n",
                          __FUNCTION__,
                          READ_BREADCRUMB(dev_priv), (int)dev_priv->counter);
@@ -425,7 +425,7 @@ static int i915_driver_vblank_do_wait(struct drm_device *dev, unsigned int *sequ
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        DRM_WAIT_ON(ret, dev->vbl_queue, 3 * DRM_HZ,
@@ -460,7 +460,7 @@ int i915_irq_emit(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(emit, (drm_i915_irq_emit_t __user *) data,
@@ -470,7 +470,7 @@ int i915_irq_emit(DRM_IOCTL_ARGS)
 
        if (DRM_COPY_TO_USER(emit.irq_seq, &result, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
@@ -486,7 +486,7 @@ int i915_irq_wait(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(irqwait, (drm_i915_irq_wait_t __user *) data,
@@ -519,7 +519,7 @@ int i915_vblank_pipe_set(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(pipe, (drm_i915_vblank_pipe_t __user *) data,
@@ -528,7 +528,7 @@ int i915_vblank_pipe_set(DRM_IOCTL_ARGS)
        if (pipe.pipe & ~(DRM_I915_VBLANK_PIPE_A|DRM_I915_VBLANK_PIPE_B)) {
                DRM_ERROR("%s called with invalid pipe 0x%x\n", 
                          __FUNCTION__, pipe.pipe);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->vblank_pipe = pipe.pipe;
@@ -547,7 +547,7 @@ int i915_vblank_pipe_get(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        flag = I915_READ(I915REG_INT_ENABLE_R);
@@ -576,12 +576,12 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __func__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (dev_priv->sarea_priv->rotation) {
                DRM_DEBUG("Rotation not supported\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        DRM_COPY_FROM_USER_IOCTL(swap, (drm_i915_vblank_swap_t __user *) data,
@@ -591,7 +591,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
                             _DRM_VBLANK_SECONDARY | _DRM_VBLANK_NEXTONMISS |
                             _DRM_VBLANK_FLIP)) {
                DRM_ERROR("Invalid sequence type 0x%x\n", swap.seqtype);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        pipe = (swap.seqtype & _DRM_VBLANK_SECONDARY) ? 1 : 0;
@@ -600,7 +600,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
 
        if (!(dev_priv->vblank_pipe & (1 << pipe))) {
                DRM_ERROR("Invalid pipe %d\n", pipe);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        curseq = atomic_read(pipe ? &dev->vbl_received2 : &dev->vbl_received);
@@ -613,7 +613,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
                        swap.sequence = curseq + 1;
                } else {
                        DRM_DEBUG("Missed target sequence\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
 
@@ -634,7 +634,7 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
                                    irqflags);
                                DRM_DEBUG("Invalid drawable ID %d\n",
                                          swap.drawable);
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
 
                        i915_dispatch_vsync_flip(dev, drw, pipe);
@@ -664,14 +664,14 @@ int i915_vblank_swap(DRM_IOCTL_ARGS)
 
        if (dev_priv->swaps_pending >= 100) {
                DRM_DEBUG("Too many swaps queued\n");
-               return DRM_ERR(EBUSY);
+               return -EBUSY;
        }
 
        vbl_swap = drm_calloc(1, sizeof(vbl_swap), DRM_MEM_DRIVER);
 
        if (!vbl_swap) {
                DRM_ERROR("Failed to allocate memory to queue swap\n");
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        DRM_DEBUG("\n");
index 582687a..381562d 100644 (file)
@@ -276,7 +276,7 @@ int i915_mem_alloc(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(alloc, (drm_i915_mem_alloc_t __user *) data,
@@ -284,7 +284,7 @@ int i915_mem_alloc(DRM_IOCTL_ARGS)
 
        heap = get_heap(dev_priv, alloc.region);
        if (!heap || !*heap)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        /* Make things easier on ourselves: all allocations at least
         * 4k aligned.
@@ -295,13 +295,13 @@ int i915_mem_alloc(DRM_IOCTL_ARGS)
        block = alloc_block(*heap, alloc.size, alloc.alignment, filp);
 
        if (!block)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        mark_block(dev, block, 1);
 
        if (DRM_COPY_TO_USER(alloc.region_offset, &block->start, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
@@ -316,7 +316,7 @@ int i915_mem_free(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(memfree, (drm_i915_mem_free_t __user *) data,
@@ -324,14 +324,14 @@ int i915_mem_free(DRM_IOCTL_ARGS)
 
        heap = get_heap(dev_priv, memfree.region);
        if (!heap || !*heap)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        block = find_block(*heap, memfree.region_offset);
        if (!block)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        if (block->filp != filp)
-               return DRM_ERR(EPERM);
+               return -EPERM;
 
        mark_block(dev, block, 0);
        free_block(block);
@@ -347,7 +347,7 @@ int i915_mem_init_heap(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(initheap,
@@ -356,11 +356,11 @@ int i915_mem_init_heap(DRM_IOCTL_ARGS)
 
        heap = get_heap(dev_priv, initheap.region);
        if (!heap)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        if (*heap) {
                DRM_ERROR("heap already initialized?");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return init_heap(heap, initheap.start, initheap.size);
@@ -375,7 +375,7 @@ int i915_mem_destroy_heap( 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( destroyheap, (drm_i915_mem_destroy_heap_t *)data,
@@ -384,12 +384,12 @@ int i915_mem_destroy_heap( DRM_IOCTL_ARGS )
        heap = get_heap( dev_priv, destroyheap.region );
        if (!heap) {
                DRM_ERROR("get_heap failed");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
        
        if (!*heap) {
                DRM_ERROR("heap not initialized?");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        i915_mem_takedown( heap );
index d833475..fec7307 100644 (file)
@@ -70,7 +70,7 @@ int mach64_do_wait_for_fifo(drm_mach64_private_t * dev_priv, int entries)
 
        DRM_INFO("%s failed! slots=%d entries=%d\n", __FUNCTION__, slots,
                 entries);
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 /**
@@ -94,7 +94,7 @@ int mach64_do_wait_for_idle(drm_mach64_private_t * dev_priv)
        DRM_INFO("%s failed! GUI_STAT=0x%08x\n", __FUNCTION__,
                 MACH64_READ(MACH64_GUI_STAT));
        mach64_dump_ring_info(dev_priv);
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 /**
@@ -135,7 +135,7 @@ int mach64_wait_ring(drm_mach64_private_t * dev_priv, int n)
        /* FIXME: This is being ignored... */
        DRM_ERROR("failed!\n");
        mach64_dump_ring_info(dev_priv);
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 /**
@@ -172,7 +172,7 @@ static int mach64_ring_idle(drm_mach64_private_t * dev_priv)
        DRM_INFO("%s failed! GUI_STAT=0x%08x\n", __FUNCTION__,
                 MACH64_READ(MACH64_GUI_STAT));
        mach64_dump_ring_info(dev_priv);
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 /**
@@ -592,7 +592,7 @@ static int mach64_bm_dma_test(struct drm_device * dev)
            drm_pci_alloc(dev, 0x1000, 0x1000, 0xfffffffful);
        if (!cpu_addr_dmah) {
                DRM_INFO("data-memory allocation failed!\n");
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        } else {
                data = (u32 *) cpu_addr_dmah->vaddr;
                data_addr = (u32) cpu_addr_dmah->busaddr;
@@ -624,7 +624,7 @@ static int mach64_bm_dma_test(struct drm_device * dev)
                        mach64_do_engine_reset(dev_priv);
                        DRM_INFO("freeing data buffer memory.\n");
                        drm_pci_free(dev, cpu_addr_dmah);
-                       return DRM_ERR(EIO);
+                       return -EIO;
                }
        }
 
@@ -762,7 +762,7 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
 
        dev_priv = drm_alloc(sizeof(drm_mach64_private_t), DRM_MEM_DRIVER);
        if (dev_priv == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        memset(dev_priv, 0, sizeof(drm_mach64_private_t));
 
@@ -797,21 +797,21 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
                DRM_ERROR("can not find sarea!\n");
                dev->dev_private = (void *)dev_priv;
                mach64_do_cleanup_dma(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        dev_priv->fb = drm_core_findmap(dev, init->fb_offset);
        if (!dev_priv->fb) {
                DRM_ERROR("can not find frame buffer map!\n");
                dev->dev_private = (void *)dev_priv;
                mach64_do_cleanup_dma(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
        if (!dev_priv->mmio) {
                DRM_ERROR("can not find mmio map!\n");
                dev->dev_private = (void *)dev_priv;
                mach64_do_cleanup_dma(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->ring_map = drm_core_findmap(dev, init->ring_offset);
@@ -819,7 +819,7 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
                DRM_ERROR("can not find ring map!\n");
                dev->dev_private = (void *)dev_priv;
                mach64_do_cleanup_dma(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->sarea_priv = (drm_mach64_sarea_t *)
@@ -832,7 +832,7 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
                                  " descriptor ring\n");
                        dev->dev_private = (void *)dev_priv;
                        mach64_do_cleanup_dma(dev);
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                }
                dev->agp_buffer_token = init->buffers_offset;
                dev->agp_buffer_map =
@@ -841,7 +841,7 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
                        DRM_ERROR("can not find dma buffer map!\n");
                        dev->dev_private = (void *)dev_priv;
                        mach64_do_cleanup_dma(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                /* there might be a nicer way to do this -
                   dev isn't passed all the way though the mach64 - DA */
@@ -853,7 +853,7 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
                                  " dma buffer\n");
                        dev->dev_private = (void *)dev_priv;
                        mach64_do_cleanup_dma(dev);
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                }
                dev_priv->agp_textures =
                    drm_core_findmap(dev, init->agp_textures_offset);
@@ -861,7 +861,7 @@ static int mach64_do_dma_init(struct drm_device * dev, drm_mach64_init_t * init)
                        DRM_ERROR("can not find agp texture region!\n");
                        dev->dev_private = (void *)dev_priv;
                        mach64_do_cleanup_dma(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
 
@@ -1035,7 +1035,7 @@ int mach64_do_dispatch_pseudo_dma(drm_mach64_private_t * dev_priv)
                             head, ring->tail, buf_addr, (eol ? "eol" : ""));
                        mach64_dump_ring_info(dev_priv);
                        mach64_do_engine_reset(dev_priv);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                /* Hand feed the buffer to the card via MMIO, waiting for the fifo
@@ -1177,7 +1177,7 @@ int mach64_dma_init(DRM_IOCTL_ARGS)
                return mach64_do_cleanup_dma(dev);
        }
 
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 int mach64_dma_idle(DRM_IOCTL_ARGS)
@@ -1239,7 +1239,7 @@ int mach64_init_freelist(struct drm_device * dev)
                     (drm_mach64_freelist_t *)
                     drm_alloc(sizeof(drm_mach64_freelist_t),
                               DRM_MEM_BUFLISTS)) == NULL)
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                memset(entry, 0, sizeof(drm_mach64_freelist_t));
                entry->buf = dma->buflist[i];
                ptr = &entry->list;
@@ -1438,7 +1438,7 @@ int mach64_freelist_put(drm_mach64_private_t * dev_priv, struct drm_buf * copy_b
                if (copy_buf == entry->buf) {
                        DRM_ERROR("%s: Trying to release a pending buf\n",
                             __FUNCTION__);
-                       return DRM_ERR(EFAULT);
+                       return -EFAULT;
                }
        }
 #endif
@@ -1472,20 +1472,20 @@ static int mach64_dma_get_buffers(DRMFILE filp, struct drm_device * dev,
                buf = mach64_freelist_get(dev_priv);
 #if MACH64_EXTRA_CHECKING
                if (!buf)
-                       return DRM_ERR(EFAULT);
+                       return -EFAULT;
 #else
                if (!buf)
-                       return DRM_ERR(EAGAIN);
+                       return -EAGAIN;
 #endif
 
                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++;
        }
@@ -1508,7 +1508,7 @@ int mach64_dma_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.
@@ -1516,7 +1516,7 @@ int mach64_dma_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);
-               ret = DRM_ERR(EINVAL);
+               ret = -EINVAL;
        }
 
        d.granted_count = 0;
index a1b3675..5d83c86 100644 (file)
@@ -819,14 +819,14 @@ static __inline__ int mach64_find_pending_buf_entry(drm_mach64_private_t *
 #if MACH64_EXTRA_CHECKING
        if (list_empty(&dev_priv->pending)) {
                DRM_ERROR("Empty pending list in %s\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 #endif
        ptr = dev_priv->pending.prev;
        *entry = list_entry(ptr, drm_mach64_freelist_t, list);
        while ((*entry)->buf != buf) {
                if (ptr == &dev_priv->pending) {
-                       return DRM_ERR(EFAULT);
+                       return -EFAULT;
                }
                ptr = ptr->prev;
                *entry = list_entry(ptr, drm_mach64_freelist_t, list);
@@ -852,12 +852,12 @@ do {                                                                      \
        if (_buf == NULL) {                                             \
                DRM_ERROR("%s: couldn't get buffer in DMAGETPTR\n",     \
                           __FUNCTION__ );                              \
-               return DRM_ERR(EAGAIN);                                 \
+               return -EAGAIN;                                 \
        }                                                               \
        if (_buf->pending) {                                            \
                DRM_ERROR("%s: pending buf in DMAGETPTR\n",             \
                           __FUNCTION__ );                              \
-               return DRM_ERR(EFAULT);                                 \
+               return -EFAULT;                                 \
        }                                                               \
        _buf->filp = filp;                                              \
        _outcount = 0;                                                  \
@@ -888,7 +888,7 @@ do {                                                                                             \
        if (_buf->used <= 0) {                                                               \
                DRM_ERROR( "DMAADVANCE() in %s: sending empty buf %d\n",                     \
                                   __FUNCTION__, _buf->idx );                                \
-               return DRM_ERR(EFAULT);                                                      \
+               return -EFAULT;                                                      \
        }                                                                                    \
        if (_buf->pending) {                                                                 \
                 /* This is a resued buffer, so we need to find it in the pending list */     \
@@ -901,13 +901,13 @@ do {                                                                                           \
                if (_entry->discard) {                                                       \
                        DRM_ERROR( "DMAADVANCE() in %s: sending discarded pending buf %d\n", \
                                   __FUNCTION__, _buf->idx );                                \
-                       return DRM_ERR(EFAULT);                                              \
+                       return -EFAULT;                                              \
                }                                                                            \
        } else {                                                                             \
                if (list_empty(&dev_priv->placeholders)) {                                   \
                        DRM_ERROR( "DMAADVANCE() in %s: empty placeholder list\n",           \
                                __FUNCTION__ );                                              \
-                       return DRM_ERR(EFAULT);                                              \
+                       return -EFAULT;                                              \
                }                                                                            \
                ptr = dev_priv->placeholders.next;                                           \
                list_del(ptr);                                                               \
@@ -983,12 +983,12 @@ do {                                                                                      \
        if (_buf->used <= 0) {                                                          \
                DRM_ERROR( "DMAADVANCEHOSTDATA() in %s: sending empty buf %d\n",        \
                                   __FUNCTION__, _buf->idx );                           \
-               return DRM_ERR(EFAULT);                                                 \
+               return -EFAULT;                                                 \
        }                                                                               \
        if (list_empty(&dev_priv->placeholders)) {                                      \
                DRM_ERROR( "%s: empty placeholder list in DMAADVANCEHOSTDATA()\n",      \
                           __FUNCTION__ );                                              \
-               return DRM_ERR(EFAULT);                                                 \
+               return -EFAULT;                                                 \
        }                                                                               \
                                                                                        \
         ptr = dev_priv->placeholders.next;                                             \
index 95ad1ec..397faaa 100644 (file)
@@ -237,7 +237,7 @@ static int mach64_dma_dispatch_clear(DRMFILE filp, struct drm_device * dev,
                fb_bpp = MACH64_DATATYPE_ARGB8888;
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        switch (dev_priv->depth_bpp) {
        case 16:
@@ -248,7 +248,7 @@ static int mach64_dma_dispatch_clear(DRMFILE filp, struct drm_device * dev,
                depth_bpp = MACH64_DATATYPE_ARGB8888;
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (!nbox)
@@ -489,11 +489,11 @@ static __inline__ int copy_from_user_vertex(u32 *to,
 
        from = drm_alloc(bytes, DRM_MEM_DRIVER);
        if (from == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        if (DRM_COPY_FROM_USER(from, ufrom, bytes)) {
                drm_free(from, bytes, DRM_MEM_DRIVER);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
        orig_from = from; /* we'll be modifying the "from" ptr, so save it */
 
@@ -525,14 +525,14 @@ static __inline__ int copy_from_user_vertex(u32 *to,
                                DRM_ERROR("%s: Got bad command: 0x%04x\n",
                                          __FUNCTION__, reg);
                                drm_free(orig_from, bytes, DRM_MEM_DRIVER);
-                               return DRM_ERR(EACCES);
+                               return -EACCES;
                        }
                } else {
                        DRM_ERROR
                            ("%s: Got bad command count(=%u) dwords remaining=%lu\n",
                             __FUNCTION__, count, n);
                        drm_free(orig_from, bytes, DRM_MEM_DRIVER);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
 
@@ -541,7 +541,7 @@ static __inline__ int copy_from_user_vertex(u32 *to,
                return 0;
        else {
                DRM_ERROR("%s: Bad buf->used(=%lu)\n", __FUNCTION__, bytes);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 }
 
@@ -568,7 +568,7 @@ static int mach64_dma_dispatch_vertex(DRMFILE filp, struct drm_device * dev,
        copy_buf = mach64_freelist_get(dev_priv);
        if (copy_buf == NULL) {
                DRM_ERROR("%s: couldn't get buffer\n", __FUNCTION__);
-               return DRM_ERR(EAGAIN);
+               return -EAGAIN;
        }
 
        verify_ret = copy_from_user_vertex(GETBUFPTR(copy_buf), buf, used);
@@ -634,7 +634,7 @@ static __inline__ int copy_from_user_blit(u32 *to,
        to = (u32 *)((char *)to + MACH64_HOSTDATA_BLIT_OFFSET);
 
        if (DRM_COPY_FROM_USER(to, ufrom, bytes)) {
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
@@ -671,7 +671,7 @@ static int mach64_dma_dispatch_blit(DRMFILE filp, struct drm_device * dev,
                break;
        default:
                DRM_ERROR("invalid blit format %d\n", blit->format);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /* Set buf->used to the bytes of blit data based on the blit dimensions
@@ -684,13 +684,13 @@ static int mach64_dma_dispatch_blit(DRMFILE filp, struct drm_device * dev,
        if (used <= 0 ||
            used > MACH64_BUFFER_SIZE - MACH64_HOSTDATA_BLIT_OFFSET) {
                DRM_ERROR("Invalid blit size: %lu bytes\n", used);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        copy_buf = mach64_freelist_get(dev_priv);
        if (copy_buf == NULL) {
                DRM_ERROR("%s: couldn't get buffer\n", __FUNCTION__);
-               return DRM_ERR(EAGAIN);
+               return -EAGAIN;
        }
 
        verify_ret = copy_from_user_blit(GETBUFPTR(copy_buf), blit->buf, used);
@@ -814,7 +814,7 @@ int mach64_dma_vertex(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(vertex, (drm_mach64_vertex_t *) data,
@@ -826,13 +826,13 @@ int mach64_dma_vertex(DRM_IOCTL_ARGS)
 
        if (vertex.prim < 0 || vertex.prim > MACH64_PRIM_POLYGON) {
                DRM_ERROR("buffer prim %d\n", vertex.prim);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (vertex.used > MACH64_BUFFER_SIZE || (vertex.used & 3) != 0) {
                DRM_ERROR("Invalid vertex buffer size: %lu bytes\n",
                          vertex.used);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (sarea_priv->nbox > MACH64_NR_SAREA_CLIPRECTS)
@@ -875,7 +875,7 @@ int mach64_get_param(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_mach64_getparam_t *) data,
@@ -891,12 +891,12 @@ int mach64_get_param(DRM_IOCTL_ARGS)
                value = dev->irq;
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
index 9bed3b3..cbcb638 100644 (file)
@@ -71,7 +71,7 @@ int mga_do_wait_for_idle(drm_mga_private_t * dev_priv)
        DRM_ERROR("failed!\n");
        DRM_INFO("   status=0x%08x\n", status);
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 static int mga_do_dma_reset(drm_mga_private_t * dev_priv)
@@ -256,7 +256,7 @@ static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_pr
 
        dev_priv->head = drm_alloc(sizeof(drm_mga_freelist_t), DRM_MEM_DRIVER);
        if (dev_priv->head == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        memset(dev_priv->head, 0, sizeof(drm_mga_freelist_t));
        SET_AGE(&dev_priv->head->age, MGA_BUFFER_USED, 0);
@@ -267,7 +267,7 @@ static int mga_freelist_init(struct drm_device * dev, drm_mga_private_t * dev_pr
 
                entry = drm_alloc(sizeof(drm_mga_freelist_t), DRM_MEM_DRIVER);
                if (entry == NULL)
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
 
                memset(entry, 0, sizeof(drm_mga_freelist_t));
 
@@ -399,7 +399,7 @@ int mga_driver_load(struct drm_device *dev, unsigned long flags)
 
        dev_priv = drm_alloc(sizeof(drm_mga_private_t), DRM_MEM_DRIVER);
        if (!dev_priv)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        dev->dev_private = (void *)dev_priv;
        memset(dev_priv, 0, sizeof(drm_mga_private_t));
@@ -579,7 +579,7 @@ static int mga_do_agp_dma_bootstrap(struct drm_device *dev,
                DRM_ERROR("failed to ioremap agp regions! (%p, %p, %p)\n",
                          dev_priv->warp->handle, dev_priv->primary->handle,
                          dev->agp_buffer_map->handle);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        dev_priv->dma_access = MGA_PAGPXFER;
@@ -616,7 +616,7 @@ static int mga_do_pci_dma_bootstrap(struct drm_device * dev,
        
        if (dev->dma == NULL) {
                DRM_ERROR("dev->dma is NULL\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        /* Make drm_addbufs happy by not trying to create a mapping for less
@@ -651,7 +651,7 @@ static int mga_do_pci_dma_bootstrap(struct drm_device * dev,
 
        if (err != 0) {
                DRM_ERROR("Unable to allocate primary DMA region: %d\n", err);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        if (dev_priv->primary->size != dma_bs->primary_size) {
@@ -833,7 +833,7 @@ static int mga_do_init_dma(struct drm_device * dev, drm_mga_init_t * init)
        dev_priv->sarea = drm_getsarea(dev);
        if (!dev_priv->sarea) {
                DRM_ERROR("failed to find sarea!\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (! dev_priv->used_new_dma_init) {
@@ -844,28 +844,28 @@ static int mga_do_init_dma(struct drm_device * dev, drm_mga_init_t * init)
                dev_priv->status = drm_core_findmap(dev, init->status_offset);
                if (!dev_priv->status) {
                        DRM_ERROR("failed to find status page!\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                dev_priv->mmio = drm_core_findmap(dev, init->mmio_offset);
                if (!dev_priv->mmio) {
                        DRM_ERROR("failed to find mmio region!\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                dev_priv->warp = drm_core_findmap(dev, init->warp_offset);
                if (!dev_priv->warp) {
                        DRM_ERROR("failed to find warp microcode region!\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                dev_priv->primary = drm_core_findmap(dev, init->primary_offset);
                if (!dev_priv->primary) {
                        DRM_ERROR("failed to find primary dma region!\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                dev->agp_buffer_token = init->buffers_offset;
                dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset);
                if (!dev->agp_buffer_map) {
                        DRM_ERROR("failed to find dma buffer region!\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                drm_core_ioremap(dev_priv->warp, dev);
@@ -883,7 +883,7 @@ static int mga_do_init_dma(struct drm_device * dev, drm_mga_init_t * init)
             ((dev->agp_buffer_map == NULL) ||
              (dev->agp_buffer_map->handle == NULL)))) {
                DRM_ERROR("failed to ioremap agp regions!\n");
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        ret = mga_warp_install_microcode(dev_priv);
@@ -933,7 +933,7 @@ static int mga_do_init_dma(struct drm_device * dev, drm_mga_init_t * init)
 
        if (mga_freelist_init(dev, dev_priv) < 0) {
                DRM_ERROR("could not initialize freelist\n");
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        return 0;
@@ -1032,7 +1032,7 @@ int mga_dma_init(DRM_IOCTL_ARGS)
                return mga_do_cleanup_dma(dev, FULL_CLEANUP);
        }
 
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 /* ================================================================
@@ -1097,16 +1097,16 @@ static int mga_dma_get_buffers(DRMFILE filp, struct drm_device * dev, struct drm
        for (i = d->granted_count; i < d->request_count; i++) {
                buf = mga_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++;
        }
@@ -1131,7 +1131,7 @@ int mga_dma_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.
@@ -1139,7 +1139,7 @@ int mga_dma_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;
        }
 
        WRAP_TEST_WITH_RETURN(dev_priv);
index 10096a9..2da3119 100644 (file)
@@ -245,7 +245,7 @@ do {                                                                        \
                            dev_priv->prim.high_mark ) {                \
                        if ( MGA_DMA_DEBUG )                            \
                                DRM_INFO( "%s: wrap...\n", __FUNCTION__ );      \
-                       return DRM_ERR(EBUSY);                  \
+                       return -EBUSY;                  \
                }                                                       \
        }                                                               \
 } while (0)
@@ -256,7 +256,7 @@ do {                                                                        \
                if ( mga_do_wait_for_idle( dev_priv ) < 0 ) {           \
                        if ( MGA_DMA_DEBUG )                            \
                                DRM_INFO( "%s: wrap...\n", __FUNCTION__ );      \
-                       return DRM_ERR(EBUSY);                  \
+                       return -EBUSY;                  \
                }                                                       \
                mga_do_dma_wrap_end( dev_priv );                        \
        }                                                               \
index 6d93c9e..f77883d 100644 (file)
@@ -416,7 +416,7 @@ static int mga_verify_context(drm_mga_private_t * dev_priv)
                          ctx->dstorg, dev_priv->front_offset,
                          dev_priv->back_offset);
                ctx->dstorg = 0;
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
@@ -435,7 +435,7 @@ static int mga_verify_tex(drm_mga_private_t * dev_priv, int unit)
        if (org == (MGA_TEXORGMAP_SYSMEM | MGA_TEXORGACC_PCI)) {
                DRM_ERROR("*** bad TEXORG: 0x%x, unit %d\n", tex->texorg, unit);
                tex->texorg = 0;
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
@@ -477,13 +477,13 @@ static int mga_verify_iload(drm_mga_private_t * dev_priv,
            dstorg + length > (dev_priv->texture_offset +
                               dev_priv->texture_size)) {
                DRM_ERROR("*** bad iload DSTORG: 0x%x\n", dstorg);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (length & MGA_ILOAD_MASK) {
                DRM_ERROR("*** bad iload length: 0x%x\n",
                          length & MGA_ILOAD_MASK);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
@@ -495,7 +495,7 @@ static int mga_verify_blit(drm_mga_private_t * dev_priv,
        if ((srcorg & 0x3) == (MGA_SRCACC_PCI | MGA_SRCMAP_SYSMEM) ||
            (dstorg & 0x3) == (MGA_SRCACC_PCI | MGA_SRCMAP_SYSMEM)) {
                DRM_ERROR("*** bad blit: src=0x%x dst=0x%x\n", srcorg, dstorg);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        return 0;
 }
@@ -929,7 +929,7 @@ static int mga_dma_vertex(DRM_IOCTL_ARGS)
                                 sizeof(vertex));
 
        if (vertex.idx < 0 || vertex.idx > dma->buf_count)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        buf = dma->buflist[vertex.idx];
        buf_priv = buf->dev_private;
 
@@ -943,7 +943,7 @@ static int mga_dma_vertex(DRM_IOCTL_ARGS)
                        buf_priv->dispatched = 0;
                        mga_freelist_put(dev, buf);
                }
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        WRAP_TEST_WITH_RETURN(dev_priv);
@@ -969,7 +969,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS)
                                 sizeof(indices));
 
        if (indices.idx < 0 || indices.idx > dma->buf_count)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        buf = dma->buflist[indices.idx];
        buf_priv = buf->dev_private;
@@ -983,7 +983,7 @@ static int mga_dma_indices(DRM_IOCTL_ARGS)
                        buf_priv->dispatched = 0;
                        mga_freelist_put(dev, buf);
                }
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        WRAP_TEST_WITH_RETURN(dev_priv);
@@ -1012,18 +1012,18 @@ static int mga_dma_iload(DRM_IOCTL_ARGS)
        if (mga_do_wait_for_idle(dev_priv) < 0) {
                if (MGA_DMA_DEBUG)
                        DRM_INFO("%s: -EBUSY\n", __FUNCTION__);
-               return DRM_ERR(EBUSY);
+               return -EBUSY;
        }
 #endif
        if (iload.idx < 0 || iload.idx > dma->buf_count)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        buf = dma->buflist[iload.idx];
        buf_priv = buf->dev_private;
 
        if (mga_verify_iload(dev_priv, iload.dstorg, iload.length)) {
                mga_freelist_put(dev, buf);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        WRAP_TEST_WITH_RETURN(dev_priv);
@@ -1054,7 +1054,7 @@ static int mga_dma_blit(DRM_IOCTL_ARGS)
                sarea_priv->nbox = MGA_NR_SAREA_CLIPRECTS;
 
        if (mga_verify_blit(dev_priv, blit.srcorg, blit.dstorg))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        WRAP_TEST_WITH_RETURN(dev_priv);
 
@@ -1076,7 +1076,7 @@ static int mga_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_mga_getparam_t __user *) data,
@@ -1092,12 +1092,12 @@ static int mga_getparam(DRM_IOCTL_ARGS)
                value = dev_priv->chipset;
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
@@ -1112,7 +1112,7 @@ static int mga_set_fence(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
@@ -1144,7 +1144,7 @@ static int mga_wait_fence(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(fence, (u32 __user *) data, sizeof(u32));
index 05ed805..9a44bdd 100644 (file)
@@ -146,7 +146,7 @@ int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
        if (size > dev_priv->warp->size) {
                DRM_ERROR("microcode too large! (%u > %lu)\n",
                          size, dev_priv->warp->size);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        switch (dev_priv->chipset) {
@@ -156,7 +156,7 @@ int mga_warp_install_microcode(drm_mga_private_t * dev_priv)
        case MGA_CARD_TYPE_G200:
                return mga_warp_install_g200_microcode(dev_priv);
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 }
 
@@ -182,7 +182,7 @@ int mga_warp_init(drm_mga_private_t * dev_priv)
                MGA_WRITE(MGA_WVRTXSZ, 7);
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        MGA_WRITE(MGA_WMISC, (MGA_WUCODECACHE_ENABLE |
@@ -191,7 +191,7 @@ int mga_warp_init(drm_mga_private_t * dev_priv)
        if (wmisc != WMISC_EXPECTED) {
                DRM_ERROR("WARP engine config failed! 0x%x != 0x%x\n",
                          wmisc, WMISC_EXPECTED);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
index 230c829..e3a6674 100644 (file)
@@ -207,7 +207,7 @@ nouveau_fifo_cmdbuf_alloc(struct drm_device *dev, int channel)
                        (DRMFILE)-2);
        if (!cb) {
                DRM_ERROR("Couldn't allocate DMA command buffer.\n");
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        if (cb->flags & NOUVEAU_MEM_AGP) {
@@ -289,13 +289,13 @@ int nouveau_fifo_alloc(struct drm_device *dev, int *chan_ret, DRMFILE filp,
        }
        /* no more fifos. you lost. */
        if (channel==nouveau_fifo_number(dev))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        (*chan_ret) = channel;
 
        dev_priv->fifos[channel] = drm_calloc(1, sizeof(struct nouveau_fifo),
                                              DRM_MEM_DRIVER);
        if (!dev_priv->fifos[channel])
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        dev_priv->fifo_alloc_count++;
        chan = dev_priv->fifos[channel];
        chan->filp = filp;
@@ -483,7 +483,7 @@ static int nouveau_ioctl_fifo_alloc(DRM_IOCTL_ARGS)
                                 sizeof(init));
 
        if (init.fb_ctxdma_handle == ~0 || init.tt_ctxdma_handle == ~0)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        res = nouveau_fifo_alloc(dev, &init.channel, filp,
                                 init.fb_ctxdma_handle,
@@ -511,7 +511,7 @@ static int nouveau_ioctl_fifo_alloc(DRM_IOCTL_ARGS)
 
        entry = drm_find_matching_map(dev, chan->regs);
        if (!entry)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        init.ctrl = entry->user_token;
 
        /* pass back FIFO map info to the caller */
index 7a923e1..143378f 100644 (file)
@@ -138,12 +138,12 @@ int nouveau_mem_init_heap(struct mem_block **heap, uint64_t start,
        struct mem_block *blocks = drm_alloc(sizeof(*blocks), DRM_MEM_BUFS);
 
        if (!blocks)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        *heap = drm_alloc(sizeof(**heap), DRM_MEM_BUFS);
        if (!*heap) {
                drm_free(blocks, sizeof(*blocks), DRM_MEM_BUFS);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        blocks->start = start;
@@ -363,13 +363,13 @@ int nouveau_mem_init(struct drm_device *dev)
                 * So we create a second FB heap for that type of memory */
                if (nouveau_mem_init_heap(&dev_priv->fb_heap,
                                          0, 256*1024*1024))
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                if (nouveau_mem_init_heap(&dev_priv->fb_nomap_heap,
                                          256*1024*1024, fb_size-256*1024*1024))
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
        } else {
                if (nouveau_mem_init_heap(&dev_priv->fb_heap, 0, fb_size))
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                dev_priv->fb_nomap_heap=NULL;
        }
 
@@ -549,7 +549,7 @@ int nouveau_ioctl_mem_alloc(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(alloc,
@@ -558,7 +558,7 @@ int nouveau_ioctl_mem_alloc(DRM_IOCTL_ARGS)
 
        block=nouveau_mem_alloc(dev, alloc.alignment, alloc.size, alloc.flags, filp);
        if (!block)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        alloc.map_handle=block->map_handle;
        alloc.offset=block->start;
        alloc.flags=block->flags;
@@ -588,9 +588,9 @@ int nouveau_ioctl_mem_free(DRM_IOCTL_ARGS)
        else if (memfree.flags&NOUVEAU_MEM_PCI)
                block = find_block(dev_priv->pci_heap, memfree.offset);
        if (!block)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        if (block->filp != filp)
-               return DRM_ERR(EPERM);
+               return -EPERM;
 
        nouveau_mem_free(dev, block);
        return 0;
index 238e3c8..425e471 100644 (file)
@@ -46,7 +46,7 @@ nouveau_notifier_init_channel(struct drm_device *dev, int channel, DRMFILE filp)
 
        chan->notifier_block = nouveau_mem_alloc(dev, 0, PAGE_SIZE, flags,filp);
        if (!chan->notifier_block)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        ret = nouveau_mem_init_heap(&chan->notifier_heap,
                                    0, chan->notifier_block->size);
@@ -84,13 +84,13 @@ nouveau_notifier_alloc(struct drm_device *dev, int channel, uint32_t handle,
        if (!chan->notifier_heap) {
                DRM_ERROR("Channel %d doesn't have a notifier heap!\n",
                          channel);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        mem = nouveau_mem_alloc_block(chan->notifier_heap, 32, 0, chan->filp);
        if (!mem) {
                DRM_ERROR("Channel %d notifier block full\n", channel);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        mem->flags = NOUVEAU_MEM_NOTIFIER;
 
@@ -102,7 +102,7 @@ nouveau_notifier_alloc(struct drm_device *dev, int channel, uint32_t handle,
        } else {
                DRM_ERROR("Bad DMA target, flags 0x%08x!\n",
                          chan->notifier_block->flags);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if ((ret = nouveau_gpuobj_dma_new(dev, channel, NV_CLASS_DMA_IN_MEMORY,
@@ -138,7 +138,7 @@ nouveau_ioctl_notifier_alloc(DRM_IOCTL_ARGS)
        if (!nouveau_fifo_owner(dev, filp, na.channel)) {
                DRM_ERROR("pid %d doesn't own channel %d\n",
                          DRM_CURRENTPID, na.channel);
-               return DRM_ERR(EPERM);
+               return -EPERM;
        }
 
        ret = nouveau_notifier_alloc(dev, na.channel, na.handle,
index f0025d7..30d515f 100644 (file)
@@ -107,7 +107,7 @@ nouveau_ramht_insert(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
 
        if (!ramht) {
                DRM_ERROR("No hash table!\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (dev_priv->card_type < NV_40) {
@@ -142,7 +142,7 @@ nouveau_ramht_insert(struct drm_device *dev, struct nouveau_gpuobj_ref *ref)
        } while (co != ho);
 
        DRM_ERROR("RAMHT space exhausted. ch=%d\n", ref->channel);
-       return DRM_ERR(ENOMEM);
+       return -ENOMEM;
 }
 
 static void
@@ -194,17 +194,17 @@ nouveau_gpuobj_new(struct drm_device *dev, int channel, int size, int align,
                  channel, size, align, flags);
 
        if (!dev_priv || !gpuobj_ret || *gpuobj_ret != NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        if (channel >= 0) {
                if (channel > nouveau_fifo_number(dev))
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                chan = dev_priv->fifos[channel];
        }
 
        gpuobj = drm_calloc(1, sizeof(*gpuobj), DRM_MEM_DRIVER);
        if (!gpuobj)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        DRM_DEBUG("gpuobj %p\n", gpuobj);
        gpuobj->flags = flags;
        gpuobj->im_channel = channel;
@@ -230,7 +230,7 @@ nouveau_gpuobj_new(struct drm_device *dev, int channel, int size, int align,
 
        if (!pramin) {
                DRM_ERROR("No PRAMIN heap!\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (!chan && (ret = engine->instmem.populate(dev, gpuobj, &size))) {
@@ -244,7 +244,7 @@ nouveau_gpuobj_new(struct drm_device *dev, int channel, int size, int align,
                                                    (DRMFILE)-2);
        if (!gpuobj->im_pramin) {
                nouveau_gpuobj_del(dev, &gpuobj);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        gpuobj->im_pramin->flags = NOUVEAU_MEM_INSTANCE;
 
@@ -294,12 +294,12 @@ int nouveau_gpuobj_del(struct drm_device *dev, struct nouveau_gpuobj **pgpuobj)
        DRM_DEBUG("gpuobj %p\n", pgpuobj ? *pgpuobj : NULL);
 
        if (!dev_priv || !pgpuobj || !(*pgpuobj))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        gpuobj = *pgpuobj;
 
        if (gpuobj->refcount != 0) {
                DRM_ERROR("gpuobj refcount is %d\n", gpuobj->refcount);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        engine->instmem.clear(dev, gpuobj);
@@ -340,7 +340,7 @@ nouveau_gpuobj_instance_get(struct drm_device *dev, int channel,
        if ((channel > 0) && gpuobj->im_channel != channel) {
                DRM_ERROR("Channel mismatch: obj %d, ref %d\n",
                          gpuobj->im_channel, channel);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /* NV50 channel-local instance */
@@ -355,7 +355,7 @@ nouveau_gpuobj_instance_get(struct drm_device *dev, int channel,
                /* ...from global heap */
                if (!gpuobj->im_backing) {
                        DRM_ERROR("AII, no VRAM backing gpuobj\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                *inst = gpuobj->im_backing->start;
                return 0;
@@ -367,7 +367,7 @@ nouveau_gpuobj_instance_get(struct drm_device *dev, int channel,
                return 0;
        }
 
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 int
@@ -383,15 +383,15 @@ nouveau_gpuobj_ref_add(struct drm_device *dev, int channel, uint32_t handle,
        DRM_DEBUG("ch%d h=0x%08x gpuobj=%p\n", channel, handle, gpuobj);
 
        if (!dev_priv || !gpuobj || (ref_ret && *ref_ret != NULL))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        if (channel >= 0) {
                if (channel > nouveau_fifo_number(dev))
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                chan = dev_priv->fifos[channel];
        } else
        if (!ref_ret)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        ret = nouveau_gpuobj_instance_get(dev, channel, gpuobj, &instance);
        if (ret)
@@ -399,7 +399,7 @@ nouveau_gpuobj_ref_add(struct drm_device *dev, int channel, uint32_t handle,
 
        ref = drm_calloc(1, sizeof(*ref), DRM_MEM_DRIVER);
        if (!ref)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        ref->gpuobj   = gpuobj;
        ref->channel  = channel;
        ref->instance = instance;
@@ -431,7 +431,7 @@ int nouveau_gpuobj_ref_del(struct drm_device *dev, struct nouveau_gpuobj_ref **p
        DRM_DEBUG("ref %p\n", pref ? *pref : NULL);
 
        if (!dev || !pref || *pref == NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        ref = *pref;
 
        if (ref->handle != ~0)
@@ -487,7 +487,7 @@ nouveau_gpuobj_ref_find(struct drm_device *dev, int channel, uint32_t handle,
                ref = ref->next;
        }
 
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 int
@@ -504,7 +504,7 @@ nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t offset, uint32_t size,
 
        gpuobj = drm_calloc(1, sizeof(*gpuobj), DRM_MEM_DRIVER);
        if (!gpuobj)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        DRM_DEBUG("gpuobj %p\n", gpuobj);
        gpuobj->im_channel = -1;
        gpuobj->flags      = flags | NVOBJ_FLAG_FAKE;
@@ -513,7 +513,7 @@ nouveau_gpuobj_new_fake(struct drm_device *dev, uint32_t offset, uint32_t size,
                                       DRM_MEM_DRIVER);
        if (!gpuobj->im_pramin) {
                nouveau_gpuobj_del(dev, &gpuobj);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        gpuobj->im_pramin->start = offset;
        gpuobj->im_pramin->size  = size;
@@ -650,7 +650,7 @@ nouveau_gpuobj_dma_new(struct drm_device *dev, int channel, int class,
                        if ((idx + page_count) > dev->sg->pages) {
                                DRM_ERROR("Requested page range exceedes "
                                          "allocated scatter-gather range!");
-                               return DRM_ERR(E2BIG);
+                               return -E2BIG;
                        }
 
                        DRM_DEBUG("Creating PCI DMA object using virtual zone starting at %#llx, size %d\n", offset, (uint32_t)size);
@@ -676,7 +676,7 @@ nouveau_gpuobj_dma_new(struct drm_device *dev, int channel, int class,
                                                             DMA_BIDIRECTIONAL);
 
                                        if (dma_mapping_error(dev->sg->busaddr[idx])) {
-                                               return DRM_ERR(ENOMEM);
+                                               return -ENOMEM;
                                        }
                                }
 
@@ -733,14 +733,14 @@ nouveau_gpuobj_gart_dma_new(struct drm_device *dev, int channel,
                *gpuobj = dev_priv->gart_info.sg_ctxdma;
                if (offset & ~0xffffffffULL) {
                        DRM_ERROR("obj offset exceeds 32-bits\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                if (o_ret)
                        *o_ret = (uint32_t)offset;
-               ret = (*gpuobj != NULL) ? 0 : DRM_ERR(EINVAL);
+               ret = (*gpuobj != NULL) ? 0 : -EINVAL;
        } else {
                DRM_ERROR("Invalid GART type %d\n", dev_priv->gart_info.type);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return ret;
@@ -982,7 +982,7 @@ nouveau_gpuobj_channel_init(struct drm_device *dev, int channel,
                                             NV_DMA_TARGET_PCI_NONLINEAR, &tt);
        } else {
                DRM_ERROR("Invalid GART type %d\n", dev_priv->gart_info.type);
-               ret = DRM_ERR(EINVAL);
+               ret = -EINVAL;
        }
 
        if (ret) {
@@ -1038,15 +1038,15 @@ int nouveau_ioctl_grobj_alloc(DRM_IOCTL_ARGS)
        if (!nouveau_fifo_owner(dev, filp, init.channel)) {
                DRM_ERROR("pid %d doesn't own channel %d\n",
                                DRM_CURRENTPID, init.channel);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        //FIXME: check args, only allow trusted objects to be created
        
        if (init.handle == ~0)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        if (nouveau_gpuobj_ref_find(dev, init.channel, init.handle, NULL) == 0)
-               return DRM_ERR(EEXIST);
+               return -EEXIST;
 
        if ((ret = nouveau_gpuobj_gr_new(dev, init.channel, init.class, &gr))) {
                DRM_ERROR("Error creating gr object: %d (%d/0x%08x)\n",
index a26ecea..b645995 100644 (file)
@@ -383,11 +383,11 @@ int nouveau_load(struct drm_device *dev, unsigned long flags)
        struct drm_nouveau_private *dev_priv;
 
        if (flags==NV_UNKNOWN)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        dev_priv = drm_calloc(1, sizeof(*dev_priv), DRM_MEM_DRIVER);
        if (!dev_priv)                   
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        dev_priv->card_type=flags&NOUVEAU_FAMILY;
        dev_priv->flags=flags&NOUVEAU_FLAGS;
@@ -463,7 +463,7 @@ int nouveau_ioctl_getparam(DRM_IOCTL_ARGS)
                else 
                     {
                     DRM_ERROR("Requested PCIGART address, while no PCIGART was created\n");
-                    return DRM_ERR(EINVAL);
+                    return -EINVAL;
                     }
                break;
        case NOUVEAU_GETPARAM_FB_SIZE:
@@ -474,7 +474,7 @@ int nouveau_ioctl_getparam(DRM_IOCTL_ARGS)
                break;
        default:
                DRM_ERROR("unknown parameter %lld\n", getparam.param);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        DRM_COPY_TO_USER_IOCTL((struct drm_nouveau_getparam __user *)data,
@@ -503,7 +503,7 @@ int nouveau_ioctl_setparam(DRM_IOCTL_ARGS)
                default:
                        DRM_ERROR("invalid CMDBUF_LOCATION value=%lld\n",
                                        setparam.value);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                dev_priv->config.cmdbuf.location = setparam.value;
                break;
@@ -512,7 +512,7 @@ int nouveau_ioctl_setparam(DRM_IOCTL_ARGS)
                break;
        default:
                DRM_ERROR("unknown parameter %lld\n", setparam.param);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
index 7cf0626..35b20ab 100644 (file)
@@ -126,7 +126,7 @@ int
 nv04_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz)
 {
        if (gpuobj->im_backing)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        return 0;
 }
@@ -148,7 +148,7 @@ int
 nv04_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 {
        if (!gpuobj->im_pramin || gpuobj->im_bound)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        gpuobj->im_bound = 1;
        return 0;
@@ -158,7 +158,7 @@ int
 nv04_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
 {
        if (gpuobj->im_bound == 0)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        gpuobj->im_bound = 0;
        return 0;
index 8af3bd1..1670c52 100644 (file)
@@ -81,7 +81,7 @@ int nv20_graph_save_context(struct drm_device *dev, int channel) {
 
        instance = INSTANCE_RD(dev_priv->ctx_table->gpuobj, channel);
        if (!instance) {
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (instance != (chan->ramin_grctx->instance >> 4))
                DRM_ERROR("nv20_graph_save_context : bad instance\n");
@@ -102,7 +102,7 @@ int nv20_graph_load_context(struct drm_device *dev, int channel) {
 
        instance = INSTANCE_RD(dev_priv->ctx_table->gpuobj, channel);
        if (!instance) {
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (instance != (chan->ramin_grctx->instance >> 4))
                DRM_ERROR("nv20_graph_load_context_current : bad instance\n");
index d713877..4ed2e2b 100644 (file)
@@ -156,7 +156,7 @@ nouveau_graph_wait_idle(struct drm_device *dev)
 
        if (NV_READ(0x400700)) {
                DRM_ERROR("timeout!\n");
-               return DRM_ERR(EBUSY);
+               return -EBUSY;
        }
        return 0;
 }
@@ -168,7 +168,7 @@ int nv30_graph_load_context(struct drm_device *dev, int channel)
        uint32_t inst;
 
        if (!chan->ramin_grctx)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        inst = chan->ramin_grctx->instance >> 4;
 
        NV_WRITE(NV20_PGRAPH_CHANNEL_CTX_POINTER, inst);
@@ -185,7 +185,7 @@ int nv30_graph_save_context(struct drm_device *dev, int channel)
        uint32_t inst;
 
        if (!chan->ramin_grctx)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        inst = chan->ramin_grctx->instance >> 4;
 
        NV_WRITE(NV20_PGRAPH_CHANNEL_CTX_POINTER, inst);
index d8fccb7..441dbae 100644 (file)
@@ -1317,7 +1317,7 @@ nv40_graph_transfer_context(struct drm_device *dev, uint32_t inst, int save)
                DRM_ERROR("failed: inst=0x%08x save=%d\n", inst, save);
                DRM_ERROR("0x40030C = 0x%08x\n",
                          NV_READ(NV40_PGRAPH_CTXCTL_030C));
-               return DRM_ERR(EBUSY);
+               return -EBUSY;
        }
 
        return 0;
@@ -1334,7 +1334,7 @@ nv40_graph_save_context(struct drm_device *dev, int channel)
        uint32_t inst;
 
        if (!chan->ramin_grctx)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        inst = chan->ramin_grctx->instance >> 4;
 
        return nv40_graph_transfer_context(dev, inst, 1);
@@ -1352,7 +1352,7 @@ nv40_graph_load_context(struct drm_device *dev, int channel)
        int ret;
 
        if (!chan->ramin_grctx)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        inst = chan->ramin_grctx->instance >> 4;
 
        ret = nv40_graph_transfer_context(dev, inst, 0);
index 4933bbf..f7b9822 100644 (file)
@@ -69,14 +69,14 @@ nv50_fifo_channel_enable(struct drm_device *dev, int channel)
 
        if (IS_G80) {
                if (!chan->ramin)
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
 
                NV_WRITE(NV50_PFIFO_CTX_TABLE(channel),
                         (chan->ramin->instance >> 12) |
                         NV50_PFIFO_CTX_TABLE_CHANNEL_ENABLED);
        } else {
                if (!chan->ramfc)
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
 
                NV_WRITE(NV50_PFIFO_CTX_TABLE(channel),
                         (chan->ramfc->instance >> 8) |
@@ -186,7 +186,7 @@ nv50_fifo_init(struct drm_device *dev)
 
        priv = drm_calloc(1, sizeof(*priv), DRM_MEM_DRIVER);
        if (!priv)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        dev_priv->Engine.fifo.priv = priv;
 
        nv50_fifo_init_reset(dev);
index 6a04c15..8df5df2 100644 (file)
@@ -259,7 +259,7 @@ nv50_graph_transfer_context(struct drm_device *dev, uint32_t inst, int save)
                DRM_ERROR("failed: inst=0x%08x save=%d\n", inst, save);
                DRM_ERROR("0x40030C = 0x%08x\n",
                          NV_READ(NV40_PGRAPH_CTXCTL_030C));
-               return DRM_ERR(EBUSY);
+               return -EBUSY;
        }
 
        return 0;
index 027d3ff..ad77f44 100644 (file)
@@ -49,7 +49,7 @@ nv50_instmem_init(struct drm_device *dev)
 
        priv = drm_calloc(1, sizeof(*priv), DRM_MEM_DRIVER);
        if (!priv)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        dev_priv->Engine.instmem.priv = priv;
 
        /* Save current state */
@@ -126,14 +126,14 @@ nv50_instmem_init(struct drm_device *dev)
        NV_WRITE(0x1700, pt >> 16);
        if (NV_READ(0x700000) != NV_RI32(0)) {
                DRM_ERROR("Failed to init PRAMIN page table\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /* Create a heap to manage PRAMIN aperture allocations */
        ret = nouveau_mem_init_heap(&dev_priv->ramin_heap, pts, as-pts);
        if (ret) {
                DRM_ERROR("Failed to init PRAMIN heap\n");
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        DRM_DEBUG("NV50: PRAMIN setup ok\n");
 
@@ -171,18 +171,18 @@ int
 nv50_instmem_populate(struct drm_device *dev, struct nouveau_gpuobj *gpuobj, uint32_t *sz)
 {
        if (gpuobj->im_backing)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        *sz = (*sz + (NV50_INSTMEM_PAGE_SIZE-1)) & ~(NV50_INSTMEM_PAGE_SIZE-1);
        if (*sz == 0)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        gpuobj->im_backing = nouveau_mem_alloc(dev, NV50_INSTMEM_PAGE_SIZE,
                                               *sz, NOUVEAU_MEM_FB,
                                               (DRMFILE)-2);
        if (!gpuobj->im_backing) {
                DRM_ERROR("Couldn't allocate vram to back PRAMIN pages\n");
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        return 0;
@@ -208,7 +208,7 @@ nv50_instmem_bind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
        uint32_t pte, pte_end, vram;
 
        if (!gpuobj->im_backing || !gpuobj->im_pramin || gpuobj->im_bound)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_DEBUG("st=0x%0llx sz=0x%0llx\n",
                  gpuobj->im_pramin->start, gpuobj->im_pramin->size);
@@ -246,7 +246,7 @@ nv50_instmem_unbind(struct drm_device *dev, struct nouveau_gpuobj *gpuobj)
        uint32_t pte, pte_end;
 
        if (gpuobj->im_bound == 0)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        pte     = (gpuobj->im_pramin->start >> 12) << 3;
        pte_end = ((gpuobj->im_pramin->size >> 12) << 3) + pte;
index 167fc07..51b290b 100644 (file)
@@ -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
@@ -642,7 +642,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)
@@ -719,7 +719,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);
@@ -757,7 +757,7 @@ int r128_engine_reset(DRM_IOCTL_ARGS)
 
 int r128_fullscreen(DRM_IOCTL_ARGS)
 {
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 /* ================================================================
@@ -778,7 +778,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;
@@ -789,7 +789,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;
@@ -881,7 +881,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)
@@ -892,16 +892,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++;
        }
@@ -925,7 +925,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.
@@ -933,7 +933,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;
index c9abd67..077b276 100644 (file)
@@ -428,7 +428,7 @@ do {                                                                        \
                        DRM_UDELAY(1);                          \
                }                                                       \
                DRM_ERROR( "ring space check failed!\n" );              \
-               return DRM_ERR(EBUSY);                          \
+               return -EBUSY;                          \
        }                                                               \
  __ring_space_done:                                                    \
        ;                                                               \
index b793d94..6b19c4d 100644 (file)
@@ -809,7 +809,7 @@ static int r128_cce_dispatch_blit(DRMFILE filp,
                break;
        default:
                DRM_ERROR("invalid blit format %d\n", blit->format);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /* Flush the pixel cache, and mark the contents as Read Invalid.
@@ -832,11 +832,11 @@ static int r128_cce_dispatch_blit(DRMFILE filp,
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", blit->idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        buf_priv->discard = 1;
@@ -900,22 +900,22 @@ static int r128_cce_dispatch_write_span(struct drm_device * dev,
 
        count = depth->n;
        if (count > 4096 || count <= 0)
-               return DRM_ERR(EMSGSIZE);
+               return -EMSGSIZE;
 
        if (DRM_COPY_FROM_USER(&x, depth->x, sizeof(x))) {
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
        if (DRM_COPY_FROM_USER(&y, depth->y, sizeof(y))) {
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        buffer_size = depth->n * sizeof(u32);
        buffer = drm_alloc(buffer_size, DRM_MEM_BUFS);
        if (buffer == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        if (DRM_COPY_FROM_USER(buffer, depth->buffer, buffer_size)) {
                drm_free(buffer, buffer_size, DRM_MEM_BUFS);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        mask_size = depth->n * sizeof(u8);
@@ -923,12 +923,12 @@ static int r128_cce_dispatch_write_span(struct drm_device * dev,
                mask = drm_alloc(mask_size, DRM_MEM_BUFS);
                if (mask == NULL) {
                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                }
                if (DRM_COPY_FROM_USER(mask, depth->mask, mask_size)) {
                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
                        drm_free(mask, mask_size, DRM_MEM_BUFS);
-                       return DRM_ERR(EFAULT);
+                       return -EFAULT;
                }
 
                for (i = 0; i < count; i++, x++) {
@@ -996,28 +996,28 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
 
        count = depth->n;
        if (count > 4096 || count <= 0)
-               return DRM_ERR(EMSGSIZE);
+               return -EMSGSIZE;
 
        xbuf_size = count * sizeof(*x);
        ybuf_size = count * sizeof(*y);
        x = drm_alloc(xbuf_size, DRM_MEM_BUFS);
        if (x == NULL) {
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        y = drm_alloc(ybuf_size, DRM_MEM_BUFS);
        if (y == NULL) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        if (DRM_COPY_FROM_USER(x, depth->x, xbuf_size)) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
                drm_free(y, ybuf_size, DRM_MEM_BUFS);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
        if (DRM_COPY_FROM_USER(y, depth->y, xbuf_size)) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
                drm_free(y, ybuf_size, DRM_MEM_BUFS);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        buffer_size = depth->n * sizeof(u32);
@@ -1025,13 +1025,13 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
        if (buffer == NULL) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
                drm_free(y, ybuf_size, DRM_MEM_BUFS);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        if (DRM_COPY_FROM_USER(buffer, depth->buffer, buffer_size)) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
                drm_free(y, ybuf_size, DRM_MEM_BUFS);
                drm_free(buffer, buffer_size, DRM_MEM_BUFS);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        if (depth->mask) {
@@ -1041,14 +1041,14 @@ static int r128_cce_dispatch_write_pixels(struct drm_device * dev,
                        drm_free(x, xbuf_size, DRM_MEM_BUFS);
                        drm_free(y, ybuf_size, DRM_MEM_BUFS);
                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                }
                if (DRM_COPY_FROM_USER(mask, depth->mask, mask_size)) {
                        drm_free(x, xbuf_size, DRM_MEM_BUFS);
                        drm_free(y, ybuf_size, DRM_MEM_BUFS);
                        drm_free(buffer, buffer_size, DRM_MEM_BUFS);
                        drm_free(mask, mask_size, DRM_MEM_BUFS);
-                       return DRM_ERR(EFAULT);
+                       return -EFAULT;
                }
 
                for (i = 0; i < count; i++) {
@@ -1115,13 +1115,13 @@ static int r128_cce_dispatch_read_span(struct drm_device * dev,
 
        count = depth->n;
        if (count > 4096 || count <= 0)
-               return DRM_ERR(EMSGSIZE);
+               return -EMSGSIZE;
 
        if (DRM_COPY_FROM_USER(&x, depth->x, sizeof(x))) {
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
        if (DRM_COPY_FROM_USER(&y, depth->y, sizeof(y))) {
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        BEGIN_RING(7);
@@ -1159,7 +1159,7 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
 
        count = depth->n;
        if (count > 4096 || count <= 0)
-               return DRM_ERR(EMSGSIZE);
+               return -EMSGSIZE;
 
        if (count > dev_priv->depth_pitch) {
                count = dev_priv->depth_pitch;
@@ -1169,22 +1169,22 @@ static int r128_cce_dispatch_read_pixels(struct drm_device * dev,
        ybuf_size = count * sizeof(*y);
        x = drm_alloc(xbuf_size, DRM_MEM_BUFS);
        if (x == NULL) {
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        y = drm_alloc(ybuf_size, DRM_MEM_BUFS);
        if (y == NULL) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        if (DRM_COPY_FROM_USER(x, depth->x, xbuf_size)) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
                drm_free(y, ybuf_size, DRM_MEM_BUFS);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
        if (DRM_COPY_FROM_USER(y, depth->y, ybuf_size)) {
                drm_free(x, xbuf_size, DRM_MEM_BUFS);
                drm_free(y, ybuf_size, DRM_MEM_BUFS);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        for (i = 0; i < count; i++) {
@@ -1363,7 +1363,7 @@ static int r128_cce_vertex(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(vertex, (drm_r128_vertex_t __user *) data,
@@ -1375,12 +1375,12 @@ static int r128_cce_vertex(DRM_IOCTL_ARGS)
        if (vertex.idx < 0 || vertex.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          vertex.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (vertex.prim < 0 ||
            vertex.prim > R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2) {
                DRM_ERROR("buffer prim %d\n", vertex.prim);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -1392,11 +1392,11 @@ static int r128_cce_vertex(DRM_IOCTL_ARGS)
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", vertex.idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        buf->used = vertex.count;
@@ -1423,7 +1423,7 @@ static int r128_cce_indices(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(elts, (drm_r128_indices_t __user *) data,
@@ -1435,11 +1435,11 @@ static int r128_cce_indices(DRM_IOCTL_ARGS)
        if (elts.idx < 0 || elts.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          elts.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (elts.prim < 0 || elts.prim > R128_CCE_VC_CNTL_PRIM_TYPE_TRI_TYPE2) {
                DRM_ERROR("buffer prim %d\n", elts.prim);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -1451,11 +1451,11 @@ static int r128_cce_indices(DRM_IOCTL_ARGS)
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", elts.idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        count = (elts.end - elts.start) / sizeof(u16);
@@ -1463,11 +1463,11 @@ static int r128_cce_indices(DRM_IOCTL_ARGS)
 
        if (elts.start & 0x7) {
                DRM_ERROR("misaligned buffer 0x%x\n", elts.start);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (elts.start < buf->used) {
                DRM_ERROR("no header 0x%x - 0x%x\n", elts.start, buf->used);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        buf->used = elts.end;
@@ -1498,7 +1498,7 @@ static int r128_cce_blit(DRM_IOCTL_ARGS)
        if (blit.idx < 0 || blit.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          blit.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -1524,7 +1524,7 @@ static int r128_cce_depth(DRM_IOCTL_ARGS)
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
-       ret = DRM_ERR(EINVAL);
+       ret = -EINVAL;
        switch (depth.func) {
        case R128_WRITE_SPAN:
                ret = r128_cce_dispatch_write_span(dev, &depth);
@@ -1557,7 +1557,7 @@ static int r128_cce_stipple(DRM_IOCTL_ARGS)
                                 sizeof(stipple));
 
        if (DRM_COPY_FROM_USER(&mask, stipple.mask, 32 * sizeof(u32)))
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
@@ -1583,7 +1583,7 @@ static int r128_cce_indirect(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(indirect, (drm_r128_indirect_t __user *) data,
@@ -1595,7 +1595,7 @@ static int r128_cce_indirect(DRM_IOCTL_ARGS)
        if (indirect.idx < 0 || indirect.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          indirect.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        buf = dma->buflist[indirect.idx];
@@ -1604,17 +1604,17 @@ static int r128_cce_indirect(DRM_IOCTL_ARGS)
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", indirect.idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (indirect.start < buf->used) {
                DRM_ERROR("reusing indirect: start=0x%x actual=0x%x\n",
                          indirect.start, buf->used);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -1651,7 +1651,7 @@ static int r128_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_r128_getparam_t __user *) data,
@@ -1664,12 +1664,12 @@ static int r128_getparam(DRM_IOCTL_ARGS)
                value = dev->irq;
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
index 9cf352a..8fee22e 100644 (file)
@@ -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;
@@ -725,11 +725,11 @@ static int r300_scratch(drm_radeon_private_t *dev_priv,
        RING_LOCALS;
        
        if (cmdbuf->bufsz < sizeof(uint64_t) + 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] ++;
@@ -744,21 +744,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);
@@ -878,7 +878,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;
                        }
 
@@ -886,7 +886,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;
                        }
 
@@ -923,7 +923,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;
                }
        }
index 40a20e6..723d41c 100644 (file)
@@ -889,7 +889,7 @@ static int radeon_do_pixcache_flush(drm_radeon_private_t * dev_priv)
        DRM_ERROR("failed!\n");
        radeon_status(dev_priv);
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries)
@@ -910,7 +910,7 @@ static int radeon_do_wait_for_fifo(drm_radeon_private_t * dev_priv, int entries)
        DRM_ERROR("failed!\n");
        radeon_status(dev_priv);
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)
@@ -936,7 +936,7 @@ static int radeon_do_wait_for_idle(drm_radeon_private_t * dev_priv)
        DRM_ERROR("failed!\n");
        radeon_status(dev_priv);
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 /* ================================================================
@@ -1400,7 +1400,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
        if ((dev_priv->flags & RADEON_NEW_MEMMAP) && !dev_priv->new_memmap) {
                DRM_ERROR("Cannot initialise DRM on this card\nThis card requires a new X.org DDX for 3D\n");
                radeon_do_cleanup_cp(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (init->is_pci && (dev_priv->flags & RADEON_IS_AGP))
@@ -1418,7 +1418,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
        if ((!(dev_priv->flags & RADEON_IS_AGP)) && !dev->sg) {
                DRM_ERROR("PCI GART memory not allocated!\n");
                radeon_do_cleanup_cp(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->usec_timeout = init->usec_timeout;
@@ -1426,7 +1426,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
            dev_priv->usec_timeout > RADEON_MAX_USEC_TIMEOUT) {
                DRM_DEBUG("TIMEOUT problem!\n");
                radeon_do_cleanup_cp(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /* Enable vblank on CRTC1 for older X servers
@@ -1455,7 +1455,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
            (init->cp_mode != RADEON_CSQ_PRIBM_INDBM)) {
                DRM_DEBUG("BAD cp_mode (%x)!\n", init->cp_mode);
                radeon_do_cleanup_cp(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        switch (init->fb_bpp) {
@@ -1524,27 +1524,27 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
        if (!dev_priv->sarea) {
                DRM_ERROR("could not find sarea!\n");
                radeon_do_cleanup_cp(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->cp_ring = drm_core_findmap(dev, init->ring_offset);
        if (!dev_priv->cp_ring) {
                DRM_ERROR("could not find cp ring region!\n");
                radeon_do_cleanup_cp(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");
                radeon_do_cleanup_cp(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);
        if (!dev->agp_buffer_map) {
                DRM_ERROR("could not find dma buffer region!\n");
                radeon_do_cleanup_cp(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (init->gart_textures_offset) {
@@ -1553,7 +1553,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
                if (!dev_priv->gart_textures) {
                        DRM_ERROR("could not find GART texture region!\n");
                        radeon_do_cleanup_cp(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
 
@@ -1571,7 +1571,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
                    !dev->agp_buffer_map->handle) {
                        DRM_ERROR("could not find ioremap agp regions!\n");
                        radeon_do_cleanup_cp(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        } else
 #endif
@@ -1725,14 +1725,14 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init)
                                DRM_ERROR
                                    ("Cannot use PCI Express without GART in FB memory\n");
                                radeon_do_cleanup_cp(dev);
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
                }
 
                if (!drm_ati_pcigart_init(dev, &dev_priv->gart_info)) {
                        DRM_ERROR("failed to init PCI GART!\n");
                        radeon_do_cleanup_cp(dev);
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                }
 
                /* Turn on PCI GART */
@@ -1812,7 +1812,7 @@ static int radeon_do_resume_cp(struct drm_device * dev)
 
        if (!dev_priv) {
                DRM_ERROR("Called with no initialization\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        DRM_DEBUG("Starting radeon_do_resume_cp()\n");
@@ -1860,7 +1860,7 @@ int radeon_cp_init(DRM_IOCTL_ARGS)
                return radeon_do_cleanup_cp(dev);
        }
 
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 int radeon_cp_start(DRM_IOCTL_ARGS)
@@ -1993,7 +1993,7 @@ int radeon_cp_reset(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_DEBUG("%s called before init done\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        radeon_do_cp_reset(dev_priv);
@@ -2187,7 +2187,7 @@ int radeon_wait_ring(drm_radeon_private_t * dev_priv, int n)
        radeon_status(dev_priv);
        DRM_ERROR("failed!\n");
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev,
@@ -2199,16 +2199,16 @@ static int radeon_cp_get_buffers(DRMFILE filp, struct drm_device * dev,
        for (i = d->granted_count; i < d->request_count; i++) {
                buf = radeon_freelist_get(dev);
                if (!buf)
-                       return DRM_ERR(EBUSY);  /* NOTE: broken client */
+                       return -EBUSY;  /* NOTE: broken client */
 
                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++;
        }
@@ -2232,7 +2232,7 @@ int radeon_cp_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.
@@ -2240,7 +2240,7 @@ int radeon_cp_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;
@@ -2261,7 +2261,7 @@ int radeon_driver_load(struct drm_device *dev, unsigned long flags)
 
        dev_priv = drm_alloc(sizeof(drm_radeon_private_t), DRM_MEM_DRIVER);
        if (dev_priv == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        memset(dev_priv, 0, sizeof(drm_radeon_private_t));
        dev->dev_private = (void *)dev_priv;
index b973b96..8266d11 100644 (file)
@@ -156,7 +156,7 @@ static int radeon_driver_vblank_do_wait(struct drm_device * dev,
        atomic_t *counter;
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (crtc == DRM_RADEON_VBLANK_CRTC1) {
@@ -166,7 +166,7 @@ static int radeon_driver_vblank_do_wait(struct drm_device * dev,
                counter = &dev->vbl_received2;
                ack |= RADEON_CRTC2_VBLANK_STAT;
        } else
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        radeon_acknowledge_irqs(dev_priv, ack);
 
@@ -208,7 +208,7 @@ int radeon_irq_emit(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(emit, (drm_radeon_irq_emit_t __user *) data,
@@ -218,7 +218,7 @@ int radeon_irq_emit(DRM_IOCTL_ARGS)
 
        if (DRM_COPY_TO_USER(emit.irq_seq, &result, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
@@ -234,7 +234,7 @@ int radeon_irq_wait(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(irqwait, (drm_radeon_irq_wait_t __user *) data,
@@ -321,7 +321,7 @@ int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value)
        drm_radeon_private_t *dev_priv = (drm_radeon_private_t *) dev->dev_private;
        if (value & ~(DRM_RADEON_VBLANK_CRTC1 | DRM_RADEON_VBLANK_CRTC2)) {
                DRM_ERROR("called with invalid crtc 0x%x\n", (unsigned int)value);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        dev_priv->vblank_crtc = (unsigned int)value;
        radeon_enable_interrupt(dev);
index dbc91c9..63d4b8c 100644 (file)
@@ -137,12 +137,12 @@ static int init_heap(struct mem_block **heap, int start, int size)
        struct mem_block *blocks = drm_alloc(sizeof(*blocks), DRM_MEM_BUFS);
 
        if (!blocks)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        *heap = drm_alloc(sizeof(**heap), DRM_MEM_BUFS);
        if (!*heap) {
                drm_free(blocks, sizeof(*blocks), DRM_MEM_BUFS);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        blocks->start = start;
@@ -226,7 +226,7 @@ int radeon_mem_alloc(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(alloc, (drm_radeon_mem_alloc_t __user *) data,
@@ -234,7 +234,7 @@ int radeon_mem_alloc(DRM_IOCTL_ARGS)
 
        heap = get_heap(dev_priv, alloc.region);
        if (!heap || !*heap)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        /* Make things easier on ourselves: all allocations at least
         * 4k aligned.
@@ -245,11 +245,11 @@ int radeon_mem_alloc(DRM_IOCTL_ARGS)
        block = alloc_block(*heap, alloc.size, alloc.alignment, filp);
 
        if (!block)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        if (DRM_COPY_TO_USER(alloc.region_offset, &block->start, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
@@ -264,7 +264,7 @@ int radeon_mem_free(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(memfree, (drm_radeon_mem_free_t __user *) data,
@@ -272,14 +272,14 @@ int radeon_mem_free(DRM_IOCTL_ARGS)
 
        heap = get_heap(dev_priv, memfree.region);
        if (!heap || !*heap)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        block = find_block(*heap, memfree.region_offset);
        if (!block)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        if (block->filp != filp)
-               return DRM_ERR(EPERM);
+               return -EPERM;
 
        free_block(block);
        return 0;
@@ -294,7 +294,7 @@ int radeon_mem_init_heap(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(initheap,
@@ -303,11 +303,11 @@ int radeon_mem_init_heap(DRM_IOCTL_ARGS)
 
        heap = get_heap(dev_priv, initheap.region);
        if (!heap)
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        if (*heap) {
                DRM_ERROR("heap already initialized?");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return init_heap(heap, initheap.start, initheap.size);
index 13b09d4..e351656 100644 (file)
@@ -85,7 +85,7 @@ static __inline__ int radeon_check_and_fixup_offset(drm_radeon_private_t *
                *offset = off;
                return 0;
        }
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
@@ -99,7 +99,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                    &data[(RADEON_RB3D_DEPTHOFFSET - RADEON_PP_MISC) / 4])) {
                        DRM_ERROR("Invalid depth buffer offset\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                break;
 
@@ -107,7 +107,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                    &data[(RADEON_RB3D_COLOROFFSET - RADEON_PP_CNTL) / 4])) {
                        DRM_ERROR("Invalid colour buffer offset\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                break;
 
@@ -120,7 +120,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                                                  &data[0])) {
                        DRM_ERROR("Invalid R200 texture offset\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                break;
 
@@ -130,7 +130,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                    &data[(RADEON_PP_TXOFFSET_0 - RADEON_PP_TXFILTER_0) / 4])) {
                        DRM_ERROR("Invalid R100 texture offset\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                break;
 
@@ -147,7 +147,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
                                                                  &data[i])) {
                                        DRM_ERROR
                                            ("Invalid R200 cubic texture offset\n");
-                                       return DRM_ERR(EINVAL);
+                                       return -EINVAL;
                                }
                        }
                        break;
@@ -163,7 +163,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
                                                                  &data[i])) {
                                        DRM_ERROR
                                            ("Invalid R100 cubic texture offset\n");
-                                       return DRM_ERR(EINVAL);
+                                       return -EINVAL;
                                }
                        }
                }
@@ -256,7 +256,7 @@ static __inline__ int radeon_check_and_fixup_packets(drm_radeon_private_t *
 
        default:
                DRM_ERROR("Unknown state packet ID %d\n", id);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
@@ -277,12 +277,12 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
 
        if ((cmd[0] & 0xc0000000) != RADEON_CP_PACKET3) {
                DRM_ERROR("Not a type 3 packet\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (4 * *cmdsz > cmdbuf->bufsz) {
                DRM_ERROR("Packet size larger than size of data provided\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        switch(cmd[0] & 0xff00) {
@@ -307,7 +307,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                /* safe but r200 only */
                if (dev_priv->microcode_version != UCODE_R200) {
                        DRM_ERROR("Invalid 3d packet for r100-class chip\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                break;
 
@@ -317,7 +317,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                if (count > 18) { /* 12 arrays max */
                        DRM_ERROR("Too large payload in 3D_LOAD_VBPNTR (count=%d)\n",
                                  count);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                /* carefully check packet contents */
@@ -330,7 +330,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                                DRM_ERROR
                                    ("Invalid offset (k=%d i=%d) in 3D_LOAD_VBPNTR packet.\n",
                                     k, i);
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
                        k++;
                        i++;
@@ -341,7 +341,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                                DRM_ERROR
                                    ("Invalid offset (k=%d i=%d) in 3D_LOAD_VBPNTR packet.\n",
                                     k, i);
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
                        k++;
                        i++;
@@ -351,33 +351,33 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                        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;
                }
                break;
 
        case RADEON_3D_RNDR_GEN_INDX_PRIM:
                if (dev_priv->microcode_version != UCODE_R100) {
                        DRM_ERROR("Invalid 3d packet for r200-class chip\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv, &cmd[1])) {
                                DRM_ERROR("Invalid rndr_gen_indx offset\n");
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                }
                break;
 
        case RADEON_CP_INDX_BUFFER:
                if (dev_priv->microcode_version != UCODE_R200) {
                        DRM_ERROR("Invalid 3d packet for r100-class chip\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                if ((cmd[1] & 0x8000ffff) != 0x80000810) {
                        DRM_ERROR("Invalid indx_buffer reg address %08X\n", cmd[1]);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv, &cmd[2])) {
                        DRM_ERROR("Invalid indx_buffer offset is %08X\n", cmd[2]);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                break;
 
@@ -391,7 +391,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                        if (radeon_check_and_fixup_offset
                            (dev_priv, filp_priv, &offset)) {
                                DRM_ERROR("Invalid first packet offset\n");
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
                        cmd[2] = (cmd[2] & 0xffc00000) | offset >> 10;
                }
@@ -402,7 +402,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
                        if (radeon_check_and_fixup_offset
                            (dev_priv, filp_priv, &offset)) {
                                DRM_ERROR("Invalid second packet offset\n");
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
                        cmd[3] = (cmd[3] & 0xffc00000) | offset >> 10;
                }
@@ -410,7 +410,7 @@ static __inline__ int radeon_check_and_fixup_packet3(drm_radeon_private_t *
 
        default:
                DRM_ERROR("Invalid packet type %x\n", cmd[0] & 0xff00);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
@@ -451,13 +451,13 @@ static int radeon_emit_state(drm_radeon_private_t * dev_priv,
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                                                  &ctx->rb3d_depthoffset)) {
                        DRM_ERROR("Invalid depth buffer offset\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                                                  &ctx->rb3d_coloroffset)) {
                        DRM_ERROR("Invalid depth buffer offset\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                BEGIN_RING(14);
@@ -546,7 +546,7 @@ static int radeon_emit_state(drm_radeon_private_t * dev_priv,
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                                                  &tex[0].pp_txoffset)) {
                        DRM_ERROR("Invalid texture offset for unit 0\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                BEGIN_RING(9);
@@ -566,7 +566,7 @@ static int radeon_emit_state(drm_radeon_private_t * dev_priv,
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                                                  &tex[1].pp_txoffset)) {
                        DRM_ERROR("Invalid texture offset for unit 1\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                BEGIN_RING(9);
@@ -586,7 +586,7 @@ static int radeon_emit_state(drm_radeon_private_t * dev_priv,
                if (radeon_check_and_fixup_offset(dev_priv, filp_priv,
                                                  &tex[2].pp_txoffset)) {
                        DRM_ERROR("Invalid texture offset for unit 2\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                BEGIN_RING(9);
@@ -1668,7 +1668,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
 
        if (radeon_check_and_fixup_offset(dev_priv, filp_priv, &tex->offset)) {
                DRM_ERROR("Invalid destination offset\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->stats.boxes |= RADEON_BOX_TEXTURE_LOAD;
@@ -1711,11 +1711,11 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
                break;
        default:
                DRM_ERROR("invalid texture format %d\n", tex->format);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        spitch = blit_width >> 6;
        if (spitch == 0 && image->height > 1)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        texpitch = tex->pitch;
        if ((texpitch << 22) & RADEON_DST_TILE_MICRO) {
@@ -1760,8 +1760,8 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
                if (!buf) {
                        DRM_DEBUG("radeon_cp_dispatch_texture: EAGAIN\n");
                        if (DRM_COPY_TO_USER(tex->image, image, sizeof(*image)))
-                               return DRM_ERR(EFAULT);
-                       return DRM_ERR(EAGAIN);
+                               return -EFAULT;
+                       return -EAGAIN;
                }
 
                /* Dispatch the indirect buffer.
@@ -1774,7 +1774,7 @@ static int radeon_cp_dispatch_texture(DRMFILE filp,
        do { \
                if (DRM_COPY_FROM_USER(_buf, _data, (_width))) {\
                        DRM_ERROR("EFAULT on pad, %d bytes\n", (_width)); \
-                       return DRM_ERR(EFAULT); \
+                       return -EFAULT; \
                } \
        } while(0)
 
@@ -2080,7 +2080,7 @@ static int radeon_surface_alloc(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(alloc,
@@ -2088,7 +2088,7 @@ static int radeon_surface_alloc(DRM_IOCTL_ARGS)
                                 sizeof(alloc));
 
        if (alloc_surface(&alloc, dev_priv, filp) == -1)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        else
                return 0;
 }
@@ -2101,14 +2101,14 @@ static int radeon_surface_free(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(memfree, (drm_radeon_surface_free_t __user *) data,
                                 sizeof(memfree));
 
        if (free_surface(filp, dev_priv, memfree.address))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        else
                return 0;
 }
@@ -2134,7 +2134,7 @@ static int radeon_cp_clear(DRM_IOCTL_ARGS)
 
        if (DRM_COPY_FROM_USER(&depth_boxes, clear.depth_boxes,
                               sarea_priv->nbox * sizeof(depth_boxes[0])))
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        radeon_cp_dispatch_clear(dev, &clear, depth_boxes);
 
@@ -2227,7 +2227,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        sarea_priv = dev_priv->sarea_priv;
@@ -2243,11 +2243,11 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
        if (vertex.idx < 0 || vertex.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          vertex.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (vertex.prim < 0 || vertex.prim > RADEON_PRIM_TYPE_3VRT_LINE_LIST) {
                DRM_ERROR("buffer prim %d\n", vertex.prim);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -2258,11 +2258,11 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", vertex.idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /* Build up a prim_t record:
@@ -2276,7 +2276,7 @@ static int radeon_cp_vertex(DRM_IOCTL_ARGS)
                                              sarea_priv->tex_state,
                                              sarea_priv->dirty)) {
                                DRM_ERROR("radeon_emit_state failed\n");
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
 
                        sarea_priv->dirty &= ~(RADEON_UPLOAD_TEX0IMAGES |
@@ -2318,7 +2318,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        sarea_priv = dev_priv->sarea_priv;
 
@@ -2333,11 +2333,11 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
        if (elts.idx < 0 || elts.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          elts.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (elts.prim < 0 || elts.prim > RADEON_PRIM_TYPE_3VRT_LINE_LIST) {
                DRM_ERROR("buffer prim %d\n", elts.prim);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -2348,11 +2348,11 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", elts.idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        count = (elts.end - elts.start) / sizeof(u16);
@@ -2360,11 +2360,11 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
 
        if (elts.start & 0x7) {
                DRM_ERROR("misaligned buffer 0x%x\n", elts.start);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (elts.start < buf->used) {
                DRM_ERROR("no header 0x%x - 0x%x\n", elts.start, buf->used);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        buf->used = elts.end;
@@ -2375,7 +2375,7 @@ static int radeon_cp_indices(DRM_IOCTL_ARGS)
                                      sarea_priv->tex_state,
                                      sarea_priv->dirty)) {
                        DRM_ERROR("radeon_emit_state failed\n");
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
 
                sarea_priv->dirty &= ~(RADEON_UPLOAD_TEX0IMAGES |
@@ -2417,13 +2417,13 @@ static int radeon_cp_texture(DRM_IOCTL_ARGS)
 
        if (tex.image == NULL) {
                DRM_ERROR("null texture image!\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (DRM_COPY_FROM_USER(&image,
                               (drm_radeon_tex_image_t __user *) tex.image,
                               sizeof(image)))
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
        VB_AGE_TEST_WITH_RETURN(dev_priv);
@@ -2447,7 +2447,7 @@ static int radeon_cp_stipple(DRM_IOCTL_ARGS)
                                 sizeof(stipple));
 
        if (DRM_COPY_FROM_USER(&mask, stipple.mask, 32 * sizeof(u32)))
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
 
@@ -2470,7 +2470,7 @@ static int radeon_cp_indirect(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(indirect,
@@ -2483,7 +2483,7 @@ static int radeon_cp_indirect(DRM_IOCTL_ARGS)
        if (indirect.idx < 0 || indirect.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          indirect.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        buf = dma->buflist[indirect.idx];
@@ -2491,17 +2491,17 @@ static int radeon_cp_indirect(DRM_IOCTL_ARGS)
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", indirect.idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (indirect.start < buf->used) {
                DRM_ERROR("reusing indirect: start=0x%x actual=0x%x\n",
                          indirect.start, buf->used);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -2547,7 +2547,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        sarea_priv = dev_priv->sarea_priv;
@@ -2563,7 +2563,7 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
        if (vertex.idx < 0 || vertex.idx >= dma->buf_count) {
                DRM_ERROR("buffer index %d (of %d max)\n",
                          vertex.idx, dma->buf_count - 1);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        RING_SPACE_TEST_WITH_RETURN(dev_priv);
@@ -2574,23 +2574,23 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
        if (buf->filp != filp) {
                DRM_ERROR("process %d using buffer owned by %p\n",
                          DRM_CURRENTPID, buf->filp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (buf->pending) {
                DRM_ERROR("sending pending buffer %d\n", vertex.idx);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        for (laststate = 0xff, i = 0; i < vertex.nr_prims; i++) {
                drm_radeon_prim_t prim;
                drm_radeon_tcl_prim_t tclprim;
 
                if (DRM_COPY_FROM_USER(&prim, &vertex.prim[i], sizeof(prim)))
-                       return DRM_ERR(EFAULT);
+                       return -EFAULT;
 
                if (prim.stateidx != laststate) {
                        drm_radeon_state_t state;
@@ -2598,11 +2598,11 @@ static int radeon_cp_vertex2(DRM_IOCTL_ARGS)
                        if (DRM_COPY_FROM_USER(&state,
                                               &vertex.state[prim.stateidx],
                                               sizeof(state)))
-                               return DRM_ERR(EFAULT);
+                               return -EFAULT;
 
                        if (radeon_emit_state2(dev_priv, filp_priv, &state)) {
                                DRM_ERROR("radeon_emit_state2 failed\n");
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
 
                        laststate = prim.stateidx;
@@ -2648,19 +2648,19 @@ static int radeon_emit_packets(drm_radeon_private_t * dev_priv,
        RING_LOCALS;
 
        if (id >= RADEON_MAX_STATE_PACKETS)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        sz = packet[id].len;
        reg = packet[id].start;
 
        if (sz * sizeof(int) > cmdbuf->bufsz) {
                DRM_ERROR("Packet size provided larger than data provided\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (radeon_check_and_fixup_packets(dev_priv, filp_priv, id, data)) {
                DRM_ERROR("Packet verification failed\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        BEGIN_RING(sz + 1);
@@ -2748,7 +2748,7 @@ static __inline__ int radeon_emit_veclinear(drm_radeon_private_t *dev_priv,
        if (!sz)
                return 0;
        if (sz * 4 > cmdbuf->bufsz)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        BEGIN_RING(5 + sz);
        OUT_RING_REG(RADEON_SE_TCL_STATE_FLUSH, 0);
@@ -2816,7 +2816,7 @@ static int radeon_emit_packet3_cliprect(struct drm_device *dev,
        do {
                if (i < cmdbuf->nbox) {
                        if (DRM_COPY_FROM_USER(&box, &boxes[i], sizeof(box)))
-                               return DRM_ERR(EFAULT);
+                               return -EFAULT;
                        /* FIXME The second and subsequent times round
                         * this loop, send a WAIT_UNTIL_3D_IDLE before
                         * calling emit_clip_rect(). This fixes a
@@ -2874,7 +2874,7 @@ static int radeon_emit_wait(struct drm_device * dev, int flags)
                ADVANCE_RING();
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
@@ -2897,7 +2897,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        DRM_GET_PRIV_WITH_RETURN(filp_priv, filp);
@@ -2910,7 +2910,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
        VB_AGE_TEST_WITH_RETURN(dev_priv);
 
        if (cmdbuf.bufsz > 64 * 1024 || cmdbuf.bufsz < 0) {
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        /* Allocate an in-kernel area and copy in the cmdbuf.  Do this to avoid
@@ -2921,11 +2921,11 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
        if (orig_bufsz != 0) {
                kbuf = drm_alloc(cmdbuf.bufsz, DRM_MEM_DRIVER);
                if (kbuf == NULL)
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                if (DRM_COPY_FROM_USER(kbuf, (void __user *)cmdbuf.buf,
                                       cmdbuf.bufsz)) {
                        drm_free(kbuf, orig_bufsz, DRM_MEM_DRIVER);
-                       return DRM_ERR(EFAULT);
+                       return -EFAULT;
                }
                cmdbuf.buf = kbuf;
        }
@@ -3052,7 +3052,7 @@ static int radeon_cp_cmdbuf(DRM_IOCTL_ARGS)
       err:
        if (orig_bufsz != 0)
                drm_free(kbuf, orig_bufsz, DRM_MEM_DRIVER);
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 static int radeon_cp_getparam(DRM_IOCTL_ARGS)
@@ -3064,7 +3064,7 @@ static int radeon_cp_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_radeon_getparam_t __user *) data,
@@ -3119,7 +3119,7 @@ static int radeon_cp_getparam(DRM_IOCTL_ARGS)
                break;
        case RADEON_PARAM_SCRATCH_OFFSET:
                if (!dev_priv->writeback_works)
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                value = RADEON_SCRATCH_REG_OFFSET;
                break;
        
@@ -3136,12 +3136,12 @@ static int radeon_cp_getparam(DRM_IOCTL_ARGS)
                break;
        default:
                DRM_DEBUG( "Invalid parameter %d\n", param.param );
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (DRM_COPY_TO_USER(param.value, &value, sizeof(int))) {
                DRM_ERROR("copy_to_user\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        return 0;
@@ -3157,7 +3157,7 @@ static int radeon_cp_setparam(DRM_IOCTL_ARGS)
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        DRM_GET_PRIV_WITH_RETURN(filp_priv, filp);
@@ -3200,7 +3200,7 @@ static int radeon_cp_setparam(DRM_IOCTL_ARGS)
                break;
        default:
                DRM_DEBUG("Invalid parameter %d\n", sp.param);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        return 0;
index a3fd899..1835d75 100644 (file)
@@ -60,7 +60,7 @@ savage_bci_wait_fifo_shadow(drm_savage_private_t *dev_priv, unsigned int n)
        DRM_ERROR("failed!\n");
        DRM_INFO("   status=0x%08x, threshold=0x%08x\n", status, threshold);
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 static int
@@ -81,7 +81,7 @@ savage_bci_wait_fifo_s3d(drm_savage_private_t *dev_priv, unsigned int n)
        DRM_ERROR("failed!\n");
        DRM_INFO("   status=0x%08x\n", status);
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 static int
@@ -102,7 +102,7 @@ savage_bci_wait_fifo_s4(drm_savage_private_t *dev_priv, unsigned int n)
        DRM_ERROR("failed!\n");
        DRM_INFO("   status=0x%08x\n", status);
 #endif
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 /*
@@ -136,7 +136,7 @@ savage_bci_wait_event_shadow(drm_savage_private_t *dev_priv, uint16_t e)
        DRM_INFO("   status=0x%08x, e=0x%04x\n", status, e);
 #endif
 
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 static int
@@ -158,7 +158,7 @@ savage_bci_wait_event_reg(drm_savage_private_t *dev_priv, uint16_t e)
        DRM_INFO("   status=0x%08x, e=0x%04x\n", status, e);
 #endif
 
-       return DRM_ERR(EBUSY);
+       return -EBUSY;
 }
 
 uint16_t savage_bci_emit_event(drm_savage_private_t *dev_priv,
@@ -301,7 +301,7 @@ static int savage_dma_init(drm_savage_private_t *dev_priv)
        dev_priv->dma_pages = drm_alloc(sizeof(drm_savage_dma_page_t) *
                                        dev_priv->nr_dma_pages, DRM_MEM_DRIVER);
        if (dev_priv->dma_pages == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        for (i = 0; i < dev_priv->nr_dma_pages; ++i) {
                SET_AGE(&dev_priv->dma_pages[i].age, 0, 0);
@@ -541,7 +541,7 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset)
 
        dev_priv = drm_alloc(sizeof(drm_savage_private_t), DRM_MEM_DRIVER);
        if (dev_priv == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        memset(dev_priv, 0, sizeof(drm_savage_private_t));
        dev->dev_private = (void *)dev_priv;
@@ -681,16 +681,16 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
 
        if (init->fb_bpp != 16 && init->fb_bpp != 32) {
                DRM_ERROR("invalid frame buffer bpp %d!\n", init->fb_bpp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (init->depth_bpp != 16 && init->depth_bpp != 32) {
                DRM_ERROR("invalid depth buffer bpp %d!\n", init->fb_bpp);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (init->dma_type != SAVAGE_DMA_AGP &&
            init->dma_type != SAVAGE_DMA_PCI) {
                DRM_ERROR("invalid dma memory type %d!\n", init->dma_type);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->cob_size = init->cob_size;
@@ -714,14 +714,14 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
        if (!dev_priv->sarea) {
                DRM_ERROR("could not find sarea!\n");
                savage_do_cleanup_bci(dev);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        if (init->status_offset != 0) {
                dev_priv->status = drm_core_findmap(dev, init->status_offset);
                if (!dev_priv->status) {
                        DRM_ERROR("could not find shadow status region!\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        } else {
                dev_priv->status = NULL;
@@ -733,13 +733,13 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
                if (!dev->agp_buffer_map) {
                        DRM_ERROR("could not find DMA buffer region!\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                drm_core_ioremap(dev->agp_buffer_map, dev);
                if (!dev->agp_buffer_map) {
                        DRM_ERROR("failed to ioremap DMA buffer region!\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                }
        }
        if (init->agp_textures_offset) {
@@ -748,7 +748,7 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
                if (!dev_priv->agp_textures) {
                        DRM_ERROR("could not find agp texture region!\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        } else {
                dev_priv->agp_textures = NULL;
@@ -759,39 +759,39 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
                        DRM_ERROR("command DMA not supported on "
                                  "Savage3D/MX/IX.\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                if (dev->dma && dev->dma->buflist) {
                        DRM_ERROR("command and vertex DMA not supported "
                                  "at the same time.\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                dev_priv->cmd_dma = drm_core_findmap(dev, init->cmd_dma_offset);
                if (!dev_priv->cmd_dma) {
                        DRM_ERROR("could not find command DMA region!\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
                if (dev_priv->dma_type == SAVAGE_DMA_AGP) {
                        if (dev_priv->cmd_dma->type != _DRM_AGP) {
                                DRM_ERROR("AGP command DMA region is not a "
                                          "_DRM_AGP map!\n");
                                savage_do_cleanup_bci(dev);
-                               return DRM_ERR(EINVAL);
+                               return -EINVAL;
                        }
                        drm_core_ioremap(dev_priv->cmd_dma, dev);
                        if (!dev_priv->cmd_dma->handle) {
                                DRM_ERROR("failed to ioremap command "
                                          "DMA region!\n");
                                savage_do_cleanup_bci(dev);
-                               return DRM_ERR(ENOMEM);
+                               return -ENOMEM;
                        }
                } else if (dev_priv->cmd_dma->type != _DRM_CONSISTENT) {
                        DRM_ERROR("PCI command DMA region is not a "
                                  "_DRM_CONSISTENT map!\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        } else {
                dev_priv->cmd_dma = NULL;
@@ -808,7 +808,7 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
                if (!dev_priv->fake_dma.handle) {
                        DRM_ERROR("could not allocate faked DMA buffer!\n");
                        savage_do_cleanup_bci(dev);
-                       return DRM_ERR(ENOMEM);
+                       return -ENOMEM;
                }
                dev_priv->cmd_dma = &dev_priv->fake_dma;
                dev_priv->dma_flush = savage_fake_dma_flush;
@@ -885,13 +885,13 @@ static int savage_do_init_bci(struct drm_device *dev, drm_savage_init_t *init)
        if (savage_freelist_init(dev) < 0) {
                DRM_ERROR("could not initialize freelist\n");
                savage_do_cleanup_bci(dev);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        if (savage_dma_init(dev_priv) <  0) {
                DRM_ERROR("could not initialize command DMA\n");
                savage_do_cleanup_bci(dev);
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        return 0;
@@ -944,7 +944,7 @@ static int savage_bci_init(DRM_IOCTL_ARGS)
                return savage_do_cleanup_bci(dev);
        }
 
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 
 static int savage_bci_event_emit(DRM_IOCTL_ARGS)
@@ -1014,16 +1014,16 @@ static int savage_bci_get_buffers(DRMFILE filp, struct drm_device *dev, struct d
        for (i = d->granted_count; i < d->request_count; i++) {
                buf = savage_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++;
        }
@@ -1046,7 +1046,7 @@ int savage_bci_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.
@@ -1054,7 +1054,7 @@ int savage_bci_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;
index 290796e..753fe7d 100644 (file)
@@ -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;
@@ -132,7 +132,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,
@@ -164,7 +164,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,
@@ -287,7 +287,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)
@@ -301,7 +301,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:
@@ -310,18 +310,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) -
@@ -329,18 +329,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,
@@ -438,7 +438,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:
@@ -447,24 +447,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 */
        }
@@ -476,13 +476,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;
@@ -545,7 +545,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)
@@ -558,7 +558,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:
@@ -566,18 +566,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) -
@@ -585,11 +585,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;
                }
        }
 
@@ -626,7 +626,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;
                        }
                }
 
@@ -696,7 +696,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:
@@ -704,24 +704,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 */
        }
@@ -733,7 +733,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;
@@ -746,7 +746,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;
                        }
                }
 
@@ -941,7 +941,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)
@@ -978,7 +978,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 {
@@ -993,26 +993,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;
@@ -1021,13 +1021,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;
@@ -1060,7 +1060,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:
@@ -1093,7 +1093,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,
@@ -1106,7 +1106,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,
@@ -1122,7 +1122,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;
                }
 
index 6d074d6..b62e3e2 100644 (file)
@@ -104,7 +104,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS)
                if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
                        DRM_DEBUG("adding to allocation set fails\n");
                        sis_free(req.offset);
-                       retval = DRM_ERR(EINVAL);
+                       retval = -EINVAL;
                }
        } else {
                fb.offset = 0;
@@ -127,10 +127,10 @@ static int sis_fb_free(DRM_IOCTL_ARGS)
        DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *) data, sizeof(fb));
 
        if (!fb.free)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
-               retval = DRM_ERR(EINVAL);
+               retval = -EINVAL;
        sis_free(fb.free);
 
        DRM_DEBUG("free fb, offset = 0x%lx\n", fb.free);
@@ -167,7 +167,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS)
        }
 
        if (dev_priv->FBHeap != NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        dev_priv->FBHeap = mmInit(fb.offset, fb.size);
 
@@ -186,7 +186,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS)
        int retval = 0;
 
        if (dev_priv == NULL || dev_priv->FBHeap == NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_COPY_FROM_USER_IOCTL(fb, argp, sizeof(fb));
 
@@ -198,7 +198,7 @@ static int sis_fb_alloc(DRM_IOCTL_ARGS)
                if (!add_alloc_set(fb.context, VIDEO_TYPE, fb.free)) {
                        DRM_DEBUG("adding to allocation set fails\n");
                        mmFreeMem((PMemBlock) fb.free);
-                       retval = DRM_ERR(EINVAL);
+                       retval = -EINVAL;
                }
        } else {
                fb.offset = 0;
@@ -220,15 +220,15 @@ static int sis_fb_free(DRM_IOCTL_ARGS)
        drm_sis_mem_t fb;
 
        if (dev_priv == NULL || dev_priv->FBHeap == NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_COPY_FROM_USER_IOCTL(fb, (drm_sis_mem_t __user *) data, sizeof(fb));
 
        if (!mmBlockInHeap(dev_priv->FBHeap, (PMemBlock) fb.free))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        if (!del_alloc_set(fb.context, VIDEO_TYPE, fb.free))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        mmFreeMem((PMemBlock) fb.free);
 
        DRM_DEBUG("free fb, free = 0x%lx\n", fb.free);
@@ -255,7 +255,7 @@ static int sis_ioctl_agp_init(DRM_IOCTL_ARGS)
        }
 
        if (dev_priv->AGPHeap != NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_agp_t __user *) data,
                                 sizeof(agp));
@@ -277,7 +277,7 @@ static int sis_ioctl_agp_alloc(DRM_IOCTL_ARGS)
        int retval = 0;
 
        if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_COPY_FROM_USER_IOCTL(agp, argp, sizeof(agp));
 
@@ -311,17 +311,17 @@ static int sis_ioctl_agp_free(DRM_IOCTL_ARGS)
        drm_sis_mem_t agp;
 
        if (dev_priv == NULL || dev_priv->AGPHeap == NULL)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_COPY_FROM_USER_IOCTL(agp, (drm_sis_mem_t __user *) data,
                                 sizeof(agp));
 
        if (!mmBlockInHeap(dev_priv->AGPHeap, (PMemBlock) agp.free))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        mmFreeMem((PMemBlock) agp.free);
        if (!del_alloc_set(agp.context, AGP_TYPE, agp.free))
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_DEBUG("free agp, free = 0x%lx\n", agp.free);
 
index 48f4693..895c78b 100644 (file)
@@ -163,24 +163,24 @@ static int via_initialize(struct drm_device * dev,
 {
        if (!dev_priv || !dev_priv->mmio) {
                DRM_ERROR("via_dma_init called before via_map_init\n");
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        if (dev_priv->ring.virtual_start != NULL) {
                DRM_ERROR("%s called again without calling cleanup\n",
                          __FUNCTION__);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        if (!dev->agp || !dev->agp->base) {
                DRM_ERROR("%s called with no agp memory available\n", 
                          __FUNCTION__);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        if (dev_priv->chipset == VIA_DX9_0) {
                DRM_ERROR("AGP DMA is not supported on this chip\n");
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        dev_priv->ring.map.offset = dev->agp->base + init->offset;
@@ -195,7 +195,7 @@ static int via_initialize(struct drm_device * dev,
                via_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;
@@ -228,22 +228,22 @@ static int via_dma_init(DRM_IOCTL_ARGS)
        switch (init.func) {
        case VIA_INIT_DMA:
                if (!DRM_SUSER(DRM_CURPROC))
-                       retcode = DRM_ERR(EPERM);
+                       retcode = -EPERM;
                else
                        retcode = via_initialize(dev, dev_priv, &init);
                break;
        case VIA_CLEANUP_DMA:
                if (!DRM_SUSER(DRM_CURPROC))
-                       retcode = DRM_ERR(EPERM);
+                       retcode = -EPERM;
                else
                        retcode = via_dma_cleanup(dev);
                break;
        case VIA_DMA_INITIALIZED:
                retcode = (dev_priv->ring.virtual_start != NULL) ?
-                       0 : DRM_ERR(EFAULT);
+                       0 : -EFAULT;
                break;
        default:
-               retcode = DRM_ERR(EINVAL);
+               retcode = -EINVAL;
                break;
        }
 
@@ -263,15 +263,15 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t *
        if (dev_priv->ring.virtual_start == NULL) {
                DRM_ERROR("%s called without initializing AGP ring buffer.\n",
                          __FUNCTION__);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        if (cmd->size > VIA_PCI_BUF_SIZE) {
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
 
        if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size))
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        /*
         * Running this function on AGP memory is dead slow. Therefore
@@ -287,7 +287,7 @@ static int via_dispatch_cmdbuffer(struct drm_device * dev, drm_via_cmdbuffer_t *
 
        vb = via_check_dma(dev_priv, (cmd->size < 0x100) ? 0x102 : cmd->size);
        if (vb == NULL) {
-               return DRM_ERR(EAGAIN);
+               return -EAGAIN;
        }
 
        memcpy(vb, dev_priv->pci_buf, cmd->size);
@@ -311,7 +311,7 @@ int via_driver_dma_quiescent(struct drm_device * dev)
        drm_via_private_t *dev_priv = dev->dev_private;
 
        if (!via_wait_idle(dev_priv)) {
-               return DRM_ERR(EBUSY);
+               return -EBUSY;
        }
        return 0;
 }
@@ -353,10 +353,10 @@ static int via_dispatch_pci_cmdbuffer(struct drm_device * dev,
        int ret;
 
        if (cmd->size > VIA_PCI_BUF_SIZE) {
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
        }
        if (DRM_COPY_FROM_USER(dev_priv->pci_buf, cmd->buf, cmd->size))
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
 
        if ((ret =
             via_verify_command_stream((uint32_t *) dev_priv->pci_buf,
@@ -661,7 +661,7 @@ static int via_cmdbuf_size(DRM_IOCTL_ARGS)
        if (dev_priv->ring.virtual_start == NULL) {
                DRM_ERROR("%s called without initializing AGP ring buffer.\n",
                          __FUNCTION__);
-               return DRM_ERR(EFAULT);
+               return -EFAULT;
        }
 
        DRM_COPY_FROM_USER_IOCTL(d_siz, (drm_via_cmdbuf_size_t __user *) data,
@@ -680,7 +680,7 @@ static int via_cmdbuf_size(DRM_IOCTL_ARGS)
                }
                if (!count) {
                        DRM_ERROR("VIA_CMDBUF_SPACE timed out.\n");
-                       ret = DRM_ERR(EAGAIN);
+                       ret = -EAGAIN;
                }
                break;
        case VIA_CMDBUF_LAG:
@@ -692,11 +692,11 @@ static int via_cmdbuf_size(DRM_IOCTL_ARGS)
                }
                if (!count) {
                        DRM_ERROR("VIA_CMDBUF_LAG timed out.\n");
-                       ret = DRM_ERR(EAGAIN);
+                       ret = -EAGAIN;
                }
                break;
        default:
-               ret = DRM_ERR(EFAULT);
+               ret = -EFAULT;
        }
        d_siz.size = tmp_size;
 
@@ -709,12 +709,12 @@ static int via_cmdbuf_size(DRM_IOCTL_ARGS)
 int 
 via_dma_blit_sync( DRM_IOCTL_ARGS ) {
        DRM_ERROR("PCI DMA BitBlt is not implemented for this system.\n");
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 int 
 via_dma_blit( DRM_IOCTL_ARGS ) {
        DRM_ERROR("PCI DMA BitBlt is not implemented for this system.\n");
-       return DRM_ERR(EINVAL);
+       return -EINVAL;
 }
 #endif
 
index 040df54..68ee522 100644 (file)
@@ -213,13 +213,13 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc
 
        if (!dev_priv) {
                DRM_ERROR("%s called with no initialization\n", __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (irq >= drm_via_irq_num ) {
                DRM_ERROR("%s Trying to wait on unknown irq %d\n", __FUNCTION__,
                          irq);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
                
        real_irq = dev_priv->irq_map[irq];
@@ -227,7 +227,7 @@ via_driver_irq_wait(struct drm_device * dev, unsigned int irq, int force_sequenc
        if (real_irq < 0) {
                DRM_ERROR("%s Video IRQ %d not available on this hardware.\n",
                          __FUNCTION__, irq);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        masks = dev_priv->irq_masks;
@@ -352,13 +352,13 @@ int via_wait_irq(DRM_IOCTL_ARGS)
        int force_sequence;
 
        if (!dev->irq)
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
 
        DRM_COPY_FROM_USER_IOCTL(irqwait, argp, sizeof(irqwait));
        if (irqwait.request.irq >= dev_priv->num_irqs) {
                DRM_ERROR("%s Trying to wait on unknown irq %d\n", __FUNCTION__, 
                          irqwait.request.irq);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        cur_irq += irqwait.request.irq;
@@ -370,13 +370,13 @@ int via_wait_irq(DRM_IOCTL_ARGS)
        case VIA_IRQ_ABSOLUTE:
                break;
        default:
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        if (irqwait.request.type & VIA_IRQ_SIGNAL) {
                DRM_ERROR("%s Signals on Via IRQs not implemented yet.\n", 
                          __FUNCTION__);
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
 
        force_sequence = (irqwait.request.type & VIA_IRQ_FORCE_SEQUENCE);
index 2381eaa..1aed10f 100644 (file)
@@ -118,7 +118,7 @@ int via_driver_load(struct drm_device *dev, unsigned long chipset)
 
        dev_priv = drm_calloc(1, sizeof(drm_via_private_t), DRM_MEM_DRIVER);
        if (dev_priv == NULL)
-               return DRM_ERR(ENOMEM);
+               return -ENOMEM;
 
        dev->dev_private = (void *)dev_priv;
 
index 038bea2..ded5c4e 100644 (file)
@@ -1031,12 +1031,12 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
                case state_error:
                default:
                        *hc_state = saved_state;
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
        if (state == state_error) {
                *hc_state = saved_state;
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        return 0;
 }
@@ -1087,11 +1087,11 @@ via_parse_command_stream(struct drm_device * dev, const uint32_t * buf,
                        break;
                case state_error:
                default:
-                       return DRM_ERR(EINVAL);
+                       return -EINVAL;
                }
        }
        if (state == state_error) {
-               return DRM_ERR(EINVAL);
+               return -EINVAL;
        }
        return 0;
 }