aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm/drmP.h
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@collabora.co.uk>2009-11-17 14:41:23 -0800
committerDave Airlie <airlied@redhat.com>2009-11-18 10:02:49 +1000
commit156822f7175d9ceb9d7e808502d3c5de8841e047 (patch)
tree1eb79f8e11c1ce4710dcdd83210d1acb5cd95b39 /include/drm/drmP.h
parent420a457088669e055e767dfb8468909cd1799cf9 (diff)
downloadmrst-s0i3-test-156822f7175d9ceb9d7e808502d3c5de8841e047.tar.gz
mrst-s0i3-test-156822f7175d9ceb9d7e808502d3c5de8841e047.tar.xz
mrst-s0i3-test-156822f7175d9ceb9d7e808502d3c5de8841e047.zip
drm: kill more unused DRM macros
There are a few more macros in drmP.h that are unused; DRM_GET_PRIV_SAREA, DRM_ARRAY_SIZE, and DRM_WAITCOUNT can go away completely. Unfortunately, DRM_COPY is still used in one place, but we can at least move it to where it's used. It's an awful looking macro.. [akpm: fix overeagerness] Signed-off-by: Andres Salomon <dilinger@collabora.co.uk> Cc: Dave Airlie <airlied@linux.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm/drmP.h')
-rw-r--r--include/drm/drmP.h23
1 files changed, 0 insertions, 23 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 4977fa9038d..1b72a526ba6 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -255,19 +255,8 @@ extern void drm_ut_debug_printk(unsigned int request_level,
#define DRM_LEFTCOUNT(x) (((x)->rp + (x)->count - (x)->wp) % ((x)->count + 1))
#define DRM_BUFCOUNT(x) ((x)->count - DRM_LEFTCOUNT(x))
-#define DRM_WAITCOUNT(dev,idx) DRM_BUFCOUNT(&dev->queuelist[idx]->waitlist)
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
-/**
- * Get the private SAREA mapping.
- *
- * \param _dev DRM device.
- * \param _ctx context number.
- * \param _map output mapping.
- */
-#define DRM_GET_PRIV_SAREA(_dev, _ctx, _map) do { \
- (_map) = (_dev)->context_sareas[_ctx]; \
-} while(0)
/**
* Test that the hardware lock is held by the caller, returning otherwise.
@@ -287,18 +276,6 @@ do { \
} while (0)
/**
- * Copy and IOCTL return string to user space
- */
-#define DRM_COPY( name, value ) \
- len = strlen( value ); \
- if ( len > name##_len ) len = name##_len; \
- name##_len = strlen( value ); \
- if ( len && name ) { \
- if ( copy_to_user( name, value, len ) ) \
- return -EFAULT; \
- }
-
-/**
* Ioctl function type.
*
* \param inode device inode.