From e39286eb5eab8846a228863abf8f1b8b07a9e29d Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 19 Jul 2007 17:00:17 -0700
Subject: Remove DRM_ERR OS macro.

This was used to make all ioctl handlers return -errno on linux and errno on
*BSD.  Instead, just return -errno in shared code, and flip sign on return from
shared code to *BSD code.
---
 shared-core/mach64_drv.h | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'shared-core/mach64_drv.h')

diff --git a/shared-core/mach64_drv.h b/shared-core/mach64_drv.h
index a1b36751..5d83c861 100644
--- a/shared-core/mach64_drv.h
+++ b/shared-core/mach64_drv.h
@@ -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;						\
-- 
cgit v1.2.3