From f982e046e74256ad3ea27ecc1f73fd5b4b5cfb52 Mon Sep 17 00:00:00 2001 From: Alan Hourihane Date: Mon, 30 Apr 2001 14:26:55 +0000 Subject: [PATCH] fix some return values --- linux-core/drmP.h | 2 +- linux-core/drm_drv.c | 18 +++++++++--------- linux-core/drm_fops.c | 2 ++ linux-core/drm_memory.h | 2 ++ linux/drmP.h | 2 +- linux/drm_drv.h | 18 +++++++++--------- linux/drm_fops.h | 2 ++ linux/drm_memory.h | 2 ++ 8 files changed, 28 insertions(+), 20 deletions(-) diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 883cfa3a..062fbe54 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -74,7 +74,7 @@ /* Begin the DRM... */ -#define DRM_DEBUG_CODE 2 /* Include debugging code (if > 1, then +#define DRM_DEBUG_CODE 0 /* Include debugging code (if > 1, then also include looping detection. */ #define DRM_HASH_SIZE 16 /* Size of key hash table */ diff --git a/linux-core/drm_drv.c b/linux-core/drm_drv.c index 73ea2d39..1d89f779 100644 --- a/linux-core/drm_drv.c +++ b/linux-core/drm_drv.c @@ -924,7 +924,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p) #endif if ( !dev->lock.hw_lock ) { /* Device has been unregistered */ - retcode = -EINTR; + retcode = EINTR; break; } if ( DRM(lock_take)( &dev->lock.hw_lock->lock, @@ -947,7 +947,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p) #ifdef __linux__ schedule(); if ( signal_pending( current ) ) { - retcode = -ERESTARTSYS; + retcode = ERESTARTSYS; break; } #endif @@ -1028,7 +1028,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p) if ( !--dev->open_count ) { if ( atomic_read( &dev->ioctl_count ) || dev->blocked ) { DRM_ERROR( "Device busy: %ld %d\n", - atomic_read( &dev->ioctl_count ), + (unsigned long)atomic_read( &dev->ioctl_count ), dev->blocked ); DRM_OS_SPINUNLOCK( &dev->count_lock ); #ifdef __linux__ @@ -1107,14 +1107,14 @@ int DRM(ioctl)( DRM_OS_IOCTL ) #endif if ( nr >= DRIVER_IOCTL_COUNT ) { - retcode = -EINVAL; + retcode = EINVAL; } else { ioctl = &DRM(ioctls)[nr]; func = ioctl->func; if ( !func ) { DRM_DEBUG( "no function\n" ); - retcode = -EINVAL; + retcode = EINVAL; } else if ( ( ioctl->root_only && #ifdef __linux__ !capable( CAP_SYS_ADMIN ) ) @@ -1123,7 +1123,7 @@ int DRM(ioctl)( DRM_OS_IOCTL ) suser(p) ) #endif || ( ioctl->auth_needed && !priv->authenticated ) ) { - retcode = -EACCES; + retcode = EACCES; } else { #ifdef __linux__ retcode = func( inode, filp, cmd, data ); @@ -1135,7 +1135,7 @@ int DRM(ioctl)( DRM_OS_IOCTL ) } atomic_dec( &dev->ioctl_count ); - return retcode; + DRM_OS_RETURN(retcode); } int DRM(lock)( DRM_OS_IOCTL ) @@ -1189,7 +1189,7 @@ int DRM(lock)( DRM_OS_IOCTL ) #endif if ( !dev->lock.hw_lock ) { /* Device has been unregistered */ - ret = -EINTR; + ret = EINTR; break; } if ( DRM(lock_take)( &dev->lock.hw_lock->lock, @@ -1209,7 +1209,7 @@ int DRM(lock)( DRM_OS_IOCTL ) #ifdef __linux__ schedule(); if ( signal_pending( current ) ) { - ret = -ERESTARTSYS; + ret = ERESTARTSYS; break; } #endif diff --git a/linux-core/drm_fops.c b/linux-core/drm_fops.c index a86f694a..d3c4e8a6 100644 --- a/linux-core/drm_fops.c +++ b/linux-core/drm_fops.c @@ -188,7 +188,9 @@ ssize_t DRM(read)(dev_t kdev, struct uio *uio, int ioflag) int avail; int send; int cur; +#ifdef __FreeBSD__ int error = 0; +#endif DRM_DEBUG("%p, %p\n", dev->buf_rp, dev->buf_wp); diff --git a/linux-core/drm_memory.h b/linux-core/drm_memory.h index 9671c49e..83cca0b1 100644 --- a/linux-core/drm_memory.h +++ b/linux-core/drm_memory.h @@ -580,9 +580,11 @@ int DRM(unbind_agp)(agp_memory *handle) return retcode; } +#ifdef __FreeBSD__ agp_memory_info(dev, handle, &info); if ((retcode = agp_unbind_memory(dev, handle))) return retcode; +#endif if ((retcode = DRM(agp_unbind_memory)(handle))) return retcode; DRM_OS_SPINLOCK(&DRM(mem_lock)); diff --git a/linux/drmP.h b/linux/drmP.h index 883cfa3a..062fbe54 100644 --- a/linux/drmP.h +++ b/linux/drmP.h @@ -74,7 +74,7 @@ /* Begin the DRM... */ -#define DRM_DEBUG_CODE 2 /* Include debugging code (if > 1, then +#define DRM_DEBUG_CODE 0 /* Include debugging code (if > 1, then also include looping detection. */ #define DRM_HASH_SIZE 16 /* Size of key hash table */ diff --git a/linux/drm_drv.h b/linux/drm_drv.h index 73ea2d39..1d89f779 100644 --- a/linux/drm_drv.h +++ b/linux/drm_drv.h @@ -924,7 +924,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p) #endif if ( !dev->lock.hw_lock ) { /* Device has been unregistered */ - retcode = -EINTR; + retcode = EINTR; break; } if ( DRM(lock_take)( &dev->lock.hw_lock->lock, @@ -947,7 +947,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p) #ifdef __linux__ schedule(); if ( signal_pending( current ) ) { - retcode = -ERESTARTSYS; + retcode = ERESTARTSYS; break; } #endif @@ -1028,7 +1028,7 @@ int DRM( close)(dev_t kdev, int flags, int fmt, struct proc *p) if ( !--dev->open_count ) { if ( atomic_read( &dev->ioctl_count ) || dev->blocked ) { DRM_ERROR( "Device busy: %ld %d\n", - atomic_read( &dev->ioctl_count ), + (unsigned long)atomic_read( &dev->ioctl_count ), dev->blocked ); DRM_OS_SPINUNLOCK( &dev->count_lock ); #ifdef __linux__ @@ -1107,14 +1107,14 @@ int DRM(ioctl)( DRM_OS_IOCTL ) #endif if ( nr >= DRIVER_IOCTL_COUNT ) { - retcode = -EINVAL; + retcode = EINVAL; } else { ioctl = &DRM(ioctls)[nr]; func = ioctl->func; if ( !func ) { DRM_DEBUG( "no function\n" ); - retcode = -EINVAL; + retcode = EINVAL; } else if ( ( ioctl->root_only && #ifdef __linux__ !capable( CAP_SYS_ADMIN ) ) @@ -1123,7 +1123,7 @@ int DRM(ioctl)( DRM_OS_IOCTL ) suser(p) ) #endif || ( ioctl->auth_needed && !priv->authenticated ) ) { - retcode = -EACCES; + retcode = EACCES; } else { #ifdef __linux__ retcode = func( inode, filp, cmd, data ); @@ -1135,7 +1135,7 @@ int DRM(ioctl)( DRM_OS_IOCTL ) } atomic_dec( &dev->ioctl_count ); - return retcode; + DRM_OS_RETURN(retcode); } int DRM(lock)( DRM_OS_IOCTL ) @@ -1189,7 +1189,7 @@ int DRM(lock)( DRM_OS_IOCTL ) #endif if ( !dev->lock.hw_lock ) { /* Device has been unregistered */ - ret = -EINTR; + ret = EINTR; break; } if ( DRM(lock_take)( &dev->lock.hw_lock->lock, @@ -1209,7 +1209,7 @@ int DRM(lock)( DRM_OS_IOCTL ) #ifdef __linux__ schedule(); if ( signal_pending( current ) ) { - ret = -ERESTARTSYS; + ret = ERESTARTSYS; break; } #endif diff --git a/linux/drm_fops.h b/linux/drm_fops.h index a86f694a..d3c4e8a6 100644 --- a/linux/drm_fops.h +++ b/linux/drm_fops.h @@ -188,7 +188,9 @@ ssize_t DRM(read)(dev_t kdev, struct uio *uio, int ioflag) int avail; int send; int cur; +#ifdef __FreeBSD__ int error = 0; +#endif DRM_DEBUG("%p, %p\n", dev->buf_rp, dev->buf_wp); diff --git a/linux/drm_memory.h b/linux/drm_memory.h index 9671c49e..83cca0b1 100644 --- a/linux/drm_memory.h +++ b/linux/drm_memory.h @@ -580,9 +580,11 @@ int DRM(unbind_agp)(agp_memory *handle) return retcode; } +#ifdef __FreeBSD__ agp_memory_info(dev, handle, &info); if ((retcode = agp_unbind_memory(dev, handle))) return retcode; +#endif if ((retcode = DRM(agp_unbind_memory)(handle))) return retcode; DRM_OS_SPINLOCK(&DRM(mem_lock));