summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_lock.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-11 15:27:12 +1000
committerDave Airlie <airlied@linux.ie>2007-07-11 15:27:12 +1000
commitc60ce623bd16137627009d05e311d877729f2ad6 (patch)
tree4d06337a217ccc6c21f8ad96c3b342a1e9452057 /drivers/char/drm/drm_lock.c
parentc6c656b4b6ddfc964f1a43394bf86bc76c5e8119 (diff)
downloadop-kernel-dev-c60ce623bd16137627009d05e311d877729f2ad6.zip
op-kernel-dev-c60ce623bd16137627009d05e311d877729f2ad6.tar.gz
drm: remove a bunch of typedefs on the userspace interface
This moves a bunch of typedefs into a !defined __KERNEL__ to keep userspace API compatiblity, it changes all internal usages to structs/enum/unions. Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_lock.c')
-rw-r--r--drivers/char/drm/drm_lock.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/drm_lock.c b/drivers/char/drm/drm_lock.c
index befd1af..62f12e7 100644
--- a/drivers/char/drm/drm_lock.c
+++ b/drivers/char/drm/drm_lock.c
@@ -54,12 +54,12 @@ int drm_lock(struct inode *inode, struct file *filp,
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->head->dev;
DECLARE_WAITQUEUE(entry, current);
- drm_lock_t lock;
+ struct drm_lock lock;
int ret = 0;
++priv->lock_count;
- if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock)))
+ if (copy_from_user(&lock, (struct drm_lock __user *) arg, sizeof(lock)))
return -EFAULT;
if (lock.context == DRM_KERNEL_CONTEXT) {
@@ -154,10 +154,10 @@ int drm_unlock(struct inode *inode, struct file *filp,
{
drm_file_t *priv = filp->private_data;
drm_device_t *dev = priv->head->dev;
- drm_lock_t lock;
+ struct drm_lock lock;
unsigned long irqflags;
- if (copy_from_user(&lock, (drm_lock_t __user *) arg, sizeof(lock)))
+ if (copy_from_user(&lock, (struct drm_lock __user *) arg, sizeof(lock)))
return -EFAULT;
if (lock.context == DRM_KERNEL_CONTEXT) {
OpenPOWER on IntegriCloud